]> Pileus Git - ~andy/gtk/commitdiff
Fixed gtk_recent_chooser_menu_set_current_filter to update the local pointer.
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Fri, 4 Feb 2011 15:58:40 +0000 (00:58 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Fri, 4 Feb 2011 16:00:55 +0000 (01:00 +0900)
Before this patch, unsetting the filter manually before disposing
the recent chooser menu (or unsetting the filter twice), would cause
warnings (or invalid memory accesses).

gtk/gtkrecentchoosermenu.c

index 9e37703ac32b68ded3b8cbafacea5e3436b7df9a..4d61ad16a3b6c3b51f282dff85d56061cf07dfab 100644 (file)
@@ -731,11 +731,10 @@ gtk_recent_chooser_menu_set_current_filter (GtkRecentChooserMenu *menu,
   if (priv->current_filter)
     g_object_unref (G_OBJECT (priv->current_filter));
   
-  if (filter)
-    {
-      priv->current_filter = filter;
-      g_object_ref_sink (priv->current_filter);
-    }
+  priv->current_filter = filter;
+
+  if (priv->current_filter)
+    g_object_ref_sink (priv->current_filter);
 
   gtk_recent_chooser_menu_populate (menu);