From da61c61c4bfdd6adc085e6fed4a5f4153311d1de Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 5 Aug 2008 15:44:04 +0000 Subject: [PATCH] bail out early if priv->button is NULL to avoid zillions of warnings when 2008-08-05 Michael Natterer * 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 --- ChangeLog | 7 +++++++ gtk/gtkcombobox.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index e57fa86fae..469c9dce0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-05 Michael Natterer + + * 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 Bug 544858 – Seal GtkAdjustment 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: