From 3eb71f1fdd363732921cce9bdfc2ae658535ccf8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 11 Jun 2006 03:13:50 +0000 Subject: [PATCH] Allow NULL to mean the default manager. (#344530, John Finlay) 2006-06-10 Matthias Clasen * gtk/gtkrecentchooserwidget.c (gtk_recent_chooser_widget_new_for_manager): * gtk/gtkrecentchoosermenu.c (gtk_recent_chooser_menu_new_for_manager): Allow NULL to mean the default manager. (#344530, John Finlay) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gtk/gtkrecentchoosermenu.c | 2 +- gtk/gtkrecentchooserwidget.c | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cdf3ddbe8..c1f14176d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2006-06-10 Matthias Clasen + * gtk/gtkrecentchooserwidget.c + (gtk_recent_chooser_widget_new_for_manager): + * gtk/gtkrecentchoosermenu.c + (gtk_recent_chooser_menu_new_for_manager): + Allow NULL to mean the default manager. (#344530, + John Finlay) + * gtk/gtkprintoperation-unix.c (page_setup_data_free): Check if rdata->page_setup is set before unreffing it. (#344518, Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4cdf3ddbe8..c1f14176d0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 2006-06-10 Matthias Clasen + * gtk/gtkrecentchooserwidget.c + (gtk_recent_chooser_widget_new_for_manager): + * gtk/gtkrecentchoosermenu.c + (gtk_recent_chooser_menu_new_for_manager): + Allow NULL to mean the default manager. (#344530, + John Finlay) + * gtk/gtkprintoperation-unix.c (page_setup_data_free): Check if rdata->page_setup is set before unreffing it. (#344518, Christian Persch) diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c index aa5facd717..6b87ce0a43 100644 --- a/gtk/gtkrecentchoosermenu.c +++ b/gtk/gtkrecentchoosermenu.c @@ -1179,7 +1179,7 @@ gtk_recent_chooser_menu_new (void) GtkWidget * gtk_recent_chooser_menu_new_for_manager (GtkRecentManager *manager) { - g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), NULL); + g_return_val_if_fail (manager == NULL || GTK_IS_RECENT_MANAGER (manager), NULL); return g_object_new (GTK_TYPE_RECENT_CHOOSER_MENU, "recent-manager", manager, diff --git a/gtk/gtkrecentchooserwidget.c b/gtk/gtkrecentchooserwidget.c index a3be544185..721dcb8f2f 100644 --- a/gtk/gtkrecentchooserwidget.c +++ b/gtk/gtkrecentchooserwidget.c @@ -183,7 +183,7 @@ gtk_recent_chooser_widget_new (void) GtkWidget * gtk_recent_chooser_widget_new_for_manager (GtkRecentManager *manager) { - g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), NULL); + g_return_val_if_fail (manager == NULL || GTK_IS_RECENT_MANAGER (manager), NULL); return g_object_new (GTK_TYPE_RECENT_CHOOSER_WIDGET, "recent-manager", manager, -- GitLab