Don't leak no_gr_exp_gc. (#350050, Chris Wilson)

2006-08-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkruler.c (gtk_ruler_unrealize): Don't leak
	no_gr_exp_gc.  (#350050, Chris Wilson)

diff --git a/ChangeLog b/ChangeLog
index 847440faf56b215fd37b4c5e4bb38be35b831078..0650dc6ff88437bd8349f6f048a74693f04e0ab3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-15  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkruler.c (gtk_ruler_unrealize): Don't leak
+       no_gr_exp_gc.  (#350050, Chris Wilson)
+
        * gdk/x11/gdkdrawable-x11.c (get_shm_pixmap_for_image): Don't
        leak ShmPixmapInfo.  (#349858, Chris Wilson)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 847440faf56b215fd37b4c5e4bb38be35b831078..0650dc6ff88437bd8349f6f048a74693f04e0ab3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-08-15  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkruler.c (gtk_ruler_unrealize): Don't leak
+       no_gr_exp_gc.  (#350050, Chris Wilson)
+
        * gdk/x11/gdkdrawable-x11.c (get_shm_pixmap_for_image): Don't
        leak ShmPixmapInfo.  (#349858, Chris Wilson)
 

diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index 7bc3d74b51846ffff2dd2e989361f7a0bd0245e5..7e493f976bf26516c9d4af8c184d4fc44a41c7a0 100644 (file)
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -385,10 +385,16 @@ gtk_ruler_unrealize (GtkWidget *widget)
   GtkRuler *ruler = GTK_RULER (widget);
 
   if (ruler->backing_store)
-    g_object_unref (ruler->backing_store);
+    {
+      g_object_unref (ruler->backing_store);
+      ruler->backing_store = NULL;
+    }
 
-  ruler->backing_store = NULL;
-  ruler->non_gr_exp_gc = NULL;
+  if (ruler->non_gr_exp_gc)
+    {
+      g_object_unref (ruler->non_gr_exp_gc);
+      ruler->non_gr_exp_gc = NULL;
+    }
 
   if (GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize)
     (* GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize) (widget);