[nautilus-actions] Release NASettings instance on NAPivot dispose

[Pierre Wieser <pwieser src gnome org>]

commit 0136a215dd896624f84df2c1557ee8f738cad0ee
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Jan 16 01:16:43 2011 +0100

    Release NASettings instance on NAPivot dispose

 ChangeLog           |    2 ++
 src/core/na-pivot.c |   12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5e3f62c..0ad9aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@
 
 2011-01-15 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-pivot.c (instance_dispose): Release the NASettings object.
+
 	* src/core/na-object-id.c:
 	* src/core/na-object-item.c: Remove no more used instance_init debug messages.
 
diff --git a/src/core/na-pivot.c b/src/core/na-pivot.c
index 5930f43..4cd0dce 100644
--- a/src/core/na-pivot.c
+++ b/src/core/na-pivot.c
@@ -211,11 +211,12 @@ instance_init( GTypeInstance *instance, gpointer klass )
 	NAPivot *self;
 
 	g_return_if_fail( NA_IS_PIVOT( instance ));
-	self = NA_PIVOT( instance );
 
 	g_debug( "%s: instance=%p (%s), klass=%p",
 			thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
 
+	self = NA_PIVOT( instance );
+
 	self->private = g_new0( NAPivotPrivate, 1 );
 
 	self->private->dispose_has_run = FALSE;
@@ -306,6 +307,7 @@ instance_dispose( GObject *object )
 	NAPivot *self;
 
 	g_return_if_fail( NA_IS_PIVOT( object ));
+
 	self = NA_PIVOT( object );
 
 	if( !self->private->dispose_has_run ){
@@ -327,6 +329,9 @@ instance_dispose( GObject *object )
 		na_object_unref_items( self->private->tree );
 		self->private->tree = NULL;
 
+		/* release the settings */
+		g_object_unref( self->private->settings );
+
 		/* release the I/O Provider object list */
 		na_io_provider_unref_io_providers_list();
 
@@ -344,9 +349,10 @@ instance_finalize( GObject *object )
 	NAPivot *self;
 
 	g_return_if_fail( NA_IS_PIVOT( object ));
-	self = NA_PIVOT( object );
 
-	g_debug( "%s: object=%p", thisfn, ( void * ) object );
+	g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
+
+	self = NA_PIVOT( object );
 
 	g_free( self->private );