aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-contact.c4
-rw-r--r--libempathy/empathy-message.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 8cca70944..c766857ee 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -1625,7 +1625,7 @@ geocode_cb (GObject *source,
g_object_notify ((GObject *) contact, "location");
out:
- tp_clear_pointer (&result, g_hash_table_unref);
+ tp_clear_pointer (&resolved, g_hash_table_unref);
g_object_unref (contact);
}
@@ -1645,6 +1645,8 @@ update_geocode (EmpathyContact *contact)
return;
geocode = geocode_object_new_for_params (location);
+ if (geocode == NULL)
+ return;
geocode_object_resolve_async (geocode, NULL, geocode_cb,
g_object_ref (contact));
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 7864ee2ba..f175a45d3 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -413,6 +413,7 @@ empathy_message_from_tpl_log_event (TplEvent *logevent)
body = g_strdup_printf (_("Missed call from %s"),
tpl_entity_get_alias (tpl_event_get_sender (logevent)));
else if (tpl_entity_get_entity_type (tpl_event_get_sender (logevent)) == TPL_ENTITY_SELF)
+ /* Translators: this is an outgoing call, e.g. 'Called Alice' */
body = g_strdup_printf (_("Called %s"),
tpl_entity_get_alias (tpl_event_get_receiver (logevent)));
else