GNOME.org
 

[nautilus-actions] Come back on core interfaces

commit 4d006612a478b2f2882e2f506a142c3d788140b0
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jan 4 20:55:08 2012 +0100

    Come back on core interfaces
    
    interface_init(): renamed back as interface_base_init()
    interface_finalize(): renamed back as interface_base_finalize().

 ChangeLog                       |   14 ++++++++++++++
 src/core/na-icontext.c          |   16 ++++++++--------
 src/core/na-iduplicable.c       |   16 ++++++++--------
 src/core/na-iexporter.c         |   16 ++++++++--------
 src/core/na-ifactory-object.c   |   16 ++++++++--------
 src/core/na-ifactory-provider.c |   16 ++++++++--------
 src/core/na-iimporter.c         |   16 ++++++++--------
 src/core/na-iio-provider.c      |   16 ++++++++--------
 src/core/na-ioption.c           |   16 ++++++++--------
 src/core/na-ioptions-list.c     |   16 ++++++++--------
 10 files changed, 86 insertions(+), 72 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 78a665b..a5a21c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2012-01-04 Pierre Wieser <pwieser trychlos org>
 
+	Come back on core interfaces.
+
+	* src/core/na-icontext.c:
+	* src/core/na-iduplicable.c:
+	* src/core/na-iexporter.c:
+	* src/core/na-ifactory-object.c:
+	* src/core/na-ifactory-provider.c:
+	* src/core/na-iimporter.c:
+	* src/core/na-iio-provider.c:
+	* src/core/na-ioption.c:
+	* src/core/na-ioptions-list.c
+	(interface_init): Renamed back as interface_base_init().
+	(interface_finalize): Renamed back as interface_base_finalize().
+
 	* src/utils/console-utils.h: Re-include 'glib.h' header.
 
 2012-01-03 Pierre Wieser <pwieser trychlos org>
diff --git a/src/core/na-icontext.c b/src/core/na-icontext.c
index 7b30524..502d049 100644
--- a/src/core/na-icontext.c
+++ b/src/core/na-icontext.c
@@ -59,8 +59,8 @@ struct _NAIContextInterfacePrivate {
 static guint st_initializations = 0;	/* interface initialization count */
 
 static GType        register_type( void );
-static void         interface_init( NAIContextInterface *klass );
-static void         interface_finalize( NAIContextInterface *klass );
+static void         interface_base_init( NAIContextInterface *klass );
+static void         interface_base_finalize( NAIContextInterface *klass );
 
 static gboolean     v_is_candidate( NAIContext *object, guint target, GList *selection );
 
@@ -118,8 +118,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIContextInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -138,9 +138,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIContextInterface *klass )
+interface_base_init( NAIContextInterface *klass )
 {
-	static const gchar *thisfn = "na_icontext_interface_init";
+	static const gchar *thisfn = "na_icontext_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -153,9 +153,9 @@ interface_init( NAIContextInterface *klass )
 }
 
 static void
-interface_finalize( NAIContextInterface *klass )
+interface_base_finalize( NAIContextInterface *klass )
 {
-	static const gchar *thisfn = "na_icontext_interface_finalize";
+	static const gchar *thisfn = "na_icontext_interface_base_finalize";
 
 	st_initializations -= 1;
 
diff --git a/src/core/na-iduplicable.c b/src/core/na-iduplicable.c
index a2bb867..ed19473 100644
--- a/src/core/na-iduplicable.c
+++ b/src/core/na-iduplicable.c
@@ -66,8 +66,8 @@ static guint                   st_initializations = 0;
 static gint                    st_signals[ LAST_SIGNAL ] = { 0 };
 
 static GType          register_type( void );
-static void           interface_init( NAIDuplicableInterface *klass );
-static void           interface_finalize( NAIDuplicableInterface *klass );
+static void           interface_base_init( NAIDuplicableInterface *klass );
+static void           interface_base_finalize( NAIDuplicableInterface *klass );
 
 static void           v_copy( NAIDuplicable *target, const NAIDuplicable *source );
 static gboolean       v_are_equal( const NAIDuplicable *a, const NAIDuplicable *b );
@@ -100,8 +100,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIDuplicableInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -120,9 +120,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIDuplicableInterface *klass )
+interface_base_init( NAIDuplicableInterface *klass )
 {
-	static const gchar *thisfn = "na_iduplicable_interface_init";
+	static const gchar *thisfn = "na_iduplicable_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -207,9 +207,9 @@ interface_init( NAIDuplicableInterface *klass )
 }
 
 static void
