[maemo-commits] [maemo-commits] r12837 - in projects/haf/trunk/hildon-help: . debian src

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-07-25 15:38:12 +0300 (Wed, 25 Jul 2007)
New Revision: 12837

Modified:
   projects/haf/trunk/hildon-help/ChangeLog
   projects/haf/trunk/hildon-help/configure.ac
   projects/haf/trunk/hildon-help/debian/changelog
   projects/haf/trunk/hildon-help/src/dialog.c
   projects/haf/trunk/hildon-help/src/osso-helplib.c
Log:
  * Allow changing the help icon after the dialog is realized


Modified: projects/haf/trunk/hildon-help/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-help/ChangeLog	2007-07-25 12:36:00 UTC (rev 12836)
+++ projects/haf/trunk/hildon-help/ChangeLog	2007-07-25 12:38:12 UTC (rev 12837)
@@ -1,5 +1,10 @@
-2007-07-02 Gabriel Schulhof <gabriel.schulhof at nokia.com>
+2007-07-25 Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
+	* Version 1.9.5
+	* Allow changing the help icon after the dialog is realized
+
+2007-07-24 Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
 	* Version 1.9.4
 	* Skip empty folders
 	* Fixes: NB#32083

Modified: projects/haf/trunk/hildon-help/configure.ac
===================================================================
--- projects/haf/trunk/hildon-help/configure.ac	2007-07-25 12:36:00 UTC (rev 12836)
+++ projects/haf/trunk/hildon-help/configure.ac	2007-07-25 12:38:12 UTC (rev 12837)
@@ -7,7 +7,7 @@
 
 # Mandatory, initializes autoconf.
 #
-AC_INIT(libhildonhelp, 1.9.4)
+AC_INIT(libhildonhelp, 1.9.5)
 
 # Tests that source dir exists
 AC_CONFIG_SRCDIR(src/hildon-help.h)

Modified: projects/haf/trunk/hildon-help/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-help/debian/changelog	2007-07-25 12:36:00 UTC (rev 12836)
+++ projects/haf/trunk/hildon-help/debian/changelog	2007-07-25 12:38:12 UTC (rev 12837)
@@ -1,3 +1,9 @@
+libhildonhelp (1.9.5-1) unstable; urgency=low
+
+  * Allow changing the help icon after the dialog is realized
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 25 Jul 2007 15:31:20 +0300
+
 libhildonhelp (1.9.4-1) unstable; urgency=low
 
   * Skip empty folders

Modified: projects/haf/trunk/hildon-help/src/dialog.c
===================================================================
--- projects/haf/trunk/hildon-help/src/dialog.c	2007-07-25 12:36:00 UTC (rev 12836)
+++ projects/haf/trunk/hildon-help/src/dialog.c	2007-07-25 12:38:12 UTC (rev 12837)
@@ -170,8 +170,6 @@
     osso_return_t ret = OSSO_OK ;
     gchar *dialog_title = NULL;
 
-    g_print ("system_dialog: Entering\n") ;
-
     const gchar *file_url= "file://" HELP_HTML_TMPFILE;
 
     if (!osso || !topic_key) return OSSO_ERROR;
@@ -213,14 +211,10 @@
     if (!browser_show (help_dialog.browser, file_url, TRUE))
       return OSSO_ERROR;
 
-    g_print ("system_dialog: Calling gtk_dialog_run\n") ;
-
     /* Stay here until 'close' is pressed (easiest for the application) */
     gtk_dialog_run (GTK_DIALOG (help_dialog.dialog)) ;
 
     gtk_widget_hide (help_dialog.dialog) ;
 
-    g_print ("system_dialog: Dialog is now hidden\n") ;
-
     return OSSO_OK;
 }

Modified: projects/haf/trunk/hildon-help/src/osso-helplib.c
===================================================================
--- projects/haf/trunk/hildon-help/src/osso-helplib.c	2007-07-25 12:36:00 UTC (rev 12836)
+++ projects/haf/trunk/hildon-help/src/osso-helplib.c	2007-07-25 12:38:12 UTC (rev 12837)
@@ -168,9 +168,12 @@
 
     g_return_if_fail(GTK_IS_DIALOG(dialog));
 
-    g_signal_handlers_disconnect_matched (dialog, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, dialog_on_realize, NULL) ;
-
-    g_signal_connect (G_OBJECT (dialog), "realize", (GCallback)dialog_on_realize, (gpointer)has_help) ;
+    if (!GTK_WIDGET_REALIZED(GTK_WIDGET(dialog))) {
+      g_signal_handlers_disconnect_matched (dialog, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, dialog_on_realize, NULL) ;
+      g_signal_connect (G_OBJECT (dialog), "realize", (GCallback)dialog_on_realize, (gpointer)has_help) ;
+    } else {
+      dialog_on_realize(dialog, (gpointer)has_help);
+    }
 }
 
 static gboolean ossohelp_file2_private( const char *basename, int basename_len,