Add a check on the filter argument, instead of blindly passing it to

2006-08-14  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkrecentchooser.c:
	(gtk_recent_chooser_add_filter),
	(gtk_recent_chooser_remove_filter),
	(gtk_recent_chooser_set_filter): Add a check on the
	filter argument, instead of blindly passing it to
	underlying implementation.

	* gtk/gtkrecentchoosermenu.c:
	(gtk_recent_chooser_menu_add_filter),
	(gtk_recent_chooser_menu_remove_filter),
	(gtk_recent_chooser_menu_list_filters): Implement
	these GtkRecentChooser methods, by setting and
	returning the only GtkRecentFilter object supported
	by a GtkRecentChooserMenu. (#347856, reported by Rod
	Butcher)

diff --git a/ChangeLog b/ChangeLog
index 7b6d3da39fa963606ca2e3f527eb63d4f321991f..eea2417b9612bcf679b3699a7bf6bc3a10da22d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-08-14  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtkrecentchooser.c:
+       (gtk_recent_chooser_add_filter),
+       (gtk_recent_chooser_remove_filter),
+       (gtk_recent_chooser_set_filter): Add a check on the
+       filter argument, instead of blindly passing it to
+       underlying implementation.
+
+       * gtk/gtkrecentchoosermenu.c:
+       (gtk_recent_chooser_menu_add_filter),
+       (gtk_recent_chooser_menu_remove_filter),
+       (gtk_recent_chooser_menu_list_filters): Implement
+       these GtkRecentChooser methods, by setting and
+       returning the only GtkRecentFilter object supported
+       by a GtkRecentChooserMenu. (#347856, reported by Rod
+       Butcher)
+
 2006-08-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_remove): Null the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b6d3da39fa963606ca2e3f527eb63d4f321991f..eea2417b9612bcf679b3699a7bf6bc3a10da22d2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,21 @@
+2006-08-14  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtkrecentchooser.c:
+       (gtk_recent_chooser_add_filter),
+       (gtk_recent_chooser_remove_filter),
+       (gtk_recent_chooser_set_filter): Add a check on the
+       filter argument, instead of blindly passing it to
+       underlying implementation.
+
+       * gtk/gtkrecentchoosermenu.c:
+       (gtk_recent_chooser_menu_add_filter),
+       (gtk_recent_chooser_menu_remove_filter),
+       (gtk_recent_chooser_menu_list_filters): Implement
+       these GtkRecentChooser methods, by setting and
+       returning the only GtkRecentFilter object supported
+       by a GtkRecentChooserMenu. (#347856, reported by Rod
+       Butcher)
+
 2006-08-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_remove): Null the

diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index fe2c39dc19134b0682eb4127449c47ed8b4ab146..06b5fdd7649f8e3648a09999effd30580c59a618 100644 (file)
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -884,6 +884,7 @@ gtk_recent_chooser_add_filter (GtkRecentChooser *chooser,
                               GtkRecentFilter  *filter)
 {
   g_return_if_fail (GTK_IS_RECENT_CHOOSER (chooser));
+  g_return_if_fail (GTK_IS_RECENT_FILTER (filter));
   
   GTK_RECENT_CHOOSER_GET_IFACE (chooser)->add_filter (chooser, filter);
 }
@@ -902,6 +903,7 @@ gtk_recent_chooser_remove_filter (GtkRecentChooser *chooser,
                                  GtkRecentFilter  *filter)
 {
   g_return_if_fail (GTK_IS_RECENT_CHOOSER (chooser));
+  g_return_if_fail (GTK_IS_RECENT_FILTER (filter));
   
   GTK_RECENT_CHOOSER_GET_IFACE (chooser)->remove_filter (chooser, filter);
 }
@@ -940,6 +942,7 @@ gtk_recent_chooser_set_filter (GtkRecentChooser *chooser,
                               GtkRecentFilter  *filter)
 {
   g_return_if_fail (GTK_IS_RECENT_CHOOSER (chooser));
+  g_return_if_fail (GTK_IS_RECENT_FILTER (filter));
   
   g_object_set (G_OBJECT (chooser), "filter", filter, NULL);
 }

diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index 1e066744b37c7020a558a258bca88170804c83b4..6f1b6369938cb7b4058b8309f7fae76ad2a6933f 100644 (file)
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -671,28 +671,40 @@ static void
 gtk_recent_chooser_menu_add_filter (GtkRecentChooser *chooser,
                                    GtkRecentFilter  *filter)
 {
-  g_warning (_("This function is not implemented for "
-               "widgets of class '%s'"),
-             g_type_name (G_OBJECT_TYPE (chooser)));
+  GtkRecentChooserMenu *menu;
+
+  menu = GTK_RECENT_CHOOSER_MENU (chooser);
+  
+  gtk_recent_chooser_menu_set_current_filter (menu, filter);
 }
 
 static void
 gtk_recent_chooser_menu_remove_filter (GtkRecentChooser *chooser,
                                       GtkRecentFilter  *filter)
 {
-  g_warning (_("This function is not implemented for "
-               "widgets of class '%s'"),
-             g_type_name (G_OBJECT_TYPE (chooser)));
+  GtkRecentChooserMenu *menu;
+
+  menu = GTK_RECENT_CHOOSER_MENU (chooser);
+  
+  if (filter == menu->priv->current_filter)
+    {
+      g_object_unref (menu->priv->current_filter);
+      menu->priv->current_filter = NULL;
+
+      g_object_notify (G_OBJECT (menu), "filter");
+    }
 }
 
 static GSList *
 gtk_recent_chooser_menu_list_filters (GtkRecentChooser  *chooser)
 {
-  g_warning (_("This function is not implemented for "
-               "widgets of class '%s'"),
-             g_type_name (G_OBJECT_TYPE (chooser)));
+  GtkRecentChooserMenu *menu;
+  GSList *retval = NULL;
+
+  if (menu->priv->current_filter)
+    retval = g_slist_prepend (retval, menu->priv->current_filter);
 
-  return NULL;
+  return retval;
 }
 
 static void
@@ -706,8 +718,11 @@ gtk_recent_chooser_menu_set_current_filter (GtkRecentChooserMenu *menu,
   if (priv->current_filter)
     g_object_unref (G_OBJECT (priv->current_filter));
   
-  priv->current_filter = filter;
-  g_object_ref_sink (priv->current_filter);
+  if (filter)
+    {
+      priv->current_filter = filter;
+      g_object_ref_sink (priv->current_filter);
+    }
   
   g_object_notify (G_OBJECT (menu), "filter");
 }