summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-06-07 15:13:54 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-06-20 16:20:06 +0200
commit53d0828ec31130434fa70f88af45e313a5bd104d (patch)
tree133908656a7e4abca152b7563ad9f1c9405a8ce8
parentea27db414c21f855aea26c0ccfd4b4963ff05963 (diff)
downloadempathy-53d0828ec31130434fa70f88af45e313a5bd104d.tar.gz
main_window_flash_foreach: fix FolksIndividual leak
-rw-r--r--src/empathy-main-window.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 094be41ac..db27766b6 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -207,10 +207,8 @@ main_window_flash_foreach (GtkTreeModel *model,
return FALSE;
contact = empathy_contact_dup_from_folks_individual (individual);
- if (contact != data->event->contact) {
- tp_clear_object (&contact);
- return FALSE;
- }
+ if (contact != data->event->contact)
+ goto out;
if (data->on) {
icon_name = data->event->icon_name;
@@ -239,6 +237,7 @@ main_window_flash_foreach (GtkTreeModel *model,
gtk_tree_path_free (parent_path);
}
+out:
g_object_unref (individual);
tp_clear_object (&contact);
tp_clear_object (&pixbuf);