empathy r2614 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Mar  6 11:53:17 2009
New Revision: 2614
URL: http://svn.gnome.org/viewvc/empathy?rev=2614&view=rev

Log:
Use g_list_delete_link instead of g_list_remove.

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy/empathy-log-manager.c
   trunk/libempathy/empathy-log-store-empathy.c

Modified: trunk/libempathy/empathy-log-manager.c
==============================================================================
--- trunk/libempathy/empathy-log-manager.c	(original)
+++ trunk/libempathy/empathy-log-manager.c	Fri Mar  6 11:53:17 2009
@@ -313,11 +313,8 @@
 
   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;

Modified: trunk/libempathy/empathy-log-store-empathy.c
==============================================================================
--- trunk/libempathy/empathy-log-store-empathy.c	(original)
+++ trunk/libempathy/empathy-log-store-empathy.c	Fri Mar  6 11:53:17 2009
@@ -736,7 +736,7 @@
           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;
         }