totem r5469 - in branches/gnome-2-22: . src

[hadess svn gnome org]

Author: hadess
Date: Sun Jun 15 00:14:49 2008
New Revision: 5469
URL: http://svn.gnome.org/viewvc/totem?rev=5469&view=rev

Log:
2008-06-15  Bastien Nocera  <hadess hadess net>

	* src/totem-preferences.c (totem_setup_preferences): Patch from
	Christian Persch to fix the prefs dialogue not being available
	anymore when using Esc to dismiss it (Closes: #535952)



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/totem-preferences.c

Modified: branches/gnome-2-22/src/totem-preferences.c
==============================================================================
--- branches/gnome-2-22/src/totem-preferences.c	(original)
+++ branches/gnome-2-22/src/totem-preferences.c	Sun Jun 15 00:14:49 2008
@@ -562,7 +562,9 @@
 	g_signal_connect (G_OBJECT (totem->prefs), "response",
 			G_CALLBACK (gtk_widget_hide), NULL);
 	g_signal_connect (G_OBJECT (totem->prefs), "delete-event",
-			G_CALLBACK (gtk_widget_hide), NULL);
+			G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+        g_signal_connect (totem->prefs, "destroy",
+                          G_CALLBACK (gtk_widget_destroyed), &totem->prefs);
 
 	/* Auto-resize */
 	auto_resize = gconf_client_get_bool (totem->gc,