plug small leak (#339132) ditto

2006-04-20  Paolo Borelli  <pborelli@katamail.com>

	* gtk/gtkcombobox.c: plug small leak (#339132)
	* tests/testcombo.c: ditto

diff --git a/ChangeLog b/ChangeLog
index 93d34808bcaee70c2473529f8f17100bac1d69c9..44a141a62578bdffd0073cad09fcbb48f6f47248 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+2006-04-20  Paolo Borelli  <pborelli@katamail.com>
+
+       * gtk/gtkcombobox.c: plug small leak (#339132)
+       * tests/testcombo.c: ditto
+
 2006-04-19  Michael Emmel  <mike.emmel@gmail.com>
-       *gdk/directfb/gdkdrawable-directfb.c fixed off by one error in
+
+       * gdk/directfb/gdkdrawable-directfb.c: fixed off by one error in
        clip patch from (#330824)
+
 2006-04-19  Murray Cumming  <murrayc@murrayc.com>
 
        * gtk/gtkfilechooserbutton.c: _GtkFileChooserButtonPrivate:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 93d34808bcaee70c2473529f8f17100bac1d69c9..44a141a62578bdffd0073cad09fcbb48f6f47248 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,13 @@
+2006-04-20  Paolo Borelli  <pborelli@katamail.com>
+
+       * gtk/gtkcombobox.c: plug small leak (#339132)
+       * tests/testcombo.c: ditto
+
 2006-04-19  Michael Emmel  <mike.emmel@gmail.com>
-       *gdk/directfb/gdkdrawable-directfb.c fixed off by one error in
+
+       * gdk/directfb/gdkdrawable-directfb.c: fixed off by one error in
        clip patch from (#330824)
+
 2006-04-19  Murray Cumming  <murrayc@murrayc.com>
 
        * gtk/gtkfilechooserbutton.c: _GtkFileChooserButtonPrivate:

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 4548720e78c24f2d8c6c618f6cdf3eacd8aa215f..eb730a5b87f60210a92a9eb3c8ca86492e7031c1 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -5000,6 +5000,8 @@ gtk_combo_box_finalize (GObject *object)
     }
    g_slist_free (combo_box->priv->cells);
 
+   g_free (combo_box->priv->tearoff_title);
+
    G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 

diff --git a/tests/testcombo.c b/tests/testcombo.c
index 32ee4d1cad71a4fb23fdffd3d009acc6670aa23c..9f9f1641cf444ca29cb516fb72e48492bd77737a 100644 (file)
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -66,6 +66,7 @@ create_combo_box_grid_demo (void)
 {
         GtkWidget *combo;
         GtkTreeIter iter;
+        GdkPixbuf *pixbuf;
         GtkCellRenderer *cell = gtk_cell_renderer_pixbuf_new ();
         GtkListStore *store;
 
@@ -80,52 +81,70 @@ create_combo_box_grid_demo (void)
                                       3);
 
         /* first row */
+        pixbuf = create_color_pixbuf ("red");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("red"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
+        pixbuf = create_color_pixbuf ("green");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("green"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
+        pixbuf = create_color_pixbuf ("blue");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("blue"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
         /* second row */
+        pixbuf = create_color_pixbuf ("yellow");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("yellow"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
+        pixbuf = create_color_pixbuf ("black");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("black"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
+        pixbuf = create_color_pixbuf ("white");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("white"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
         /* third row */
+        pixbuf = create_color_pixbuf ("gray");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("gray"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
+        pixbuf = create_color_pixbuf ("snow");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("snow"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
+        pixbuf = create_color_pixbuf ("magenta");
         gtk_list_store_append (store, &iter);
         gtk_list_store_set (store, &iter,
-                            0, create_color_pixbuf ("magenta"),
+                            0, pixbuf,
                             -1);
+        g_object_unref (pixbuf);
 
         g_object_unref (store);