[nautilus-actions] Rename NAIImporter::from_uri() virtual function to be consistant with NAIExporter interface

[Pierre Wieser <pwieser src gnome org>]

commit 48e21825dce3c44a7c92f8752defee267ee4a994
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Mar 1 22:00:07 2010 +0100

    Rename NAIImporter::from_uri() virtual function to be consistant with NAIExporter interface

 ChangeLog                   |    6 ++++++
 src/api/na-iimporter.h      |    4 ++--
 src/core/na-iimporter.c     |    1 +
 src/io-xml/naxml-provider.c |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 90303e4..ae3024f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-03-01 Pierre Wieser <pwieser trychlos org>
 
+	* src/api/na-iimporter.h (from_uri):
+	Rename the API function to be consistant with NAIExporter interface.
+
+	* src/core/na-iimporter.c:
+	* src/io-xml/naxml-provider.c: Updated accordingly.
+
 	* src/nact/nact-tree-model-dnd.c
 	(nact_tree_model_dnd_imulti_drag_source_drag_data_get):
 	Target folder is an URI.
diff --git a/src/api/na-iimporter.h b/src/api/na-iimporter.h
index f0f94a3..10d2a1d 100644
--- a/src/api/na-iimporter.h
+++ b/src/api/na-iimporter.h
@@ -70,7 +70,7 @@ typedef struct {
 	 *
 	 * Defaults to 1.
 	 */
-	guint ( *get_version )    ( const NAIImporter *instance );
+	guint ( *get_version )( const NAIImporter *instance );
 
 	/**
 	 * import_from_uri:
@@ -81,7 +81,7 @@ typedef struct {
 	 *
 	 * Returns: the return code of the operation.
 	 */
-	guint ( *import_from_uri )( const NAIImporter *instance, NAIImporterUriParms *parms );
+	guint ( *from_uri )   ( const NAIImporter *instance, NAIImporterUriParms *parms );
 }
 	NAIImporterInterface;
 
diff --git a/src/core/na-iimporter.c b/src/core/na-iimporter.c
index 9ba65a0..1ade8b7 100644
--- a/src/core/na-iimporter.c
+++ b/src/core/na-iimporter.c
@@ -112,6 +112,7 @@ interface_base_init( NAIImporterInterface *klass )
 		klass->private = g_new0( NAIImporterInterfacePrivate, 1 );
 
 		klass->get_version = iimporter_get_version;
+		klass->from_uri = NULL;
 
 		iimporter_initialized = TRUE;
 	}
diff --git a/src/io-xml/naxml-provider.c b/src/io-xml/naxml-provider.c
index ddf04cf..d6c717e 100644
--- a/src/io-xml/naxml-provider.c
+++ b/src/io-xml/naxml-provider.c
@@ -239,7 +239,7 @@ iimporter_iface_init( NAIImporterInterface *iface )
 	g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
 	iface->get_version = iimporter_get_version;
-	iface->import_from_uri = naxml_reader_import_from_uri;
+	iface->from_uri = naxml_reader_import_from_uri;
 }
 
 static guint