aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-tp-chat.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-01-10 00:15:10 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-10 00:15:10 +0800
commitac3d19d800cc16b24615e82b6b351f880c13d710 (patch)
tree7ea8980ee847a076159923d269b4c80ca73834a0 /libempathy/empathy-tp-chat.c
parent2e78b7d4c7756864fba8b6024ad85b0f02ec5e0a (diff)
downloadgsoc2013-empathy-ac3d19d800cc16b24615e82b6b351f880c13d710.tar
gsoc2013-empathy-ac3d19d800cc16b24615e82b6b351f880c13d710.tar.gz
gsoc2013-empathy-ac3d19d800cc16b24615e82b6b351f880c13d710.tar.bz2
gsoc2013-empathy-ac3d19d800cc16b24615e82b6b351f880c13d710.tar.lz
gsoc2013-empathy-ac3d19d800cc16b24615e82b6b351f880c13d710.tar.xz
gsoc2013-empathy-ac3d19d800cc16b24615e82b6b351f880c13d710.tar.zst
gsoc2013-empathy-ac3d19d800cc16b24615e82b6b351f880c13d710.zip
Don't close channels as a side-effect of disposing wrapper objects
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2183
Diffstat (limited to 'libempathy/empathy-tp-chat.c')
-rw-r--r--libempathy/empathy-tp-chat.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 6f55c6ba5..57e3277eb 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -896,7 +896,12 @@ tp_chat_dispose (GObject *object)
priv->dispose_has_run = TRUE;
if (priv->channel != NULL)
- empathy_tp_chat_close (self);
+ {
+ g_signal_handlers_disconnect_by_func (priv->channel,
+ tp_chat_invalidated_cb, self);
+ g_object_unref (priv->channel);
+ priv->channel = NULL;
+ }
if (priv->remote_contact != NULL)
g_object_unref (priv->remote_contact);