aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-08-02 06:38:03 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-08-02 06:38:03 +0800
commit4a863e0eec9a202385b1370d6e68bef47787f3cb (patch)
tree10c04e3809f3d7bd18c73891baa3b178832834e6 /src
parentf28483d938a0291f167b2e8f53e11c4d2ae3a6ec (diff)
downloadgsoc2013-empathy-4a863e0eec9a202385b1370d6e68bef47787f3cb.tar
gsoc2013-empathy-4a863e0eec9a202385b1370d6e68bef47787f3cb.tar.gz
gsoc2013-empathy-4a863e0eec9a202385b1370d6e68bef47787f3cb.tar.bz2
gsoc2013-empathy-4a863e0eec9a202385b1370d6e68bef47787f3cb.tar.lz
gsoc2013-empathy-4a863e0eec9a202385b1370d6e68bef47787f3cb.tar.xz
gsoc2013-empathy-4a863e0eec9a202385b1370d6e68bef47787f3cb.tar.zst
gsoc2013-empathy-4a863e0eec9a202385b1370d6e68bef47787f3cb.zip
Move signal disconnection earlier to hopefully fix SEGV
I can't actually reproduce this, but this is possibly the fix. (Hopefully) Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=654914
Diffstat (limited to 'src')
-rw-r--r--src/empathy-debug-window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 3874fe8d0..3ce41760f 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -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);