[maemo-commits] [maemo-commits] r8715 - projects/haf/trunk/osso-application-installer/src

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2006-12-11 16:50:53 +0200 (Mon, 11 Dec 2006)
New Revision: 8715

Modified:
   projects/haf/trunk/osso-application-installer/src/util.cc
Log:
	* src/util.cc (create_progress): Use respond_on_escape to set up
	our own Escape handler.  The default one seems to destroy the
	dialog.  (N47877).

Added missing pop_dialog_parent in hide_progress.


Modified: projects/haf/trunk/osso-application-installer/src/util.cc
===================================================================
--- projects/haf/trunk/osso-application-installer/src/util.cc	2006-12-11 12:52:00 UTC (rev 8714)
+++ projects/haf/trunk/osso-application-installer/src/util.cc	2006-12-11 14:50:53 UTC (rev 8715)
@@ -573,8 +573,11 @@
       g_list_free (kids);
     }
   else
-    g_signal_connect (progress_dialog, "response",
-		      G_CALLBACK (cancel_response), NULL);
+    {
+      respond_on_escape (GTK_DIALOG (progress_dialog), GTK_RESPONSE_CANCEL);
+      g_signal_connect (progress_dialog, "response",
+			G_CALLBACK (cancel_response), NULL);
+    }
 
   gtk_widget_show (progress_dialog);
 }
@@ -686,6 +689,7 @@
   if (progress_dialog)
     {
       stop_pulsing ();
+      pop_dialog_parent ();
       gtk_widget_destroy (GTK_WIDGET(progress_bar));
       gtk_widget_destroy (progress_dialog);
       progress_dialog = NULL;