gnome-session r4972 - in trunk: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Tue Aug 19 00:44:37 2008
New Revision: 4972
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4972&view=rev

Log:
2008-08-18  William Jon McCann  <jmccann redhat com>

	* gnome-session/gsm-inhibit-dialog.c (gsm_inhibit_dialog_dispose):
	Don't try to remove the signal handlers more than once.



Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-inhibit-dialog.c

Modified: trunk/gnome-session/gsm-inhibit-dialog.c
==============================================================================
--- trunk/gnome-session/gsm-inhibit-dialog.c	(original)
+++ trunk/gnome-session/gsm-inhibit-dialog.c	Tue Aug 19 00:44:37 2008
@@ -980,20 +980,19 @@
 
         g_debug ("GsmInhibitDialog: dispose called");
 
-        g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors,
-                                              on_store_inhibitor_added,
-                                              dialog);
-        g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors,
-                                              on_store_inhibitor_removed,
-                                              dialog);
-
         if (dialog->priv->list_store != NULL) {
                 g_object_unref (dialog->priv->list_store);
                 dialog->priv->list_store = NULL;
         }
 
-
         if (dialog->priv->inhibitors != NULL) {
+                g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors,
+                                                      on_store_inhibitor_added,
+                                                      dialog);
+                g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors,
+                                                      on_store_inhibitor_removed,
+                                                      dialog);
+
                 g_object_unref (dialog->priv->inhibitors);
                 dialog->priv->inhibitors = NULL;
         }