remove extra reference that gtkcombobox keeps on priv->popup_widget if

Thu Feb  1 12:22:06 2007  Tim Janik  <timj@imendio.com>

        * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): remove extra reference
        that gtkcombobox keeps on priv->popup_widget if it's a tree view.



svn path=/trunk/; revision=17246
This commit is contained in:
Tim Janik 2007-02-01 11:42:38 +00:00 committed by Tim Janik
parent f6b8b7d932
commit 9d573d5f69
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,8 @@
Thu Feb 1 12:22:06 2007 Tim Janik <timj@imendio.com>
* gtk/gtkcombobox.c (gtk_combo_box_list_destroy): remove extra reference
that gtkcombobox keeps on priv->popup_widget if it's a tree view.
2007-01-31 Christian Persch <chpe@svn.gnome.org> 2007-01-31 Christian Persch <chpe@svn.gnome.org>
* gtk/gtkaboutdialog.c: (update_credits_button_visibility), * gtk/gtkaboutdialog.c: (update_credits_button_visibility),

View File

@ -1479,7 +1479,6 @@ gtk_combo_box_list_position (GtkComboBox *combo_box,
gint *width, gint *width,
gint *height) gint *height)
{ {
GtkWidget *sample;
GdkScreen *screen; GdkScreen *screen;
gint monitor_num; gint monitor_num;
GdkRectangle monitor; GdkRectangle monitor;
@ -1488,7 +1487,7 @@ gtk_combo_box_list_position (GtkComboBox *combo_box,
/* under windows, the drop down list is as wide as the combo box itself. /* under windows, the drop down list is as wide as the combo box itself.
see bug #340204 */ see bug #340204 */
sample = combo_box; GtkWidget *sample = GTK_WIDGET (combo_box);
gdk_window_get_origin (sample->window, x, y); gdk_window_get_origin (sample->window, x, y);
@ -3570,7 +3569,11 @@ gtk_combo_box_list_destroy (GtkComboBox *combo_box)
gtk_widget_destroy (combo_box->priv->tree_view); gtk_widget_destroy (combo_box->priv->tree_view);
combo_box->priv->tree_view = NULL; combo_box->priv->tree_view = NULL;
combo_box->priv->popup_widget = NULL; if (combo_box->priv->popup_widget)
{
g_object_unref (combo_box->priv->popup_widget);
combo_box->priv->popup_widget = NULL;
}
} }
/* callbacks */ /* callbacks */