[nautilus-actions] Refactoring: update core library

[Pierre Wieser <pwieser src gnome org>]

commit 7e010a3d2d914750466615d9c000c5d9ed276edb
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 17 10:37:02 2010 +0100

    Refactoring: update core library

 ChangeLog                 |    5 +++++
 TODO                      |    7 +++++--
 src/core/Makefile.am      |    2 ++
 src/core/na-iimporter.c   |   12 ++++++------
 src/core/na-io-provider.c |    2 +-
 src/core/na-iprefs.h      |   27 ---------------------------
 6 files changed, 19 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index db6860e..a79a073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-02-17 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/Makefile.am:
+	* src/core/na-iimporter.c:
+	* src/core/na-io-provider.c:
+	* src/core/na-iprefs.h: Update core library.
+
 	* src/nact/nact-export-format.h:
 	* src/nact/nact-export-format.c:
 	* src/core/na-exporter.h:
diff --git a/TODO b/TODO
index 1813420..d96eb62 100644
--- a/TODO
+++ b/TODO
@@ -59,8 +59,6 @@
   more: have a single place where the schema is _described_
   so that we may generalize export, import, new, etc.
 
-- import/export menus ?
-
 - IActionTab: check_label has became useless since validity is global
   to the action - remove, or extend to each field which can led to
   unvalidity
@@ -157,3 +155,8 @@
   to be editable in NACT, but not used in runtime plugin
 
 - profile path and parameters should be set together as only one variable
+
+- AssistantExport and AssistantExportAsk should be dynamically displayed
+  depending of available formats provided by NAIExporter modules
+
+- one should be able to import/export menus
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 3df847e..269a084 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -45,6 +45,8 @@ libna_core_la_SOURCES = \
 	na-dbus-tracker.h									\
 	na-exporter.c										\
 	na-exporter.h										\
+	na-export-format.c									\
+	na-export-format.h									\
 	na-gconf-monitor.c									\
 	na-gconf-utils.c									\
 	na-iabout.c											\
diff --git a/src/core/na-iimporter.c b/src/core/na-iimporter.c
index ca96205..b7b3d66 100644
--- a/src/core/na-iimporter.c
+++ b/src/core/na-iimporter.c
@@ -40,8 +40,8 @@ struct NAIImporterInterfacePrivate {
 	void *empty;						/* so that gcc -pedantic is happy */
 };
 
-static gboolean st_initialized = FALSE;
-static gboolean st_finalized   = FALSE;
+gboolean iimporter_initialized = FALSE;
+gboolean iimporter_finalized   = FALSE;
 
 static GType  register_type( void );
 static void   interface_base_init( NAIImporterInterface *klass );
@@ -103,7 +103,7 @@ interface_base_init( NAIImporterInterface *klass )
 {
 	static const gchar *thisfn = "na_iimporter_interface_base_init";
 
-	if( !st_initialized ){
+	if( !iimporter_initialized ){
 
 		g_debug( "%s: klass%p (%s)", thisfn, ( void * ) klass, G_OBJECT_CLASS_NAME( klass ));
 
@@ -111,7 +111,7 @@ interface_base_init( NAIImporterInterface *klass )
 
 		klass->get_version = iimporter_get_version;
 
-		st_initialized = TRUE;
+		iimporter_initialized = TRUE;
 	}
 }
 
@@ -120,11 +120,11 @@ interface_base_finalize( NAIImporterInterface *klass )
 {
 	static const gchar *thisfn = "na_iimporter_interface_base_finalize";
 
-	if( st_initialized && !st_finalized ){
+	if( iimporter_initialized && !iimporter_finalized ){
 
 		g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
 
-		st_finalized = TRUE;
+		iimporter_finalized = TRUE;
 
 		g_free( klass->private );
 	}
diff --git a/src/core/na-io-provider.c b/src/core/na-io-provider.c
index c763ee2..d6a518d 100644
--- a/src/core/na-io-provider.c
+++ b/src/core/na-io-provider.c
@@ -394,7 +394,7 @@ merge_available_io_providers( const NAPivot *pivot, GList *ordered )
 
 		id = NULL;
 		if( NA_IIO_PROVIDER_GET_INTERFACE( NA_IIO_PROVIDER( im->data ))->get_id ){
-			id = NA_IIO_PROVIDER_GET_INTERFACE( NA_IIO_PROVIDER( im->data ))->get_id( NA_IIO_PROVIDER( im->data ) );
+			id = NA_IIO_PROVIDER_GET_INTERFACE( NA_IIO_PROVIDER( im->data ))->get_id( NA_IIO_PROVIDER( im->data ));
 		} else {
 			g_warning( "%s: NAIIOProvider %p doesn't support get_id() interface", thisfn, ( void * ) im->data );
 		}
diff --git a/src/core/na-iprefs.h b/src/core/na-iprefs.h
index b74af8e..0ff5a2d 100644
--- a/src/core/na-iprefs.h
+++ b/src/core/na-iprefs.h
@@ -119,35 +119,8 @@ enum {
 	IPREFS_IMPORT_ASK
 };
 
-/* import/export formats
- *
- * FORMAT_GCONF_SCHEMA_V1: a schema with owner, short and long
- * descriptions ; each action has its own schema addressed by the uuid
- * (historical format up to v1.10.x serie)
- *
- * FORMAT_GCONF_SCHEMA_V2: the lightest schema still compatible
- * with gconftool-2 --install-schema-file (no owner, no short nor long
- * descriptions) - introduced in v 1.11
- *
- * FORMAT_GCONF_SCHEMA: exports a full schema, not an action
- *
- * FORMAT_GCONF_ENTRY: not a schema, but a dump of the GConf entry
- * introduced in v 1.11
- */
-enum {
-	IPREFS_EXPORT_NO_EXPORT = 1,
-	IPREFS_EXPORT_FORMAT_GCONF_SCHEMA_V1,
-	IPREFS_EXPORT_FORMAT_GCONF_SCHEMA_V2,
-	IPREFS_EXPORT_FORMAT_GCONF_SCHEMA,
-	IPREFS_EXPORT_FORMAT_GCONF_ENTRY,
-	IPREFS_EXPORT_FORMAT_ASK
-};
-
 GType        na_iprefs_get_type( void );
 
-/*GSList      *na_iprefs_get_level_zero_items( NAIPrefs *instance );*/
-/*void         na_iprefs_set_level_zero_items( NAIPrefs *instance, GSList *order );*/
-
 gint         na_iprefs_get_order_mode( NAIPrefs *instance );
 /*void         na_iprefs_set_order_mode( NAIPrefs *instance, gint mode );*/