-interface_finalize( NAIDuplicableInterface *klass )
+interface_base_finalize( NAIDuplicableInterface *klass )
 {
-	static const gchar *thisfn = "na_iduplicable_interface_finalize";
+	static const gchar *thisfn = "na_iduplicable_interface_base_finalize";
 
 	st_initializations -= 1;
 
diff --git a/src/core/na-iexporter.c b/src/core/na-iexporter.c
index e51da3d..f27227e 100644
--- a/src/core/na-iexporter.c
+++ b/src/core/na-iexporter.c
@@ -43,8 +43,8 @@ struct _NAIExporterInterfacePrivate {
 static guint st_initializations = 0;	/* interface initialization count */
 
 static GType register_type( void );
-static void  interface_init( NAIExporterInterface *klass );
-static void  interface_finalize( NAIExporterInterface *klass );
+static void  interface_base_init( NAIExporterInterface *klass );
+static void  interface_base_finalize( NAIExporterInterface *klass );
 
 static guint iexporter_get_version( const NAIExporter *instance );
 
@@ -78,8 +78,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIExporterInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -98,9 +98,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIExporterInterface *klass )
+interface_base_init( NAIExporterInterface *klass )
 {
-	static const gchar *thisfn = "na_iexporter_interface_init";
+	static const gchar *thisfn = "na_iexporter_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -119,9 +119,9 @@ interface_init( NAIExporterInterface *klass )
 }
 
 static void
-interface_finalize( NAIExporterInterface *klass )
+interface_base_finalize( NAIExporterInterface *klass )
 {
-	static const gchar *thisfn = "na_iexporter_interface_finalize";
+	static const gchar *thisfn = "na_iexporter_interface_base_finalize";
 
 	st_initializations -= 1;
 
diff --git a/src/core/na-ifactory-object.c b/src/core/na-ifactory-object.c
index 214501c..1e62958 100644
--- a/src/core/na-ifactory-object.c
+++ b/src/core/na-ifactory-object.c
@@ -47,8 +47,8 @@ struct _NAIFactoryObjectInterfacePrivate {
 static guint st_initializations = 0;	/* interface initialization count */
 
 static GType register_type( void );
-static void  interface_init( NAIFactoryObjectInterface *klass );
-static void  interface_finalize( NAIFactoryObjectInterface *klass );
+static void  interface_base_init( NAIFactoryObjectInterface *klass );
+static void  interface_base_finalize( NAIFactoryObjectInterface *klass );
 
 static guint ifactory_object_get_version( const NAIFactoryObject *instance );
 
@@ -75,8 +75,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIFactoryObjectInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -95,9 +95,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIFactoryObjectInterface *klass )
+interface_base_init( NAIFactoryObjectInterface *klass )
 {
-	static const gchar *thisfn = "na_ifactory_object_interface_init";
+	static const gchar *thisfn = "na_ifactory_object_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -120,9 +120,9 @@ interface_init( NAIFactoryObjectInterface *klass )
 }
 
 static void
-interface_finalize( NAIFactoryObjectInterface *klass )
+interface_base_finalize( NAIFactoryObjectInterface *klass )
 {
-	static const gchar *thisfn = "na_ifactory_object_interface_finalize";
+	static const gchar *thisfn = "na_ifactory_object_interface_base_finalize";
 
 	st_initializations -= 1;
 
diff --git a/src/core/na-ifactory-provider.c b/src/core/na-ifactory-provider.c
index 6166238..74f263c 100644
--- a/src/core/na-ifactory-provider.c
+++ b/src/core/na-ifactory-provider.c
@@ -47,8 +47,8 @@ struct _NAIFactoryProviderInterfacePrivate {
 static guint st_initializations = 0;	/* interface initialization count */
 
 static GType register_type( void );
-static void  interface_init( NAIFactoryProviderInterface *klass );
-static void  interface_finalize( NAIFactoryProviderInterface *klass );
+static void  interface_base_init( NAIFactoryProviderInterface *klass );
+static void  interface_base_finalize( NAIFactoryProviderInterface *klass );
 
 static guint ifactory_provider_get_version( const NAIFactoryProvider *instance );
 
@@ -84,8 +84,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIFactoryProviderInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -104,9 +104,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIFactoryProviderInterface *klass )
+interface_base_init( NAIFactoryProviderInterface *klass )
 {
-	static const gchar *thisfn = "na_ifactory_provider_interface_init";
+	static const gchar *thisfn = "na_ifactory_provider_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -127,9 +127,9 @@ interface_init( NAIFactoryProviderInterface *klass )
 }
 
 static void
-interface_finalize( NAIFactoryProviderInterface *klass )
+interface_base_finalize( NAIFactoryProviderInterface *klass )
 {
-	static const gchar *thisfn = "na_ifactory_provider_interface_finalize";
+	static const gchar *thisfn = "na_ifactory_provider_interface_base_finalize";
 
 	st_initializations -= 1;
 
diff --git a/src/core/na-iimporter.c b/src/core/na-iimporter.c
index 4528cbb..27a9f1f 100644
--- a/src/core/na-iimporter.c
+++ b/src/core/na-iimporter.c
@@ -47,8 +47,8 @@ struct _NAIImporterInterfacePrivate {
 static guint st_initializations = 0;	/* interface initialization count */
 
 static GType register_type( void );
-static void  interface_init( NAIImporterInterface *klass );
-static void  interface_finalize( NAIImporterInterface *klass );
+static void  interface_base_init( NAIImporterInterface *klass );
+static void  interface_base_finalize( NAIImporterInterface *klass );
 static guint iimporter_get_version( const NAIImporter *instance );
 
 #ifdef NA_ENABLE_DEPRECATED
@@ -85,8 +85,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIImporterInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -105,9 +105,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIImporterInterface *klass )
+interface_base_init( NAIImporterInterface *klass )
 {
-	static const gchar *thisfn = "na_iimporter_interface_init";
+	static const gchar *thisfn = "na_iimporter_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -123,9 +123,9 @@ interface_init( NAIImporterInterface *klass )
 }
 
 static void
-interface_finalize( NAIImporterInterface *klass )
+interface_base_finalize( NAIImporterInterface *klass )
 {
-	static const gchar *thisfn = "na_iimporter_interface_finalize";
+	static const gchar *thisfn = "na_iimporter_interface_base_finalize";
 
 	st_initializations -= 1;
 
diff --git a/src/core/na-iio-provider.c b/src/core/na-iio-provider.c
index 0d88d6e..8b69156 100644
--- a/src/core/na-iio-provider.c
+++ b/src/core/na-iio-provider.c
@@ -53,8 +53,8 @@ static guint st_initializations = 0;	/* interface initialization count */
 static gint  st_signals[ LAST_SIGNAL ] = { 0 };
 
 static GType    register_type( void );
-static void     interface_init( NAIIOProviderInterface *klass );
-static void     interface_finalize( NAIIOProviderInterface *klass );
+static void     interface_base_init( NAIIOProviderInterface *klass );
+static void     interface_base_finalize( NAIIOProviderInterface *klass );
 
 static gboolean do_is_willing_to_write( const NAIIOProvider *instance );
 static gboolean do_is_able_to_write( const NAIIOProvider *instance );
@@ -89,8 +89,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIIOProviderInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -109,9 +109,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIIOProviderInterface *klass )
+interface_base_init( NAIIOProviderInterface *klass )
 {
-	static const gchar *thisfn = "na_iio_provider_interface_init";
+	static const gchar *thisfn = "na_iio_provider_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -156,9 +156,9 @@ interface_init( NAIIOProviderInterface *klass )
 }
 
 static void
-interface_finalize( NAIIOProviderInterface *klass )
+interface_base_finalize( NAIIOProviderInterface *klass )
 {
-	static const gchar *thisfn = "na_iio_provider_interface_finalize";
+	static const gchar *thisfn = "na_iio_provider_interface_base_finalize";
 
 	st_initializations -= 1;
 
diff --git a/src/core/na-ioption.c b/src/core/na-ioption.c
index 20e6cee..61bb2b6 100644
--- a/src/core/na-ioption.c
+++ b/src/core/na-ioption.c
@@ -45,8 +45,8 @@ static guint st_initializations = 0;	/* interface initialization count */
 #define IOPTION_DATA_INITIALIZED		"ioption-data-initialized"
 
 static GType    register_type( void );
-static void     interface_init( NAIOptionInterface *iface );
-static void     interface_finalize( NAIOptionInterface *iface );
+static void     interface_base_init( NAIOptionInterface *iface );
+static void     interface_base_finalize( NAIOptionInterface *iface );
 
 static guint    ioption_get_version( const NAIOption *instance );
 static void     check_for_initialized_instance( NAIOption *instance );
@@ -84,8 +84,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIOptionInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -104,9 +104,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIOptionInterface *iface )
+interface_base_init( NAIOptionInterface *iface )
 {
-	static const gchar *thisfn = "na_ioption_interface_init";
+	static const gchar *thisfn = "na_ioption_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -121,9 +121,9 @@ interface_init( NAIOptionInterface *iface )
 }
 
 static void
-interface_finalize( NAIOptionInterface *iface )
+interface_base_finalize( NAIOptionInterface *iface )
 {
-	static const gchar *thisfn = "na_ioption_interface_finalize";
+	static const gchar *thisfn = "na_ioption_interface_base_finalize";
 
 	st_initializations -= 1;
 
diff --git a/src/core/na-ioptions-list.c b/src/core/na-ioptions-list.c
index f82cb42..a4158b1 100644
--- a/src/core/na-ioptions-list.c
+++ b/src/core/na-ioptions-list.c
@@ -67,8 +67,8 @@ enum {
 static guint st_initializations = 0;	/* interface initialization count */
 
 static GType        register_type( void );
-static void         interface_init( NAIOptionsListInterface *iface );
-static void         interface_finalize( NAIOptionsListInterface *iface );
+static void         interface_base_init( NAIOptionsListInterface *iface );
+static void         interface_base_finalize( NAIOptionsListInterface *iface );
 
 static guint        ioptions_list_get_version( const NAIOptionsList *instance );
 static void         ioptions_list_free_options( const NAIOptionsList *instance, GtkWidget *container_parent, GList *options );
@@ -136,8 +136,8 @@ register_type( void )
 
 	static const GTypeInfo info = {
 		sizeof( NAIOptionsListInterface ),
-		( GBaseInitFunc ) interface_init,
-		( GBaseFinalizeFunc ) interface_finalize,
+		( GBaseInitFunc ) interface_base_init,
+		( GBaseFinalizeFunc ) interface_base_finalize,
 		NULL,
 		NULL,
 		NULL,
@@ -156,9 +156,9 @@ register_type( void )
 }
 
 static void
-interface_init( NAIOptionsListInterface *iface )
+interface_base_init( NAIOptionsListInterface *iface )
 {
-	static const gchar *thisfn = "na_ioptions_list_interface_init";
+	static const gchar *thisfn = "na_ioptions_list_interface_base_init";
 
 	if( !st_initializations ){
 
@@ -177,9 +177,9 @@ interface_init( NAIOptionsListInterface *iface )
 }
 
 static void
-interface_finalize( NAIOptionsListInterface *iface )
+interface_base_finalize( NAIOptionsListInterface *iface )
 {
-	static const gchar *thisfn = "na_ioptions_list_interface_finalize";
+	static const gchar *thisfn = "na_ioptions_list_interface_base_finalize";
 
 	st_initializations -= 1;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]