From 617c2261ae8748b862ac080ad5b7b9f63da973d0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 22 Jul 2004 02:19:35 +0000 Subject: [PATCH] Don't leak models. (#148128, Tommi Komulainen) Wed Jul 21 22:17:06 2004 Matthias Clasen * tests/testcombo.c (main): Don't leak models. (#148128, Tommi Komulainen) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ tests/testcombo.c | 18 ++++++++++-------- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index be1111af55..a904c7e3a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 21 22:17:06 2004 Matthias Clasen + + * tests/testcombo.c (main): Don't leak models. (#148128, + Tommi Komulainen) + Wed Jul 21 21:26:08 2004 Matthias Clasen * gtk/gtkviewport.c (viewport_set_adjustment): Don't leak diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index be1111af55..a904c7e3a1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Jul 21 22:17:06 2004 Matthias Clasen + + * tests/testcombo.c (main): Don't leak models. (#148128, + Tommi Komulainen) + Wed Jul 21 21:26:08 2004 Matthias Clasen * gtk/gtkviewport.c (viewport_set_adjustment): Don't leak diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index be1111af55..a904c7e3a1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Jul 21 22:17:06 2004 Matthias Clasen + + * tests/testcombo.c (main): Don't leak models. (#148128, + Tommi Komulainen) + Wed Jul 21 21:26:08 2004 Matthias Clasen * gtk/gtkviewport.c (viewport_set_adjustment): Don't leak diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index be1111af55..a904c7e3a1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Jul 21 22:17:06 2004 Matthias Clasen + + * tests/testcombo.c (main): Don't leak models. (#148128, + Tommi Komulainen) + Wed Jul 21 21:26:08 2004 Matthias Clasen * gtk/gtkviewport.c (viewport_set_adjustment): Don't leak diff --git a/tests/testcombo.c b/tests/testcombo.c index 2fc79715db..8bd5aa2327 100644 --- a/tests/testcombo.c +++ b/tests/testcombo.c @@ -111,6 +111,8 @@ create_combo_box_grid_demo () 0, create_color_pixbuf ("magenta"), -1); + g_object_unref (store); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); return combo; @@ -129,6 +131,7 @@ create_blaat () store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING); +#if 0 pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON, NULL); gtk_list_store_append (store, &iter); @@ -162,7 +165,7 @@ create_blaat () -1); gtk_widget_destroy (cellview); - +#endif return GTK_TREE_MODEL (store); } @@ -191,18 +194,18 @@ main (int argc, char **argv) GtkWidget *tmp, *boom; GtkCellRenderer *renderer; GdkPixbuf *pixbuf; + GtkTreeModel *model; GValue value = {0, }; gtk_init (&argc, &argv); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width (GTK_CONTAINER (window), 5); - g_signal_connect (window, "delete_event", gtk_main_quit, NULL); + g_signal_connect (window, "destroy", gtk_main_quit, NULL); mainbox = gtk_vbox_new (FALSE, 2); gtk_container_add (GTK_CONTAINER (window), mainbox); - /* GtkCellView */ tmp = gtk_frame_new ("GtkCellView"); gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0); @@ -240,7 +243,6 @@ main (int argc, char **argv) g_value_unset (&value); gtk_container_add (GTK_CONTAINER (boom), cellview); - /* GtkComboBox */ tmp = gtk_frame_new ("GtkComboBox"); gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0); @@ -249,7 +251,9 @@ main (int argc, char **argv) gtk_container_set_border_width (GTK_CONTAINER (boom), 5); gtk_container_add (GTK_CONTAINER (tmp), boom); - combobox = gtk_combo_box_new_with_model (create_blaat ()); + model = create_blaat (); + combobox = gtk_combo_box_new_with_model (model); + g_object_unref (model); gtk_container_add (GTK_CONTAINER (boom), combobox); renderer = gtk_cell_renderer_pixbuf_new (); @@ -268,8 +272,7 @@ main (int argc, char **argv) "text", 1, NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 1); - + //gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 1); /* GtkComboBox (grid mode) */ tmp = gtk_frame_new ("GtkComboBox (grid mode)"); @@ -282,7 +285,6 @@ main (int argc, char **argv) comboboxgrid = create_combo_box_grid_demo (); gtk_box_pack_start (GTK_BOX (boom), comboboxgrid, FALSE, FALSE, 0); - /* GtkComboBoxEntry */ tmp = gtk_frame_new ("GtkComboBoxEntry"); gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);