aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-04-20 02:36:19 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-04-20 02:36:19 +0800
commitccc1ce1f26b2ce4adda0d83b38f9717d4c4c5c84 (patch)
tree9f8e892ba13bd58f91fb4be9c20a041f06a61216 /libempathy-gtk
parent7e6a13d3b3f30b55714740313cdbb939767d9fa0 (diff)
downloadgsoc2013-empathy-ccc1ce1f26b2ce4adda0d83b38f9717d4c4c5c84.tar
gsoc2013-empathy-ccc1ce1f26b2ce4adda0d83b38f9717d4c4c5c84.tar.gz
gsoc2013-empathy-ccc1ce1f26b2ce4adda0d83b38f9717d4c4c5c84.tar.bz2
gsoc2013-empathy-ccc1ce1f26b2ce4adda0d83b38f9717d4c4c5c84.tar.lz
gsoc2013-empathy-ccc1ce1f26b2ce4adda0d83b38f9717d4c4c5c84.tar.xz
gsoc2013-empathy-ccc1ce1f26b2ce4adda0d83b38f9717d4c4c5c84.tar.zst
gsoc2013-empathy-ccc1ce1f26b2ce4adda0d83b38f9717d4c4c5c84.zip
Fix acknoledge of messages
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@966 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-chat.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 3810e209b..c40548b19 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1644,21 +1644,16 @@ void
empathy_chat_set_tp_chat (EmpathyChat *chat,
EmpathyTpChat *tp_chat)
{
- EmpathyChatPriv *priv;
+ EmpathyChatPriv *priv = GET_PRIV (chat);
g_return_if_fail (EMPATHY_IS_CHAT (chat));
g_return_if_fail (EMPATHY_IS_TP_CHAT (tp_chat));
g_return_if_fail (empathy_tp_chat_is_ready (tp_chat));
- priv = GET_PRIV (chat);
-
- if (tp_chat == priv->tp_chat) {
+ if (priv->tp_chat) {
return;
}
- if (priv->tp_chat) {
- g_object_unref (priv->tp_chat);
- }
if (priv->account) {
g_object_unref (priv->account);
}
@@ -1699,6 +1694,9 @@ empathy_chat_set_tp_chat (EmpathyChat *chat,
}
}
+ empathy_tp_chat_set_acknowledge (priv->tp_chat, TRUE);
+ empathy_tp_chat_emit_pendings (priv->tp_chat);
+
g_object_notify (G_OBJECT (chat), "tp-chat");
g_object_notify (G_OBJECT (chat), "id");
g_object_notify (G_OBJECT (chat), "account");