diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-24 17:21:35 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-25 14:03:36 -0400 |
| commit | 63e1e52b2c049ac8b337c72b7398c906a4aea10a (patch) | |
| tree | 050eb87d7231820a5c0fd26e2552277a3104cd7b | |
| parent | d5c1d96681dd5991031a0aa2d887bff2d6135690 (diff) | |
| download | telepathy-logger-63e1e52b2c049ac8b337c72b7398c906a4aea10a.tar.gz | |
Avatar token can no longer be NULL
| -rw-r--r-- | telepathy-logger/log-store-xml.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c index 70c4422..edc6813 100644 --- a/telepathy-logger/log-store-xml.c +++ b/telepathy-logger/log-store-xml.c @@ -505,17 +505,15 @@ add_text_event (TplLogStoreXml *self, sender = tpl_event_get_sender (TPL_EVENT (message)); contact_id = g_markup_escape_text (tpl_entity_get_identifier (sender), -1); - if (tpl_entity_get_alias (sender) != NULL) - contact_name = g_markup_escape_text (tpl_entity_get_alias (sender), -1); - if (tpl_entity_get_avatar_token (sender) != NULL) - avatar_token = g_markup_escape_text (tpl_entity_get_avatar_token - (sender), -1); + contact_name = g_markup_escape_text (tpl_entity_get_alias (sender), -1); + avatar_token = g_markup_escape_text (tpl_entity_get_avatar_token (sender), + -1); event = g_strdup_printf ("<message time='%s' id='%s' name='%s' " "token='%s' isuser='%s' type='%s'>" "%s</message>\n" LOG_FOOTER, timestamp, contact_id, contact_name, - avatar_token ? avatar_token : "", + avatar_token, tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF ? "true" : "false", _tpl_text_event_message_type_to_str (msg_type), |