diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-20 15:25:46 +1000 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-25 11:02:31 +1000 |
| commit | 24aaea403ecc327f8b7e8dfb8cd722c4a7196089 (patch) | |
| tree | 3e37ca84a25bfda5306f54124600e3007026e6a1 | |
| parent | 6b6c8f4d75a3bba7aa3bba735749ddd3795a9da1 (diff) | |
| download | empathy-24aaea403ecc327f8b7e8dfb8cd722c4a7196089.tar.gz | |
Set 'token' and 'supersedes' for events from the logger
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy/empathy-message.c | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 3b2618379..6476dd513 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ LIBCANBERRA_GTK_REQUIRED=0.4 LIBNOTIFY_REQUIRED=0.7.0 TELEPATHY_FARSIGHT_REQUIRED=0.0.14 TELEPATHY_GLIB_REQUIRED=0.14.1 -TELEPATHY_LOGGER=0.2.8 +TELEPATHY_LOGGER=0.2.9.1 UNIQUE_REQUIRED=1.1.2 # Optionnal deps diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 4d25b30ae..a1b7ae0e5 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -318,7 +318,7 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) TpAccount *account = NULL; TplEntity *receiver = NULL; TplEntity *sender = NULL; - gchar *body= NULL; + gchar *body = NULL; EmpathyContact *contact; g_return_val_if_fail (TPL_IS_EVENT (logevent), NULL); @@ -340,11 +340,14 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) g_object_unref (acc_man); if (TPL_IS_TEXT_EVENT (logevent)) { - body = g_strdup (tpl_text_event_get_message ( - TPL_TEXT_EVENT (logevent))); + TplTextEvent *textevent = TPL_TEXT_EVENT (logevent); + + body = g_strdup (tpl_text_event_get_message (textevent)); retval = g_object_new (EMPATHY_TYPE_MESSAGE, - "type", tpl_text_event_get_message_type (TPL_TEXT_EVENT (logevent)), + "type", tpl_text_event_get_message_type (textevent), + "token", tpl_text_event_get_message_token (textevent), + "supersedes", tpl_text_event_get_supersedes_token (textevent), "body", body, "timestamp", tpl_event_get_timestamp (logevent), "is-backlog", TRUE, |