From 2b0d83bbb2a14f5ecfb3b17fd786f4fcb780febb Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 20 Oct 2002 14:33:57 +0000 Subject: [PATCH] Fixes finalization problems with highlight and object properties dialog. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@169 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/src/view-highlight.c | 2 -- glabels2/src/view-object.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glabels2/src/view-highlight.c b/glabels2/src/view-highlight.c index 270003f3..70144969 100644 --- a/glabels2/src/view-highlight.c +++ b/glabels2/src/view-highlight.c @@ -187,8 +187,6 @@ gl_view_highlight_finalize (GObject *object) g_return_if_fail (object && GL_IS_VIEW_HIGHLIGHT (object)); - g_object_unref (GL_VIEW_HIGHLIGHT(object)->private->object); - gtk_object_destroy (GTK_OBJECT(GL_VIEW_HIGHLIGHT(object)->private->group)); G_OBJECT_CLASS (parent_class)->finalize (object); diff --git a/glabels2/src/view-object.c b/glabels2/src/view-object.c index 8756faa1..bdb3c02f 100644 --- a/glabels2/src/view-object.c +++ b/glabels2/src/view-object.c @@ -153,7 +153,9 @@ gl_view_object_finalize (GObject *object) gtk_object_destroy (GTK_OBJECT(GL_VIEW_OBJECT(object)->private->group)); g_object_unref (G_OBJECT(GL_VIEW_OBJECT(object)->private->highlight)); gtk_object_destroy (GTK_OBJECT(GL_VIEW_OBJECT(object)->private->menu)); - gtk_object_destroy (GTK_OBJECT(GL_VIEW_OBJECT(object)->private->property_dialog)); + if (GL_VIEW_OBJECT(object)->private->property_dialog) { + gtk_object_destroy (GTK_OBJECT(GL_VIEW_OBJECT(object)->private->property_dialog)); + } G_OBJECT_CLASS (parent_class)->finalize (object); -- 2.39.5