From d61e4f744091d47ff55b9700ea02353858e92cc7 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Thu, 27 May 2004 04:08:26 +0000 Subject: [PATCH] only remove the signal if the box exists. Thu May 27 00:07:47 2004 Jonathan Blandford * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the signal if the box exists. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcombobox.c | 11 ++++++----- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5d872d3b1..7cfa2c1405 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 27 00:07:47 2004 Jonathan Blandford + + * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the + signal if the box exists. + Wed May 26 23:26:51 2004 Matthias Clasen Support insensitive cells in tree views and combo boxes: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c5d872d3b1..7cfa2c1405 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu May 27 00:07:47 2004 Jonathan Blandford + + * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the + signal if the box exists. + Wed May 26 23:26:51 2004 Matthias Clasen Support insensitive cells in tree views and combo boxes: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c5d872d3b1..7cfa2c1405 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu May 27 00:07:47 2004 Jonathan Blandford + + * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the + signal if the box exists. + Wed May 26 23:26:51 2004 Matthias Clasen Support insensitive cells in tree views and combo boxes: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c5d872d3b1..7cfa2c1405 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu May 27 00:07:47 2004 Jonathan Blandford + + * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): only remove the + signal if the box exists. + Wed May 26 23:26:51 2004 Matthias Clasen Support insensitive cells in tree views and combo boxes: diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 1b539226b0..cf0288bbf6 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2467,11 +2467,12 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box) 0, 0, NULL, gtk_combo_box_list_button_pressed, NULL); - g_signal_handlers_disconnect_matched (combo_box->priv->box, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, - gtk_combo_box_list_button_pressed, - NULL); + if (combo_box->priv->box) + g_signal_handlers_disconnect_matched (combo_box->priv->box, + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, + gtk_combo_box_list_button_pressed, + NULL); /* destroy things (unparent will kill the latest ref from us) * last unref on button will destroy the arrow