From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 2 Apr 2011 03:52:46 +0000 (-0400)
Subject: GtkAppChooserButton: avoid some leaks
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=b112d882ef80892594b1fe707799e88a7d661315;p=~andy%2Fgtk

GtkAppChooserButton: avoid some leaks

gtk_tree_model_get() returns a reference for objects.
https://bugzilla.gnome.org/show_bug.cgi?id=646462
---

diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c
index 706ce1325..c50657dec 100644
--- a/gtk/gtkappchooserbutton.c
+++ b/gtk/gtkappchooserbutton.c
@@ -153,25 +153,29 @@ select_application_func_cb (GtkTreeModel *model,
   SelectAppData *data = user_data;
   GAppInfo *app_to_match = data->info, *app = NULL;
   gboolean custom;
+  gboolean result;
 
   gtk_tree_model_get (model, iter,
                       COLUMN_APP_INFO, &app,
                       COLUMN_CUSTOM, &custom,
                       -1);
 
-  /* cutsom items are always after GAppInfos, so iterating further here
+  /* custom items are always after GAppInfos, so iterating further here
    * is just useless.
    */
   if (custom)
-    return TRUE;
-
-  if (g_app_info_equal (app, app_to_match))
+    result = TRUE;
+  else if (g_app_info_equal (app, app_to_match))
     {
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (data->self), iter);
-      return TRUE;
+      result = TRUE;
     }
+  else
+    result = FALSE;
 
-  return FALSE;
+  g_object_unref (app);
+
+  return result;
 }
 
 static void