[maemo-commits] [maemo-commits] r15323 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2008-03-27 12:52:14 +0200 (Thu, 27 Mar 2008)
New Revision: 15323

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-color-button.c
Log:
2008-03-27  Michael Natterer  <mitch at imendio.com>

	Enable fixing: NB#79916 and NB#79918: The help topic for Color
	selector cannot be opened

	* src/hildon-color-button.c: add signal "setup-dialog" and emit it
	when the popup color selector is created. Please connect to this
	signal in order to set the dialog's help ID.



Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2008-03-26 08:35:33 UTC (rev 15322)
+++ projects/haf/trunk/hildon-1/ChangeLog	2008-03-27 10:52:14 UTC (rev 15323)
@@ -1,3 +1,12 @@
+2008-03-27  Michael Natterer  <mitch at imendio.com>
+
+	Enable fixing: NB#79916 and NB#79918: The help topic for Color
+	selector cannot be opened
+
+	* src/hildon-color-button.c: add signal "setup-dialog" and emit it
+	when the popup color selector is created. Please connect to this
+	signal in order to set the dialog's help ID.
+
 2008-03-25  Sven Herzberg  <sven at imendio.com>
 
 	Fixes: MB#1212: Hide info banners (infoprints) on click

Modified: projects/haf/trunk/hildon-1/src/hildon-color-button.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-color-button.c	2008-03-26 08:35:33 UTC (rev 15322)
+++ projects/haf/trunk/hildon-1/src/hildon-color-button.c	2008-03-27 10:52:14 UTC (rev 15323)
@@ -83,8 +83,14 @@
 
 #define                                         INNER_BORDER_THICKNESS 2
 
-enum 
+enum
 {
+    SETUP_DIALOG,
+    LAST_SIGNAL
+};
+
+enum
+{
     PROP_0,
     PROP_COLOR,
     PROP_POPUP_SHOWN
@@ -143,6 +149,7 @@
                                                  gint h);
 
 static gpointer                                 parent_class = NULL;
+static guint                                    signals [LAST_SIGNAL] = { 0, };
 
 /**
  * hildon_color_button_get_type:
@@ -199,6 +206,16 @@
     button_class->clicked           = hildon_color_button_clicked;
     widget_class->mnemonic_activate = hildon_color_button_mnemonic_activate;
 
+   signals[SETUP_DIALOG] =
+       g_signal_new ("setup-dialog",
+                     G_TYPE_FROM_CLASS (klass),
+                     G_SIGNAL_RUN_LAST,
+                     0,
+                     NULL, NULL,
+                     gtk_marshal_VOID__OBJECT,
+                     G_TYPE_NONE, 1,
+                     HILDON_TYPE_COLOR_CHOOSER_DIALOG);
+
     /**
      * HildonColorButton:color:
      *
@@ -427,6 +444,8 @@
         cs_dialog = HILDON_COLOR_CHOOSER_DIALOG (priv->dialog);
         if (parent)
             gtk_window_set_transient_for (GTK_WINDOW (cs_dialog), GTK_WINDOW (parent));
+
+        g_signal_emit (button, signals[SETUP_DIALOG], 0, priv->dialog);
     }
 
     /* Set the initial color for the color selector dialog */