diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-16 17:22:52 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-16 17:22:52 +0800 |
| commit | 04462d2c6fbcbde891ec2a0d10cec540110517c7 (patch) | |
| tree | 495581b0245cc1b454937326f63d277db56050d1 /libempathy-gtk/empathy-private-chat.c | |
| parent | 542c9b73402e30b9d07ae19055babf0eb767366b (diff) | |
| download | gsoc2013-empathy-04462d2c6fbcbde891ec2a0d10cec540110517c7.tar gsoc2013-empathy-04462d2c6fbcbde891ec2a0d10cec540110517c7.tar.gz gsoc2013-empathy-04462d2c6fbcbde891ec2a0d10cec540110517c7.tar.bz2 gsoc2013-empathy-04462d2c6fbcbde891ec2a0d10cec540110517c7.tar.lz gsoc2013-empathy-04462d2c6fbcbde891ec2a0d10cec540110517c7.tar.xz gsoc2013-empathy-04462d2c6fbcbde891ec2a0d10cec540110517c7.tar.zst gsoc2013-empathy-04462d2c6fbcbde891ec2a0d10cec540110517c7.zip | |
Block events messages when the chat is connecting to a new Text channel. Fixes bug #507515 and #516198.
svn path=/trunk/; revision=641
Diffstat (limited to 'libempathy-gtk/empathy-private-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-private-chat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-private-chat.c b/libempathy-gtk/empathy-private-chat.c index 2dd1ba755..0bcdd7844 100644 --- a/libempathy-gtk/empathy-private-chat.c +++ b/libempathy-gtk/empathy-private-chat.c @@ -223,7 +223,7 @@ private_chat_contact_presence_updated_cb (EmpathyContact *contact, empathy_contact_get_id (contact)); if (!empathy_contact_is_online (contact)) { - if (priv->is_online) { + if (priv->is_online && !EMPATHY_CHAT (chat)->block_events) { gchar *msg; msg = g_strdup_printf (_("%s went offline"), @@ -237,7 +237,7 @@ private_chat_contact_presence_updated_cb (EmpathyContact *contact, g_signal_emit_by_name (chat, "composing", FALSE); } else { - if (!priv->is_online) { + if (!priv->is_online && !EMPATHY_CHAT (chat)->block_events) { gchar *msg; msg = g_strdup_printf (_("%s has come online"), |