aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-individual-store.c
diff options
context:
space:
mode:
authorTravis Reitter <treitter@gmail.com>2010-07-08 11:16:46 +0800
committerTravis Reitter <treitter@gmail.com>2010-07-21 07:12:36 +0800
commitcb703ba93de027d1b62b1a9716ca7d9c0d90133b (patch)
treea7c99918b291ae9abc500d0c5928641d8cc84423 /libempathy-gtk/empathy-individual-store.c
parentdf6ea1a0a3bdef9fc134bfaaa02ca3614398ca16 (diff)
downloadgsoc2013-empathy-cb703ba93de027d1b62b1a9716ca7d9c0d90133b.tar
gsoc2013-empathy-cb703ba93de027d1b62b1a9716ca7d9c0d90133b.tar.gz
gsoc2013-empathy-cb703ba93de027d1b62b1a9716ca7d9c0d90133b.tar.bz2
gsoc2013-empathy-cb703ba93de027d1b62b1a9716ca7d9c0d90133b.tar.lz
gsoc2013-empathy-cb703ba93de027d1b62b1a9716ca7d9c0d90133b.tar.xz
gsoc2013-empathy-cb703ba93de027d1b62b1a9716ca7d9c0d90133b.tar.zst
gsoc2013-empathy-cb703ba93de027d1b62b1a9716ca7d9c0d90133b.zip
Take advantage of the tp_clear_* utility functions.
Diffstat (limited to 'libempathy-gtk/empathy-individual-store.c')
-rw-r--r--libempathy-gtk/empathy-individual-store.c28
1 files changed, 5 insertions, 23 deletions
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 87fa80083..4a3b68653 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -269,10 +269,7 @@ individual_store_find_contact_foreach (GtkTreeModel *model,
fc->iters = g_list_append (fc->iters, gtk_tree_iter_copy (iter));
}
- if (individual != NULL)
- {
- g_object_unref (individual);
- }
+ tp_clear_object (&individual);
return FALSE;
}
@@ -1271,16 +1268,8 @@ individual_store_state_sort_func (GtkTreeModel *model,
free_and_out:
g_free (name_a);
g_free (name_b);
-
- if (individual_a)
- {
- g_object_unref (individual_a);
- }
-
- if (individual_b)
- {
- g_object_unref (individual_b);
- }
+ tp_clear_object (&individual_a);
+ tp_clear_object (&individual_b);
return ret_val;
}
@@ -1314,15 +1303,8 @@ individual_store_name_sort_func (GtkTreeModel *model,
else
ret_val = individual_store_contact_sort (individual_a, individual_b);
- if (individual_a)
- {
- g_object_unref (individual_a);
- }
-
- if (individual_b)
- {
- g_object_unref (individual_b);
- }
+ tp_clear_object (&individual_a);
+ tp_clear_object (&individual_b);
return ret_val;
}