diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-01-24 22:35:50 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-01-24 22:35:50 +0800 |
| commit | f8d4856794d8bf6ba951586fe2e196a00743c764 (patch) | |
| tree | 9492a2be064764b05777d8598b9c4c59583bfcc8 /src | |
| parent | ce51e074a4b2bf286980cad803239bd5e96e749b (diff) | |
| parent | aade7b7e2006666d2af51016e1090bce5855edaf (diff) | |
| download | gsoc2013-empathy-f8d4856794d8bf6ba951586fe2e196a00743c764.tar gsoc2013-empathy-f8d4856794d8bf6ba951586fe2e196a00743c764.tar.gz gsoc2013-empathy-f8d4856794d8bf6ba951586fe2e196a00743c764.tar.bz2 gsoc2013-empathy-f8d4856794d8bf6ba951586fe2e196a00743c764.tar.lz gsoc2013-empathy-f8d4856794d8bf6ba951586fe2e196a00743c764.tar.xz gsoc2013-empathy-f8d4856794d8bf6ba951586fe2e196a00743c764.tar.zst gsoc2013-empathy-f8d4856794d8bf6ba951586fe2e196a00743c764.zip | |
Merge remote branch 'glassrose/remove-typing-icon-in-muc-tabs-609420'
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 07b940e3f..5cb7ec494 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -666,7 +666,7 @@ chat_window_update_chat_tab (EmpathyChat *chat) else if (empathy_chat_get_nb_unread_messages (chat) > 0) { icon_name = EMPATHY_IMAGE_MESSAGE; } - else if (empathy_chat_is_composing (chat)) { + else if (remote_contact && empathy_chat_is_composing (chat)) { icon_name = EMPATHY_IMAGE_TYPING; } else if (remote_contact) { @@ -711,7 +711,7 @@ chat_window_update_chat_tab (EmpathyChat *chat) _("Topic:"), subject); } - if (empathy_chat_is_composing (chat)) { + if (remote_contact && empathy_chat_is_composing (chat)) { append_markup_printf (tooltip, "\n%s", _("Typing a message.")); } |