diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-28 01:13:08 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-28 01:13:08 +0800 |
| commit | ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63 (patch) | |
| tree | 9000bdbec987c63075e5bdafcface5e18f2614d1 | |
| parent | 92172bae28e5fa2a91d87bc9e715c9bad01d888f (diff) | |
| download | gsoc2013-empathy-ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63.tar gsoc2013-empathy-ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63.tar.gz gsoc2013-empathy-ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63.tar.bz2 gsoc2013-empathy-ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63.tar.lz gsoc2013-empathy-ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63.tar.xz gsoc2013-empathy-ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63.tar.zst gsoc2013-empathy-ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63.zip | |
empathy_message_new is gone, use g_object_new
| -rw-r--r-- | libempathy/empathy-message.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 322fb2df9..15999dcdd 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -309,11 +309,12 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) body = g_strdup (tpl_text_event_get_message ( TPL_TEXT_EVENT (logevent))); - retval = empathy_message_new (body); - - empathy_message_set_tptype (retval, - tpl_text_event_get_message_type (TPL_TEXT_EVENT (logevent))); - empathy_message_set_is_backlog (retval, TRUE); + retval = g_object_new (EMPATHY_TYPE_MESSAGE, + "type", tpl_text_event_get_message_type (TPL_TEXT_EVENT (logevent)), + "body", body, + "timestamp", tpl_event_get_timestamp (logevent), + "is-backlog", TRUE, + NULL); g_free (body); } else if (TPL_IS_CALL_EVENT (logevent)) { @@ -328,20 +329,18 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) body = g_strdup_printf (_("Call from %s"), tpl_entity_get_alias (tpl_event_get_sender (logevent))); - retval = empathy_message_new (body); + retval = g_object_new (EMPATHY_TYPE_MESSAGE, + "body", body, + "timestamp", tpl_event_get_timestamp (logevent), + NULL); g_free (body); + } else { + return NULL; } receiver = tpl_event_get_receiver (logevent); sender = tpl_event_get_sender (logevent); - retval = g_object_new (EMPATHY_TYPE_MESSAGE, - "type", tpl_text_event_get_message_type (TPL_TEXT_EVENT (logevent)), - "body", body, - "is-backlog", TRUE, - "timestamp", tpl_event_get_timestamp (logevent), - NULL); - if (receiver != NULL) { contact = empathy_contact_from_tpl_contact (account, receiver); empathy_message_set_receiver (retval, contact); @@ -354,8 +353,6 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) g_object_unref (contact); } - g_free (body); - return retval; } |