diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-09-21 21:22:52 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-09-21 21:22:52 +0800 |
| commit | fad6f33cf1c3c3af5a93700601e09e8263f2ffba (patch) | |
| tree | 94487c25de048f2d8e144c3a56c2b07d5510f12b | |
| parent | df79acf5765374714dd018519152a203291f1e5a (diff) | |
| download | gsoc2013-empathy-fad6f33cf1c3c3af5a93700601e09e8263f2ffba.tar gsoc2013-empathy-fad6f33cf1c3c3af5a93700601e09e8263f2ffba.tar.gz gsoc2013-empathy-fad6f33cf1c3c3af5a93700601e09e8263f2ffba.tar.bz2 gsoc2013-empathy-fad6f33cf1c3c3af5a93700601e09e8263f2ffba.tar.lz gsoc2013-empathy-fad6f33cf1c3c3af5a93700601e09e8263f2ffba.tar.xz gsoc2013-empathy-fad6f33cf1c3c3af5a93700601e09e8263f2ffba.tar.zst gsoc2013-empathy-fad6f33cf1c3c3af5a93700601e09e8263f2ffba.zip | |
Move TP_CHANNEL_CHAT_STATE_PAUSED to the not typing case. Fixes bug
2007-09-21 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-chat.c: Move TP_CHANNEL_CHAT_STATE_PAUSED to
the not typing case. Fixes bug #474603 (Cosimo Cecchi).
svn path=/trunk/; revision=307
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2007-09-21 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-chat.c: Move TP_CHANNEL_CHAT_STATE_PAUSED to + the not typing case. Fixes bug #474603 (Cosimo Cecchi). + +2007-09-21 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-status-icon.c: Tooltip for subscription request shouldn't display "Message:" if the message is empty. Fixes bug #459538 (Cosimo Cecchi). diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index af35b0334..c98cc12df 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -1103,6 +1103,7 @@ chat_state_changed_cb (EmpathyTpChat *tp_chat, switch (state) { case TP_CHANNEL_CHAT_STATE_GONE: case TP_CHANNEL_CHAT_STATE_INACTIVE: + case TP_CHANNEL_CHAT_STATE_PAUSED: case TP_CHANNEL_CHAT_STATE_ACTIVE: /* Contact is not composing */ if (l) { @@ -1111,7 +1112,6 @@ chat_state_changed_cb (EmpathyTpChat *tp_chat, g_list_free1 (l); } break; - case TP_CHANNEL_CHAT_STATE_PAUSED: case TP_CHANNEL_CHAT_STATE_COMPOSING: /* Contact is composing */ if (!l) { |