diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6476dd513..2a60815c9 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ AC_COPYRIGHT([ # Hardp deps FOLKS_REQUIRED=0.4.0 GCONF_REQUIRED=1.2.0 -GLIB_REQUIRED=2.27.2 +GLIB_REQUIRED=2.28.0 GNUTLS_REQUIRED=2.8.5 GSTREAMER_REQUIRED=0.10.32 GTK_REQUIRED=2.22.0 diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 922fcfc86..8384b3ef1 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -38,6 +38,7 @@ #include <telepathy-glib/account-manager.h> #include <telepathy-glib/util.h> #include <telepathy-logger/log-manager.h> +#include <telepathy-logger/text-event.h> #include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-utils.h> @@ -2052,12 +2053,32 @@ got_filtered_messages_cb (GObject *manager, for (l = messages; l; l = g_list_next (l)) { EmpathyMessage *message; + GList *supersedes; g_assert (TPL_IS_EVENT (l->data)); + /* we need the last message this one supersedes, which is the + * the original */ + supersedes = tpl_text_event_dup_supersedes (l->data); + + if (supersedes != NULL) { + message = empathy_message_from_tpl_log_event ( + g_list_last (supersedes)->data); + empathy_chat_view_append_message (chat->view, message); + + g_object_unref (message); + } + + g_list_free_full (supersedes, g_object_unref); + + /* append the latest message */ message = empathy_message_from_tpl_log_event (l->data); g_object_unref (l->data); - empathy_chat_view_append_message (chat->view, message); + if (empathy_message_is_edit (message)) + empathy_chat_view_edit_message (chat->view, message); + else + empathy_chat_view_append_message (chat->view, message); + g_object_unref (message); } g_list_free (messages); |