diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-26 18:03:23 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-27 03:52:12 +0800 |
| commit | 0566ba432cb7c9b7149edd2f5adde38263456d7f (patch) | |
| tree | e279a2afeee567098c166df65f077cc3e4db5489 | |
| parent | c861f39a49eca2740aa58ede91077b2274a8f415 (diff) | |
| download | gsoc2013-empathy-0566ba432cb7c9b7149edd2f5adde38263456d7f.tar gsoc2013-empathy-0566ba432cb7c9b7149edd2f5adde38263456d7f.tar.gz gsoc2013-empathy-0566ba432cb7c9b7149edd2f5adde38263456d7f.tar.bz2 gsoc2013-empathy-0566ba432cb7c9b7149edd2f5adde38263456d7f.tar.lz gsoc2013-empathy-0566ba432cb7c9b7149edd2f5adde38263456d7f.tar.xz gsoc2013-empathy-0566ba432cb7c9b7149edd2f5adde38263456d7f.tar.zst gsoc2013-empathy-0566ba432cb7c9b7149edd2f5adde38263456d7f.zip | |
make check fixes
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-message.c | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 8fceb331a..b6296edeb 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -2550,7 +2550,7 @@ got_entities (GObject *manager, { FilterCallbackData *data = user_data; GList *entities; - GError *error; + GError *error = NULL; if (!tpl_log_manager_get_entities_finish (TPL_LOG_MANAGER (manager), result, &entities, &error)) diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 5af02008f..d9ac0e2a9 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -325,7 +325,7 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) empathy_message_set_receiver (retval, contact); g_object_unref (contact); } - + if (sender != NULL) { contact = empathy_contact_from_tpl_contact (account, sender); empathy_message_set_sender (retval, contact); diff --git a/po/POTFILES.in b/po/POTFILES.in index 4b5af18b9..59a69cbb5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,6 +6,7 @@ data/org.gnome.Empathy.gschema.xml.in data/empathy-accounts.desktop.in.in libempathy/empathy-ft-handler.c +libempathy/empathy-message.c libempathy/empathy-tp-contact-list.c libempathy/empathy-tp-file.c libempathy/empathy-utils.c |