[nautilus-actions] Review NAIContext interface

[Pierre Wieser <pwieser src gnome org>]

commit 215a4f74c68bb1e3e386172f14a44c05c3dcab20
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Jan 3 23:00:49 2012 +0100

    Review NAIContext interface

 ChangeLog              |    2 ++
 src/core/na-icontext.c |   31 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 152eca5..23c9bf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-01-03 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-icontext.c: Review NAIContext interface.
+
 	* src/test/test-iface-iface.c:
 	* src/test/test-iface.c: Do some more tests on the interfaces.
 
diff --git a/src/core/na-icontext.c b/src/core/na-icontext.c
index a4cbe7a..7b30524 100644
--- a/src/core/na-icontext.c
+++ b/src/core/na-icontext.c
@@ -56,12 +56,11 @@ struct _NAIContextInterfacePrivate {
 	void *empty;						/* so that gcc -pedantic is happy */
 };
 
-static gboolean     st_initialized     = FALSE;
-static gboolean     st_finalized       = FALSE;
+static guint st_initializations = 0;	/* interface initialization count */
 
 static GType        register_type( void );
-static void         interface_base_init( NAIContextInterface *klass );
-static void         interface_base_finalize( NAIContextInterface *klass );
+static void         interface_init( NAIContextInterface *klass );
+static void         interface_finalize( NAIContextInterface *klass );
 
 static gboolean     v_is_candidate( NAIContext *object, guint target, GList *selection );
 
@@ -119,8 +118,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIContextInterface ),
-		( GBaseInitFunc ) interface_base_init,
-		( GBaseFinalizeFunc ) interface_base_finalize,
+		( GBaseInitFunc ) interface_init,
+		( GBaseFinalizeFunc ) interface_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -139,30 +138,30 @@ register_type( void )
 }
 
 static void
-interface_base_init( NAIContextInterface *klass )
+interface_init( NAIContextInterface *klass )
 {
-	static const gchar *thisfn = "na_icontext_interface_base_init";
+	static const gchar *thisfn = "na_icontext_interface_init";
 
-	if( !st_initialized ){
+	if( !st_initializations ){
 
 		g_debug( "%s: klass%p (%s)", thisfn, ( void * ) klass, G_OBJECT_CLASS_NAME( klass ));
 
 		klass->private = g_new0( NAIContextInterfacePrivate, 1 );
-
-		st_initialized = TRUE;
 	}
+
+	st_initializations += 1;
 }
 
 static void
-interface_base_finalize( NAIContextInterface *klass )
+interface_finalize( NAIContextInterface *klass )
 {
-	static const gchar *thisfn = "na_icontext_interface_base_finalize";
+	static const gchar *thisfn = "na_icontext_interface_finalize";
 
-	if( st_initialized && !st_finalized ){
+	st_initializations -= 1;
 
-		g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
+	if( !st_initializations ){
 
-		st_finalized = TRUE;
+		g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
 		g_free( klass->private );
 	}