Merge branch 'master' into tp-tube

[empathy.git] / libempathy / empathy-log-store-empathy.c

diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index 8bae296857b2d88d51f98c59f2d1c204e82d16fa..b74b5e177dbb7fb2b41bf07e791c0ec245812448 100644 (file)
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -220,7 +220,7 @@ log_store_empathy_add_message (EmpathyLogStore *self,
   if (!g_file_test (filename, G_FILE_TEST_EXISTS))
     {
       file = g_fopen (filename, "w+");
-      if (file)
+      if (file != NULL)
         g_fprintf (file, LOG_HEADER);
 
       g_chmod (filename, LOG_FILE_CREATE_MODE);
@@ -228,7 +228,7 @@ log_store_empathy_add_message (EmpathyLogStore *self,
   else
     {
       file = g_fopen (filename, "r+");
-      if (file)
+      if (file != NULL)
         fseek (file, - strlen (LOG_FOOTER), SEEK_END);
     }
 
@@ -242,7 +242,7 @@ log_store_empathy_add_message (EmpathyLogStore *self,
   contact_id = g_markup_escape_text (str, -1);
 
   avatar = empathy_contact_get_avatar (sender);
-  if (avatar)
+  if (avatar != NULL)
     avatar_token = g_markup_escape_text (avatar->token, -1);
 
   g_fprintf (file,
@@ -477,12 +477,13 @@ log_store_empathy_get_messages_for_file (EmpathyLogStore *self,
         msg_type = empathy_message_type_from_str (msg_type_str);
 
       if (cm_id_str)
-        sscanf (cm_id_str, "%d", &cm_id);
+        cm_id = atoi (cm_id_str);
 
       t = empathy_time_parse (time);
 
-      sender = empathy_contact_new_full (account, sender_id, sender_name);
-      empathy_contact_set_is_user (sender, is_user);
+      sender = empathy_contact_new_for_log (account, sender_id, sender_name,
+                                           is_user);
+
       if (!EMP_STR_EMPTY (sender_avatar_token))
         empathy_contact_load_avatar_cache (sender,
             sender_avatar_token);
@@ -505,6 +506,7 @@ log_store_empathy_get_messages_for_file (EmpathyLogStore *self,
       xmlFree (is_user_str);
       xmlFree (msg_type_str);
       xmlFree (cm_id_str);
+      xmlFree (sender_avatar_token);
     }
 
   DEBUG ("Parsed %d messages", g_list_length (messages));
@@ -575,7 +577,7 @@ log_store_empathy_search_new (EmpathyLogStore *self,
   files = log_store_empathy_get_all_files (self, NULL);
   DEBUG ("Found %d log files in total", g_list_length (files));
 
-  for (l = files; l; l = l->next)
+  for (l = files; l; l = g_list_next (l))
     {
       gchar *filename;
       GMappedFile *file;
@@ -627,25 +629,28 @@ log_store_empathy_get_chats_for_dir (EmpathyLogStore *self,
   GDir *gdir;
   GList *hits = NULL;
   const gchar *name;
+  GError *error = NULL;
 
-  gdir = g_dir_open (dir, 0, NULL);
+  gdir = g_dir_open (dir, 0, &error);
   if (!gdir)
-    return NULL;
+    {
+      DEBUG ("Failed to open directory: %s, error: %s", dir, error->message);
+      g_error_free (error);
+      return NULL;
+    }
 
   while ((name = g_dir_read_name (gdir)) != NULL)
     {
       EmpathyLogSearchHit *hit;
-      gchar *filename;
 
-      filename = g_build_filename (dir, name, NULL);
-      if (strcmp (name, LOG_DIR_CHATROOMS) == 0)
+      if (!is_chatroom && strcmp (name, LOG_DIR_CHATROOMS) == 0)
         {
+          gchar *filename = g_build_filename (dir, name, NULL);
           hits = g_list_concat (hits, log_store_empathy_get_chats_for_dir (
-                self, dir, TRUE));
+                self, filename, TRUE));
           g_free (filename);
           continue;
         }
-
       hit = g_slice_new0 (EmpathyLogSearchHit);
       hit->chat_id = g_strdup (name);
       hit->is_chatroom = is_chatroom;
@@ -719,24 +724,31 @@ log_store_empathy_get_filtered_messages (EmpathyLogStore *self,
                                          gpointer user_data)
 {
   GList *dates, *l, *messages = NULL;
+  guint i = 0;
 
   dates = log_store_empathy_get_dates (self, account, chat_id, chatroom);
 
-  for (l = g_list_last (dates); l && g_list_length (messages) < num_messages; l = g_list_previous (l))
+  for (l = g_list_last (dates); l && i < num_messages; l = g_list_previous (l))
     {
       GList *new_messages, *n, *next;
 
+      /* FIXME: We should really restrict the message parsing to get only
+       * the newest num_messages. */
       new_messages = log_store_empathy_get_messages_for_date (self, account,
           chat_id, chatroom, l->data);
 
       n = new_messages;
-      while (n)
+      while (n != NULL)
         {
           next = g_list_next (n);
           if (!filter (n->data, user_data))
             {
               g_object_unref (n->data);
-              new_messages = g_list_remove (new_messages, n->data);
+              new_messages = g_list_delete_link (new_messages, n);
+            }
+          else
+            {
+              i++;
             }
           n = next;
         }