aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-12-27 02:22:04 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-12-29 21:01:01 +0800
commitd471250122f68adba8625fbc719614f927fa4103 (patch)
treead10d6d19e886ec85647717ff2252bc910d89748 /src
parentf49b34ee571c0894ab4e85af27479c288b0560c1 (diff)
downloadgsoc2013-empathy-d471250122f68adba8625fbc719614f927fa4103.tar
gsoc2013-empathy-d471250122f68adba8625fbc719614f927fa4103.tar.gz
gsoc2013-empathy-d471250122f68adba8625fbc719614f927fa4103.tar.bz2
gsoc2013-empathy-d471250122f68adba8625fbc719614f927fa4103.tar.lz
gsoc2013-empathy-d471250122f68adba8625fbc719614f927fa4103.tar.xz
gsoc2013-empathy-d471250122f68adba8625fbc719614f927fa4103.tar.zst
gsoc2013-empathy-d471250122f68adba8625fbc719614f927fa4103.zip
Remove the composing list
Diffstat (limited to 'src')
-rw-r--r--src/empathy-chat-window.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 1a7c2aa0e..f764df513 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -75,7 +75,6 @@ typedef struct {
EmpathyChat *current_chat;
GList *chats;
GList *chats_new_msg;
- GList *chats_composing;
gboolean page_added;
gboolean dnd_same_window;
EmpathyChatroomManager *chatroom_manager;
@@ -668,7 +667,7 @@ chat_window_update_chat_tab (EmpathyChat *chat)
else if (g_list_find (priv->chats_new_msg, chat)) {
icon_name = EMPATHY_IMAGE_MESSAGE;
}
- else if (g_list_find (priv->chats_composing, chat)) {
+ else if (empathy_chat_is_composing (chat)) {
icon_name = EMPATHY_IMAGE_TYPING;
}
else if (remote_contact) {
@@ -713,7 +712,7 @@ chat_window_update_chat_tab (EmpathyChat *chat)
_("Topic:"), subject);
}
- if (g_list_find (priv->chats_composing, chat)) {
+ if (empathy_chat_is_composing (chat)) {
append_markup_printf (tooltip, "\n%s", _("Typing a message."));
}
@@ -1242,16 +1241,6 @@ chat_window_composing_cb (EmpathyChat *chat,
gboolean is_composing,
EmpathyChatWindow *window)
{
- EmpathyChatWindowPriv *priv;
-
- priv = GET_PRIV (window);
-
- if (is_composing && !g_list_find (priv->chats_composing, chat)) {
- priv->chats_composing = g_list_prepend (priv->chats_composing, chat);
- } else {
- priv->chats_composing = g_list_remove (priv->chats_composing, chat);
- }
-
chat_window_update_chat_tab (chat);
}
@@ -1630,7 +1619,6 @@ chat_window_page_removed_cb (GtkNotebook *notebook,
priv->chats = g_list_remove (priv->chats, chat);
priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat);
empathy_chat_messages_read (chat);
- priv->chats_composing = g_list_remove (priv->chats_composing, chat);
if (priv->chats == NULL) {
g_object_unref (window);
@@ -2104,7 +2092,6 @@ empathy_chat_window_init (EmpathyChatWindow *window)
/* Set up private details */
priv->chats = NULL;
priv->chats_new_msg = NULL;
- priv->chats_composing = NULL;
priv->current_chat = NULL;
priv->notification = NULL;