From 7e832a73ce0ed48bab9d31462e7536ae7edc1286 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Apr 2005 22:07:35 +0000 Subject: [PATCH] Make this work when called from gtk_combo_box_destroy(). (#172999, 2005-04-08 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this work when called from gtk_combo_box_destroy(). (#172999, Christian Persch) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk-pixbuf/ChangeLog | 3 ++- gtk/gtkcombobox.c | 6 +++--- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c42d1eb5a..97f8f9a3dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,12 @@ * gdk/gdkpixbuf-render.c: (gdk_pixbuf_set_as_cairo_source): Track cairo API change in signedness of data argument. +2005-04-08 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this + work when called from gtk_combo_box_destroy(). (#172999, + Christian Persch) + 2005-04-08 Matthias Clasen Fix double-click to autosize treeview columns. This was diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c42d1eb5a..97f8f9a3dd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -6,6 +6,12 @@ * gdk/gdkpixbuf-render.c: (gdk_pixbuf_set_as_cairo_source): Track cairo API change in signedness of data argument. +2005-04-08 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this + work when called from gtk_combo_box_destroy(). (#172999, + Christian Persch) + 2005-04-08 Matthias Clasen Fix double-click to autosize treeview columns. This was diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5c42d1eb5a..97f8f9a3dd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -6,6 +6,12 @@ * gdk/gdkpixbuf-render.c: (gdk_pixbuf_set_as_cairo_source): Track cairo API change in signedness of data argument. +2005-04-08 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this + work when called from gtk_combo_box_destroy(). (#172999, + Christian Persch) + 2005-04-08 Matthias Clasen Fix double-click to autosize treeview columns. This was diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index f451523b21..f66a63cc31 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,6 +1,7 @@ 2005-04-08 Matthias Clasen - * io-pcx.c: No debugging output, please. + * io-pcx.c: No debugging output, please. (#173107, + John Ellis) 2005-04-07 Matthias Clasen diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 0d80a5cf22..e81823d864 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1670,15 +1670,15 @@ gtk_combo_box_popdown (GtkComboBox *combo_box) { g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (combo_box))) - return; - if (GTK_IS_MENU (combo_box->priv->popup_widget)) { gtk_menu_popdown (GTK_MENU (combo_box->priv->popup_widget)); return; } + if (!GTK_WIDGET_REALIZED (GTK_WIDGET (combo_box))) + return; + gtk_combo_box_list_remove_grabs (combo_box); gtk_widget_hide_all (combo_box->priv->popup_window);