bail out early if priv->button is NULL to avoid zillions of warnings when

2008-08-05  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkcombobox.c (gtk_combo_box_update_sensitivity): bail out
	early if priv->button is NULL to avoid zillions of warnings when
	destroying combo boxes that were working fine before the
	button sensitivity patch.

svn path=/trunk/; revision=21014

diff --git a/ChangeLog b/ChangeLog
index e57fa86fae23943e92823b9d6ffe3e1dcf439581..469c9dce0e6dde928bd5e735ec86edba61370791 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-05  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_update_sensitivity): bail out
+       early if priv->button is NULL to avoid zillions of warnings when
+       destroying combo boxes that were working fine before the
+       button sensitivity patch.
+
 2008-08-05  Michael Natterer  <mitch@imendio.com>
 
        Bug 544858 – Seal GtkAdjustment

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0a081d11a54285a05f369d7e0661c9083c9af17d..cc3b0a29db69a6bfb32d2c80665fb6c7af45fa60 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3157,6 +3157,9 @@ gtk_combo_box_update_sensitivity (GtkComboBox *combo_box)
   GtkTreeIter iter;
   gboolean sensitive = TRUE; /* fool code checkers */
 
+  if (!combo_box->priv->button)
+    return;
+
   switch (combo_box->priv->button_sensitivity)
     {
       case GTK_SENSITIVITY_ON: