aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-09-21 03:53:14 +0800
committerXavier Claessens <xclaesse@gmail.com>2009-09-21 03:53:14 +0800
commitdb0a8206853d58375960fabe1ae38267ba0576ec (patch)
tree49b35917bce6cc2e9fdf32219e2b932939532f47 /libempathy-gtk
parent3f69fecb7d8405f7a9e3c8e7b34665e536b7de0c (diff)
parent1ca52da13f25b623adb55127aee61c6ea2f68bea (diff)
downloadgsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar
gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.gz
gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.bz2
gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.lz
gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.xz
gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.zst
gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.zip
Merge commit 'istaz/handle_none'
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-chat.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index d62537110..3931115be 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1325,20 +1325,19 @@ chat_remote_contact_changed_cb (EmpathyChat *chat)
priv->remote_contact = NULL;
}
+ g_free (priv->id);
+
+ priv->id = g_strdup (empathy_tp_chat_get_id (priv->tp_chat));
priv->remote_contact = empathy_tp_chat_get_remote_contact (priv->tp_chat);
if (priv->remote_contact != NULL) {
g_object_ref (priv->remote_contact);
priv->handle_type = TP_HANDLE_TYPE_CONTACT;
- g_free (priv->id);
- priv->id = g_strdup (empathy_contact_get_id (priv->remote_contact));
}
else if (priv->tp_chat != NULL) {
TpChannel *channel;
channel = empathy_tp_chat_get_channel (priv->tp_chat);
g_object_get (channel, "handle-type", &priv->handle_type, NULL);
- g_free (priv->id);
- priv->id = g_strdup (empathy_tp_chat_get_id (priv->tp_chat));
}
chat_update_contacts_visibility (chat);