From 670d5ad341cb4e19a33c16372c7817e0aed8da1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= Date: Wed, 20 Aug 2008 20:17:20 +0000 Subject: [PATCH] (gtk_color_selection_dialog_get_color_selection): Use the correct macro to test the validity of the passed-in dialog. svn path=/trunk/; revision=21171 --- ChangeLog | 9 +++++++++ gtk/gtkcolorseldialog.c | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2bea58f2aa..a57d4a2412 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-08-20 Torsten Schoenfeld + + Bug 548346 – gtk_color_selection_dialog_get_color_selection always + returns NULL + + * gtk/gtkcolorseldialog.c + (gtk_color_selection_dialog_get_color_selection): Use the correct + macro to test the validity of the passed-in dialog. + 2008-08-05 Milan Crha * gtk/gtknotebook.c: (gtk_notebook_do_arrow): Allow changing page with diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c index 8c8b55f549..b89ebf2f87 100644 --- a/gtk/gtkcolorseldialog.c +++ b/gtk/gtkcolorseldialog.c @@ -189,7 +189,7 @@ gtk_color_selection_dialog_new (const gchar *title) /** * gtk_color_selection_dialog_get_color_selection: - * @colorsel: a #GtkColorSelectionDialog + * @colorseldiag: a #GtkColorSelectionDialog * * Retrieves the #GtkColorSelection widget embedded in the dialog. * @@ -198,11 +198,11 @@ gtk_color_selection_dialog_new (const gchar *title) * Since: 2.14 **/ GtkWidget* -gtk_color_selection_dialog_get_color_selection (GtkColorSelectionDialog *colorsel) +gtk_color_selection_dialog_get_color_selection (GtkColorSelectionDialog *colorseldiag) { - g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), NULL); + g_return_val_if_fail (GTK_IS_COLOR_SELECTION_DIALOG (colorseldiag), NULL); - return colorsel->colorsel; + return colorseldiag->colorsel; } static void