diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-14 14:43:25 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 11:24:58 +0200 |
| commit | a682d5f16729441a56affa947637987243f853ed (patch) | |
| tree | 4d49208d7360c6b02110ba92f8f3bd85fbb4a5f9 | |
| parent | 32734078f899a8ee87351c034bde498c10fa0cc0 (diff) | |
log_store_xml_get_chats_for_dir: use _tpl_log_manager_search_hit_new
Also set the account off the hit (fdo #29058).
| -rw-r--r-- | telepathy-logger/log-store-xml.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c index c8da05499..fe6391c84 100644 --- a/telepathy-logger/log-store-xml.c +++ b/telepathy-logger/log-store-xml.c @@ -1064,7 +1064,8 @@ log_store_xml_search_new (TplLogStore *store, static GList * log_store_xml_get_chats_for_dir (TplLogStoreXml *self, const gchar *dir, - gboolean is_chatroom) + gboolean is_chatroom, + TpAccount *account) { GDir *gdir; GList *hits = NULL; @@ -1090,13 +1091,13 @@ log_store_xml_get_chats_for_dir (TplLogStoreXml *self, { gchar *filename = g_build_filename (dir, name, NULL); hits = g_list_concat (hits, - log_store_xml_get_chats_for_dir (self, filename, TRUE)); + log_store_xml_get_chats_for_dir (self, filename, TRUE, account)); g_free (filename); continue; } - hit = g_slice_new0 (TplLogSearchHit); - hit->chat_id = g_strdup (name); - hit->is_chatroom = is_chatroom; + + hit = _tpl_log_manager_search_hit_new (account, name, is_chatroom, + NULL, NULL); hits = g_list_prepend (hits, hit); } @@ -1146,7 +1147,7 @@ log_store_xml_get_chats (TplLogStore *store, g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL); dir = log_store_xml_get_dir (self, account, NULL, FALSE); - hits = log_store_xml_get_chats_for_dir (self, dir, FALSE); + hits = log_store_xml_get_chats_for_dir (self, dir, FALSE, account); g_free (dir); for (guint i = 0; i < g_list_length (hits); ++i) |