]> git.0d.be Git - empathy.git/commitdiff
Move signal disconnection earlier to hopefully fix SEGV
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 1 Aug 2011 22:38:03 +0000 (08:38 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 1 Aug 2011 22:38:03 +0000 (08:38 +1000)
I can't actually reproduce this, but this is possibly the fix.

(Hopefully) Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=654914

src/empathy-debug-window.c

index 3874fe8d08e7133fd7d26f7624fb755698428a6b..3ce41760f2c100f369516164b2567aac4bce0a90 100644 (file)
@@ -1700,6 +1700,9 @@ debug_window_dispose (GObject *object)
   if (priv->name_owner_changed_signal != NULL)
     tp_proxy_signal_connection_disconnect (priv->name_owner_changed_signal);
 
+  if (priv->new_debug_message_signal != NULL)
+    tp_proxy_signal_connection_disconnect (priv->new_debug_message_signal);
+
   if (priv->proxy != NULL)
     {
       debug_window_set_enabled (EMPATHY_DEBUG_WINDOW (object), FALSE);
@@ -1707,9 +1710,6 @@ debug_window_dispose (GObject *object)
       g_object_unref (priv->proxy);
     }
 
-  if (priv->new_debug_message_signal != NULL)
-    tp_proxy_signal_connection_disconnect (priv->new_debug_message_signal);
-
   if (priv->service_store != NULL)
     g_object_unref (priv->service_store);