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

diff --git a/glabels2/src/view-highlight.c b/glabels2/src/view-highlight.c
index 270003f33eb87ad25375fa3813d9308ebf04024a..70144969904491d69118a5eb23c94d2e02b11e53 100644 (file)
--- 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 8756faa191bfa96343d41053e3ebe9d6a6d29c8d..bdb3c02fbb31be17602f6a7717850026308a65ee 100644 (file)
--- 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);