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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-03-05 14:05:01 +0200 (Wed, 05 Mar 2008)
New Revision: 15248

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:
  * Set gtk_widget_hide() as the "response" signal handler for the help dialog
    instead of issuing gtk_widget_hide() after gtk_dialog_run() returns
  * Fixes: NB#79413


Modified: projects/haf/trunk/hildon-help/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-help/ChangeLog	2008-03-05 10:48:17 UTC (rev 15247)
+++ projects/haf/trunk/hildon-help/ChangeLog	2008-03-05 12:05:01 UTC (rev 15248)
@@ -1,3 +1,9 @@
+2008-03-05 Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+	* Set gtk_widget_hide() as the "response" signal handler for the help dialog 
+	  instead of issuing gtk_widget_hide() after gtk_dialog_run() returns
+	* Fixes: NB#79413
+
 2007-10-19 Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
 	* Version 1.9.7

Modified: projects/haf/trunk/hildon-help/configure.ac
===================================================================
--- projects/haf/trunk/hildon-help/configure.ac	2008-03-05 10:48:17 UTC (rev 15247)
+++ projects/haf/trunk/hildon-help/configure.ac	2008-03-05 12:05:01 UTC (rev 15248)
@@ -7,7 +7,7 @@
 
 # Mandatory, initializes autoconf.
 #
-AC_INIT(libhildonhelp, 1.9.7)
+AC_INIT(libhildonhelp, 2.0.1)
 
 # 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	2008-03-05 10:48:17 UTC (rev 15247)
+++ projects/haf/trunk/hildon-help/debian/changelog	2008-03-05 12:05:01 UTC (rev 15248)
@@ -1,3 +1,11 @@
+libhildonhelp (2.0.1-0) unstable; urgency=low
+
+  * Set gtk_widget_hide() as the "response" signal handler for the help dialog
+    instead of issuing gtk_widget_hide() after gtk_dialog_run() returns
+  * Fixes: NB#79413
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed,  5 Mar 2008 13:52:28 +0200
+
 libhildonhelp (1.9.7-gtkdoc3) unstable; urgency=low
 
   * mkdir -p empty gtk-doc directory so the nodocs build doesn't fail

Modified: projects/haf/trunk/hildon-help/src/dialog.c
===================================================================
--- projects/haf/trunk/hildon-help/src/dialog.c	2008-03-05 10:48:17 UTC (rev 15247)
+++ projects/haf/trunk/hildon-help/src/dialog.c	2008-03-05 12:05:01 UTC (rev 15248)
@@ -211,10 +211,10 @@
     if (!browser_show (help_dialog.browser, file_url, TRUE))
       return OSSO_ERROR;
 
+    g_signal_connect(G_OBJECT(help_dialog.dialog), "response", (GCallback)gtk_widget_hide, NULL);
+
     /* Stay here until 'close' is pressed (easiest for the application) */
     gtk_dialog_run (GTK_DIALOG (help_dialog.dialog)) ;
 
-    gtk_widget_hide (help_dialog.dialog) ;
-
     return OSSO_OK;
 }

Modified: projects/haf/trunk/hildon-help/src/osso-helplib.c
===================================================================
--- projects/haf/trunk/hildon-help/src/osso-helplib.c	2008-03-05 10:48:17 UTC (rev 15247)
+++ projects/haf/trunk/hildon-help/src/osso-helplib.c	2008-03-05 12:05:01 UTC (rev 15248)
@@ -865,6 +865,7 @@
         hildon_help_show( NULL, topic, HILDON_HELP_SHOW_JUSTASK );
 
     if (rc != OSSO_OK){  /* incorrect topic, we will disable the ? icon then! */
+      g_warning("hildon_help_dialog_help_enable: topic %s is incorrect!", topic);
 	gtk_dialog_set_has_help(GTK_DIALOG(dialog), FALSE);
         return FALSE;
     }