Use g_list_delete_link instead of g_list_remove.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=2614

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index beded4c215299076b3ebb4735b6509cb42dc8203..78f5c15eb7482c6684c418f177d88a7e46f2b7e7 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -313,11 +313,8 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
 
   for (i = 0; out_size - i > num_messages; i++)
     {
-      EmpathyMessage *message;
-
-      message = out->data;
-      out = g_list_remove (out, message);
-      g_object_unref (message);
+      g_object_unref (out->data);
+      out = g_list_delete_link (out, out);
     }
 
   return out;

diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index 5d370bf9f7a2b2dde82d0ee9cfd4eb920dd1b50a..c35a403d6eeb791a9daadaed47b271503f1dbdb7 100644 (file)
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -736,7 +736,7 @@ log_store_empathy_get_filtered_messages (EmpathyLogStore *self,
           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);
             }
           n = next;
         }