diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-09 20:18:32 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-09 20:18:32 +0800 |
| commit | 36db8ebb6a9bcc9852c7218b020ef05f6105bb69 (patch) | |
| tree | 193a1c48e454a2ac5ba4ab4990cd81caefe9cce3 | |
| parent | 03635afd3d842f27d1e64d9e056b0a810b38f0e2 (diff) | |
| parent | 16074928eee79472c804687556c193f50409ce8c (diff) | |
| download | gsoc2013-empathy-36db8ebb6a9bcc9852c7218b020ef05f6105bb69.tar gsoc2013-empathy-36db8ebb6a9bcc9852c7218b020ef05f6105bb69.tar.gz gsoc2013-empathy-36db8ebb6a9bcc9852c7218b020ef05f6105bb69.tar.bz2 gsoc2013-empathy-36db8ebb6a9bcc9852c7218b020ef05f6105bb69.tar.lz gsoc2013-empathy-36db8ebb6a9bcc9852c7218b020ef05f6105bb69.tar.xz gsoc2013-empathy-36db8ebb6a9bcc9852c7218b020ef05f6105bb69.tar.zst gsoc2013-empathy-36db8ebb6a9bcc9852c7218b020ef05f6105bb69.zip | |
Merge branch 'backlog-623914'
| -rw-r--r-- | libempathy/empathy-message.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 3d755c92b..a8d6af575 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -314,7 +314,7 @@ empathy_message_from_tpl_log_entry (TplEntry *logentry) tpl_entry_get_timestamp (logentry)); empathy_message_set_id (retval, tpl_entry_text_get_pending_msg_id (TPL_ENTRY_TEXT (logentry))); - empathy_message_set_is_backlog (retval, FALSE); + empathy_message_set_is_backlog (retval, TRUE); g_free (body); diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index b77fbb216..90c31e4cc 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -284,6 +284,9 @@ tp_chat_build_message (EmpathyTpChat *chat, empathy_message_set_incoming (message, incoming); empathy_message_set_flags (message, flags); + if (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) + empathy_message_set_is_backlog (message, TRUE); + g_queue_push_tail (priv->messages_queue, message); if (from_handle == 0) { |