summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2008-08-05 15:44:04 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-08-05 15:44:04 +0000
commitda61c61c4bfdd6adc085e6fed4a5f4153311d1de (patch)
tree68c91570d3a4f4d2b55c31ecc788dca454d1f43b
parentf2527e8d07a1a3bb255e219c0830474c2863c561 (diff)
downloadgtk+-da61c61c4bfdd6adc085e6fed4a5f4153311d1de.tar.gz
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
-rw-r--r--ChangeLog7
-rw-r--r--gtk/gtkcombobox.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e57fa86fae..469c9dce0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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
* gtk/gtk.symbols
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0a081d11a5..cc3b0a29db 100644
--- 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: