aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2011-05-17 16:36:33 +0800
committerJonny Lamb <jonnylamb@gnome.org>2011-05-17 16:36:33 +0800
commit2950825a4452bc984c0dd356c5bf17c3a674c451 (patch)
treec562a901727f1548105acf75884f350d9dfd7192 /src
parent38e5925b90ca5864907aaef09cbaa4c963b1be98 (diff)
parent9e1914959b7e26e82ca4042ad5f7f042cb5a34a2 (diff)
downloadgsoc2013-empathy-2950825a4452bc984c0dd356c5bf17c3a674c451.tar
gsoc2013-empathy-2950825a4452bc984c0dd356c5bf17c3a674c451.tar.gz
gsoc2013-empathy-2950825a4452bc984c0dd356c5bf17c3a674c451.tar.bz2
gsoc2013-empathy-2950825a4452bc984c0dd356c5bf17c3a674c451.tar.lz
gsoc2013-empathy-2950825a4452bc984c0dd356c5bf17c3a674c451.tar.xz
gsoc2013-empathy-2950825a4452bc984c0dd356c5bf17c3a674c451.tar.zst
gsoc2013-empathy-2950825a4452bc984c0dd356c5bf17c3a674c451.zip
Merge branch 'ack'
Diffstat (limited to 'src')
-rw-r--r--src/empathy-chat-window.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index e9298ddbf..d8a75cb0c 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -794,6 +794,7 @@ chat_window_update_chat_tab (EmpathyChat *chat)
static void
chat_window_chat_notify_cb (EmpathyChat *chat)
{
+ EmpathyChatWindow *window;
EmpathyContact *old_remote_contact;
EmpathyContact *remote_contact = NULL;
@@ -820,6 +821,11 @@ chat_window_chat_notify_cb (EmpathyChat *chat)
}
chat_window_update_chat_tab (chat);
+
+ window = chat_window_find_chat (chat);
+ if (window != NULL) {
+ chat_window_update (window, FALSE);
+ }
}
static void
@@ -2326,6 +2332,9 @@ empathy_chat_window_add_chat (EmpathyChatWindow *window,
g_signal_connect (chat, "notify::n-messages-sending",
G_CALLBACK (chat_window_chat_notify_cb),
NULL);
+ g_signal_connect (chat, "notify::nb-unread-messages",
+ G_CALLBACK (chat_window_chat_notify_cb),
+ NULL);
chat_window_chat_notify_cb (chat);
gtk_notebook_append_page_menu (GTK_NOTEBOOK (priv->notebook), child, label, popup_label);