From d8fe101ab2497d11394d24a569fc23ca6c943e8b Mon Sep 17 00:00:00 2001 From: David Laban Date: Thu, 19 May 2011 17:35:50 -0400 Subject: fixup! Store, save and test message-token and supersedes-token Addresses: > > + if (token_str != NULL) > You might want to use TPL_STR_EMPTY() instead. > We should be a little more robust, and ignore supersedes if there is no > token. I assume that by this, you mean only record it if message-token also exists? --- telepathy-logger/log-store-xml.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'telepathy-logger/log-store-xml.c') diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c index 51e2eef..80f1419 100644 --- a/telepathy-logger/log-store-xml.c +++ b/telepathy-logger/log-store-xml.c @@ -550,19 +550,19 @@ add_text_event (TplLogStoreXml *self, _tpl_text_event_message_type_to_str (msg_type)); token_str = tpl_text_event_get_message_token (message); - if (token_str != NULL) + if (TPL_STR_EMPTY (token_str)) { gchar *message_token = g_markup_escape_text (token_str, -1); g_string_append_printf (event, " message-token='%s'", message_token); g_free (message_token); - } - token_str = tpl_text_event_get_supersedes_token (message); - if (token_str != NULL) - { - gchar *supersedes_token = g_markup_escape_text (token_str, -1); - g_string_append_printf (event, " supersedes-token='%s'", - supersedes_token); + token_str = tpl_text_event_get_supersedes_token (message); + if (TPL_STR_EMPTY (token_str)) + { + gchar *supersedes_token = g_markup_escape_text (token_str, -1); + g_string_append_printf (event, " supersedes-token='%s'", + supersedes_token); + } } g_string_append_printf (event, ">%s\n" LOG_FOOTER, body); -- cgit v1.2.1