aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--libempathy-gtk/empathy-chat.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 53e764d49..89a8a9fe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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) {