From 6a9e67331f80e1e7ed2e7ac155200e44643407e9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 3 Jul 2004 03:37:44 +0000 Subject: [PATCH] Unset the displayed row when unsetting the model. (#138560, Christian Fri Jul 2 23:34:33 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed row when unsetting the model. (#138560, Christian Persch) --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtkcombobox.c | 5 ++++- 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 11aad041e2..99d12da1f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Jul 2 23:34:33 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed + row when unsetting the model. (#138560, Christian Persch) + +Fri Jul 2 23:01:07 2004 Matthias Clasen + + * gtk/gtkcombobox.c (update_menu_sensitivity): Don't crash if there + are no items. + Fri Jul 2 22:41:27 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Properly align mask and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 11aad041e2..99d12da1f0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Fri Jul 2 23:34:33 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed + row when unsetting the model. (#138560, Christian Persch) + +Fri Jul 2 23:01:07 2004 Matthias Clasen + + * gtk/gtkcombobox.c (update_menu_sensitivity): Don't crash if there + are no items. + Fri Jul 2 22:41:27 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Properly align mask and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 11aad041e2..99d12da1f0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Fri Jul 2 23:34:33 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed + row when unsetting the model. (#138560, Christian Persch) + +Fri Jul 2 23:01:07 2004 Matthias Clasen + + * gtk/gtkcombobox.c (update_menu_sensitivity): Don't crash if there + are no items. + Fri Jul 2 22:41:27 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Properly align mask and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 11aad041e2..99d12da1f0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Fri Jul 2 23:34:33 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed + row when unsetting the model. (#138560, Christian Persch) + +Fri Jul 2 23:01:07 2004 Matthias Clasen + + * gtk/gtkcombobox.c (update_menu_sensitivity): Don't crash if there + are no items. + Fri Jul 2 22:41:27 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Properly align mask and diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 2e286dbda6..613b12f934 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1266,7 +1266,7 @@ update_menu_sensitivity (GtkComboBox *combo_box) children = gtk_container_get_children (GTK_CONTAINER (menu)); child = children; - if (GTK_IS_TEAROFF_MENU_ITEM (child->data)) + if (child && GTK_IS_TEAROFF_MENU_ITEM (child->data)) child = child->next; for (i = 0; i < items; i++, child = child->next) @@ -1692,6 +1692,9 @@ gtk_combo_box_unset_model (GtkComboBox *combo_box) g_object_unref (G_OBJECT (combo_box->priv->model)); combo_box->priv->model = NULL; } + + if (combo_box->priv->cell_view) + gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), NULL); } static void