aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-03-09 04:36:43 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-03-09 04:36:43 +0800
commitc58edaa9a56b5cb43cbce20dc96a19d1f7085fbf (patch)
treeeb6af91c1b8359bcf7f5f72a99adc31b408f4112
parenta5c4e3ebc50c91ece5c524f9b381a57dfb330eea (diff)
downloadgsoc2013-empathy-c58edaa9a56b5cb43cbce20dc96a19d1f7085fbf.tar
gsoc2013-empathy-c58edaa9a56b5cb43cbce20dc96a19d1f7085fbf.tar.gz
gsoc2013-empathy-c58edaa9a56b5cb43cbce20dc96a19d1f7085fbf.tar.bz2
gsoc2013-empathy-c58edaa9a56b5cb43cbce20dc96a19d1f7085fbf.tar.lz
gsoc2013-empathy-c58edaa9a56b5cb43cbce20dc96a19d1f7085fbf.tar.xz
gsoc2013-empathy-c58edaa9a56b5cb43cbce20dc96a19d1f7085fbf.tar.zst
gsoc2013-empathy-c58edaa9a56b5cb43cbce20dc96a19d1f7085fbf.zip
Do not queue messages in EmpathyChat as there are queued in EmpathyTpChat now.
svn path=/trunk/; revision=714
-rw-r--r--libempathy-gtk/empathy-chat.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 8af3d573c..6d3d1a12d 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -81,7 +81,6 @@ struct _EmpathyChatPriv {
time_t last_log_timestamp;
gboolean is_first_char;
guint block_events_timeout_id;
- GList *pending_messages;
/* Used to automatically shrink a window that has temporarily
* grown due to long input.
*/
@@ -398,9 +397,6 @@ chat_finalize (GObject *object)
chat_composing_remove_timeout (chat);
g_object_unref (priv->log_manager);
- g_list_foreach (priv->pending_messages, (GFunc) g_object_unref, NULL);
- g_list_free (priv->pending_messages);
-
dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged",
G_CALLBACK (chat_status_changed_cb),
chat);
@@ -449,9 +445,6 @@ chat_destroy_cb (EmpathyTpChat *tp_chat,
g_source_remove (priv->block_events_timeout_id);
}
- g_list_foreach (priv->pending_messages, (GFunc) g_object_unref, NULL);
- g_list_free (priv->pending_messages);
-
if (EMPATHY_CHAT_GET_CLASS (chat)->set_tp_chat) {
EMPATHY_CHAT_GET_CLASS (chat)->set_tp_chat (chat, NULL);
}
@@ -535,14 +528,6 @@ chat_message_received_cb (EmpathyTpChat *tp_chat,
return;
}
- if (chat->block_events) {
- /* Wait until block_events cb before displaying
- * them to have to chance to get alias/avatar of sender. */
- priv->pending_messages = g_list_append (priv->pending_messages,
- g_object_ref (message));
- return;
- }
-
sender = empathy_message_get_sender (message);
empathy_debug (DEBUG_DOMAIN, "Appending message ('%s')",
empathy_contact_get_name (sender));
@@ -1484,18 +1469,10 @@ chat_block_events_timeout_cb (gpointer data)
{
EmpathyChat *chat = EMPATHY_CHAT (data);
EmpathyChatPriv *priv = GET_PRIV (chat);
- GList *l;
chat->block_events = FALSE;
priv->block_events_timeout_id = 0;
- for (l = priv->pending_messages; l; l = l->next) {
- chat_message_received_cb (priv->tp_chat, l->data, chat);
- g_object_unref (l->data);
- }
- g_list_free (priv->pending_messages);
- priv->pending_messages = NULL;
-
return FALSE;
}