summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-08-15 17:12:23 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-08-15 17:12:23 +0000
commit98c23811f5ae9ffae0ecfea31ab41d4b656ac40f (patch)
treece29d292588ef049a75bed686573b775f6f00d99
parentc74f0bbf6576767d4918f70e85b59e6c73d92da7 (diff)
downloadgtk+-98c23811f5ae9ffae0ecfea31ab41d4b656ac40f.tar.gz
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)
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-2-103
-rw-r--r--gtk/gtkruler.c12
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 847440faf5..0650dc6ff8 100644
--- 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 847440faf5..0650dc6ff8 100644
--- 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 7bc3d74b51..7e493f976b 100644
--- 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);