(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

diff --git a/ChangeLog b/ChangeLog
index 2bea58f2aae22192e37cba1dcf14d9ae28431bae..a57d4a2412838723cd0746b5791d21e0c29fb0ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-20  Torsten Schoenfeld  <kaffeetisch@gmx.de>
+
+       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  <mcrha@redhat.com>
 
        * gtk/gtknotebook.c: (gtk_notebook_do_arrow): Allow changing page with

diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c
index 8c8b55f5497be8c1009908107517974a4338e729..b89ebf2f876021625cf07426aa02f2fb6f332492 100644 (file)
--- 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