aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-03-06 19:53:17 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-03-06 19:53:17 +0800
commitc79a4dd6ecc739e5bca37cc8401bddc5c8a6c176 (patch)
tree0c3677d287fa650e0e4d74856f067653eea90563
parent26cad0730c6d4ccffc7b8bec79778b96460f11d0 (diff)
downloadgsoc2013-empathy-c79a4dd6ecc739e5bca37cc8401bddc5c8a6c176.tar
gsoc2013-empathy-c79a4dd6ecc739e5bca37cc8401bddc5c8a6c176.tar.gz
gsoc2013-empathy-c79a4dd6ecc739e5bca37cc8401bddc5c8a6c176.tar.bz2
gsoc2013-empathy-c79a4dd6ecc739e5bca37cc8401bddc5c8a6c176.tar.lz
gsoc2013-empathy-c79a4dd6ecc739e5bca37cc8401bddc5c8a6c176.tar.xz
gsoc2013-empathy-c79a4dd6ecc739e5bca37cc8401bddc5c8a6c176.tar.zst
gsoc2013-empathy-c79a4dd6ecc739e5bca37cc8401bddc5c8a6c176.zip
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
-rw-r--r--libempathy/empathy-log-manager.c7
-rw-r--r--libempathy/empathy-log-store-empathy.c2
2 files changed, 3 insertions, 6 deletions
diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index beded4c21..78f5c15eb 100644
--- 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 5d370bf9f..c35a403d6 100644
--- 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;
}