[nautilus-actions/file-manager-actions] NAIIOProvider interface is renamed to FMAIIOProvider
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] NAIIOProvider interface is renamed to FMAIIOProvider
- Date: Mon, 7 Sep 2015 22:09:42 +0000 (UTC)
commit e93f0f2c3af5ab00eb3b67c1124948f22b13fa7e
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Sep 7 22:49:12 2015 +0200
NAIIOProvider interface is renamed to FMAIIOProvider
src/api/Makefile.am | 2 +-
src/api/fma-extension.h | 4 +-
src/api/fma-ifactory-object.h | 4 +-
src/api/fma-ifactory-provider.h | 6 +-
src/api/fma-iimporter.h | 2 +-
src/api/{na-iio-provider.h => fma-iio-provider.h} | 170 ++++++++++----------
src/core/Makefile.am | 2 +-
src/core/fma-ifactory-provider.c | 20 ++--
src/core/{na-iio-provider.c => fma-iio-provider.c} | 60 ++++----
src/core/na-factory-object.c | 20 ++--
src/core/na-factory-provider.c | 10 +-
src/core/na-io-provider.c | 164 ++++++++++----------
src/core/na-io-provider.h | 10 +-
src/core/na-module.h | 2 +-
src/core/na-object-action.c | 10 +-
src/core/na-object-item-factory.c | 6 +-
src/core/na-object-item.c | 2 +-
src/core/na-object-menu.c | 6 +-
src/core/na-object-profile.c | 4 +-
src/core/na-pivot.c | 14 +-
src/core/na-pivot.h | 12 +-
src/core/na-updater.c | 28 ++--
src/io-desktop/nadp-desktop-provider.c | 24 ++--
src/io-desktop/nadp-desktop-provider.h | 4 +-
src/io-desktop/nadp-reader.c | 6 +-
src/io-desktop/nadp-reader.h | 4 +-
src/io-desktop/nadp-writer.c | 66 ++++----
src/io-desktop/nadp-writer.h | 12 +-
src/io-gconf/nagp-gconf-provider.c | 34 ++--
src/io-gconf/nagp-gconf-provider.h | 6 +-
src/io-gconf/nagp-reader.c | 8 +-
src/io-gconf/nagp-reader.h | 4 +-
src/io-gconf/nagp-writer.c | 58 ++++----
src/io-gconf/nagp-writer.h | 12 +-
src/io-xml/naxml-writer.c | 8 +-
src/nact/nact-menu-file.c | 2 +-
src/nact/nact-tree-ieditable.c | 2 +-
src/test/test-module-plugin.c | 2 +-
src/utils/nautilus-actions-new.c | 4 +-
39 files changed, 407 insertions(+), 407 deletions(-)
---
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 4613cf5..8908bfb 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -35,7 +35,7 @@ api_include_HEADERS = \
fma-iimporter.h \
fma-ifactory-provider.h \
fma-ifactory-provider-provider.h \
- na-iio-provider.h \
+ fma-iio-provider.h \
\
fma-boxed.h \
fma-core-utils.h \
diff --git a/src/api/fma-extension.h b/src/api/fma-extension.h
index 49c2d5b..1792f34 100644
--- a/src/api/fma-extension.h
+++ b/src/api/fma-extension.h
@@ -48,7 +48,7 @@
* </title>
* <para>
* This extension is provided via the public
- * <link linkend="NAIIOProvider">NAIIOProvider</link>
+ * <link linkend="FMAIIOProvider">FMAIIOProvider</link>
* interface; it takes care of reading and writing menus
* and actions to a specific storage subsystem.
* </para>
@@ -190,7 +190,7 @@ G_BEGIN_DECLS
*
* st_module_type = g_type_module_register_type( plugin, G_TYPE_OBJECT, "NadpDesktopProvider",
&info, 0 );
*
- * g_type_module_add_interface( plugin, st_module_type, NA_TYPE_IIO_PROVIDER,
&iio_provider_iface_info );
+ * g_type_module_add_interface( plugin, st_module_type, FMA_TYPE_IIO_PROVIDER,
&iio_provider_iface_info );
*
* return( TRUE );
* }
diff --git a/src/api/fma-ifactory-object.h b/src/api/fma-ifactory-object.h
index 64c88ba..63abf66 100644
--- a/src/api/fma-ifactory-object.h
+++ b/src/api/fma-ifactory-object.h
@@ -212,7 +212,7 @@ typedef struct {
*
* Called just before the object is serialized.
*
- * Returns: a NAIIOProvider operation return code.
+ * Returns: a FMAIIOProvider operation return code.
*
* Since: 2.30
*/
@@ -228,7 +228,7 @@ typedef struct {
*
* Called when the object has been serialized.
*
- * Returns: a NAIIOProvider operation return code.
+ * Returns: a FMAIIOProvider operation return code.
*
* Since: 2.30
*/
diff --git a/src/api/fma-ifactory-provider.h b/src/api/fma-ifactory-provider.h
index f8bbf50..7320405 100644
--- a/src/api/fma-ifactory-provider.h
+++ b/src/api/fma-ifactory-provider.h
@@ -237,7 +237,7 @@ typedef struct {
*
* API called by #FMAIFactoryObject just before starting with writing data.
*
- * Returns: a NAIIOProvider operation return code.
+ * Returns: a FMAIIOProvider operation return code.
*
* Since: 2.30
*/
@@ -257,7 +257,7 @@ typedef struct {
*
* This method must be implemented in order any data be written.
*
- * Returns: a NAIIOProvider operation return code.
+ * Returns: a FMAIIOProvider operation return code.
*
* Since: 2.30
*/
@@ -274,7 +274,7 @@ typedef struct {
* API called by #FMAIFactoryObject when all data have been written.
* Implementor may take advantage of this to do some cleanup.
*
- * Returns: a NAIIOProvider operation return code.
+ * Returns: a FMAIIOProvider operation return code.
*
* Since: 2.30
*/
diff --git a/src/api/fma-iimporter.h b/src/api/fma-iimporter.h
index faa2d45..126e3c2 100644
--- a/src/api/fma-iimporter.h
+++ b/src/api/fma-iimporter.h
@@ -37,7 +37,7 @@
* @include: file-manager-actions/fma-iimporter.h
*
* The #FMAIImporter interface imports items from the outside world
- * into &prodname; repository (see #NAIIOProvider interface for how
+ * into &prodname; repository (see #FMAIIOProvider interface for how
* these items will be later managed to be store somewhere).
*
* In version 1 of the #FMAIImporter interface, &prodname; used to
diff --git a/src/api/na-iio-provider.h b/src/api/fma-iio-provider.h
similarity index 71%
rename from src/api/na-iio-provider.h
rename to src/api/fma-iio-provider.h
index f8c42c6..766eaeb 100644
--- a/src/api/na-iio-provider.h
+++ b/src/api/fma-iio-provider.h
@@ -27,16 +27,16 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_NA_IIO_PROVIDER_H__
-#define __FILE_MANAGER_ACTIONS_API_NA_IIO_PROVIDER_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_IIO_PROVIDER_H__
+#define __FILE_MANAGER_ACTIONS_API_IIO_PROVIDER_H__
/**
* SECTION: iio-provider
- * @title: NAIIOProvider
+ * @title: FMAIIOProvider
* @short_description: The I/O Provider Interface
- * @include: file-manager-actions/na-iio-provider.h
+ * @include: file-manager-actions/fma-iio-provider.h
*
- * The #NAIIOProvider interface is defined in order to let both &prodname;
+ * The #FMAIIOProvider interface is defined in order to let both &prodname;
* internal and user-provided external plugins provide read and write accesses
* to their own private storage subsystem.
*
@@ -50,7 +50,7 @@
* <ulink role="online-location" url="http://www.file-manager-actions.org/?q=node/377/";>DES-EMA</ulink>
* specification, is the preferred way of storing (and sharing) items.
*
- * The #NAIIOProvider interface provides three types of services:
+ * The #FMAIIOProvider interface provides three types of services:
* <itemizedlist>
* <listitem>
* <formalpara>
@@ -89,11 +89,11 @@
* &nact; program.
* </para>
* <para>
- * The #NAIIOProvider interface does not define specific monitoring
+ * The #FMAIIOProvider interface does not define specific monitoring
* methods (but you can also take a glance at #NATimeout object).
* Instead, it is waited that the I/O provider module takes care
* itself of managing its own monitoring services at
- * load/unload time, calling the na_iio_provider_item_changed()
+ * load/unload time, calling the fma_iio_provider_item_changed()
* function when appropriate.
* </para>
* </listitem>
@@ -169,7 +169,7 @@
* <refsect2>
* <title>Versions historic</title>
* <table>
- * <title>Historic of the versions of the #NAIIOProvider interface</title>
+ * <title>Historic of the versions of the #FMAIIOProvider interface</title>
* <tgroup rowsep="1" colsep="1" align="center" cols="3">
* <colspec colname="na-version" />
* <colspec colname="api-version" />
@@ -177,7 +177,7 @@
* <thead>
* <row>
* <entry>&prodname; version</entry>
- * <entry>#NAIIOProvider interface version</entry>
+ * <entry>#FMAIIOProvider interface version</entry>
* <entry></entry>
* </row>
* </thead>
@@ -197,16 +197,16 @@
G_BEGIN_DECLS
-#define NA_TYPE_IIO_PROVIDER ( na_iio_provider_get_type())
-#define NA_IIO_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance,
NA_TYPE_IIO_PROVIDER, NAIIOProvider ))
-#define NA_IS_IIO_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance,
NA_TYPE_IIO_PROVIDER ))
-#define NA_IIO_PROVIDER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ),
NA_TYPE_IIO_PROVIDER, NAIIOProviderInterface ))
+#define FMA_TYPE_IIO_PROVIDER ( fma_iio_provider_get_type())
+#define FMA_IIO_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance,
FMA_TYPE_IIO_PROVIDER, FMAIIOProvider ))
+#define FMA_IS_IIO_PROVIDER( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance,
FMA_TYPE_IIO_PROVIDER ))
+#define FMA_IIO_PROVIDER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ),
FMA_TYPE_IIO_PROVIDER, FMAIIOProviderInterface ))
-typedef struct _NAIIOProvider NAIIOProvider;
-typedef struct _NAIIOProviderInterfacePrivate NAIIOProviderInterfacePrivate;
+typedef struct _FMAIIOProvider FMAIIOProvider;
+typedef struct _FMAIIOProviderInterfacePrivate FMAIIOProviderInterfacePrivate;
/**
- * NAIIOProviderInterface:
+ * FMAIIOProviderInterface:
* @get_version: [should] returns the version of this interface that the
* plugin implements.
* @get_id: [must] returns the internal id of the plugin.
@@ -218,25 +218,25 @@ typedef struct _NAIIOProviderInterfacePrivate NAIIOProviderInterfacePrivate;
* @delete_item: [should] deletes an item.
* @duplicate_data: [may] let the I/O provider duplicates its specific data.
*
- * This defines the methods that a #NAIIOProvider may, should, or must
+ * This defines the methods that a #FMAIIOProvider may, should, or must
* implement.
*/
typedef struct {
/*< private >*/
- GTypeInterface parent;
- NAIIOProviderInterfacePrivate *private;
+ GTypeInterface parent;
+ FMAIIOProviderInterfacePrivate *private;
/*< public >*/
/**
* get_version:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
*
* FileManager-Actions calls this method each time it needs to know
* which version of this interface the plugin implements.
*
* If this method is not implemented by the plugin,
* FileManager-Actions considers that the plugin only implements
- * the version 1 of the NAIIOProvider interface.
+ * the version 1 of the FMAIIOProvider interface.
*
* Return value: if implemented, this method must return the version
* number of this interface the I/O provider is supporting.
@@ -245,11 +245,11 @@ typedef struct {
*
* Since: 2.30
*/
- guint ( *get_version ) ( const NAIIOProvider *instance );
+ guint ( *get_version ) ( const FMAIIOProvider *instance );
/**
* get_id:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
*
* The I/O provider must implement this method.
*
@@ -259,11 +259,11 @@ typedef struct {
*
* Since: 2.30
*/
- gchar * ( *get_id ) ( const NAIIOProvider *instance );
+ gchar * ( *get_id ) ( const FMAIIOProvider *instance );
/**
* get_name:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
*
* Return value: if implemented, this method must return the display
* name of the I/O provider, as a newly allocated string which will be
@@ -276,11 +276,11 @@ typedef struct {
*
* Since: 2.30
*/
- gchar * ( *get_name ) ( const NAIIOProvider *instance );
+ gchar * ( *get_name ) ( const FMAIIOProvider *instance );
/**
* read_items:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
* @messages: a pointer to a GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
*
@@ -297,11 +297,11 @@ typedef struct {
*
* Since: 2.30
*/
- GList * ( *read_items ) ( const NAIIOProvider *instance, GSList **messages );
+ GList * ( *read_items ) ( const FMAIIOProvider *instance, GSList **messages );
/**
* is_willing_to_write:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
*
* The 'willing_to_write' property is intrinsic to the I/O provider.
* It is not supposed to make any assumption on the environment it is
@@ -322,11 +322,11 @@ typedef struct {
*
* Since: 2.30
*/
- gboolean ( *is_willing_to_write )( const NAIIOProvider *instance );
+ gboolean ( *is_willing_to_write )( const FMAIIOProvider *instance );
/**
* is_able_to_write:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
*
* The 'able_to_write' property is a runtime one.
* When returning TRUE, the I/O provider insures that it has
@@ -355,11 +355,11 @@ typedef struct {
*
* Since: 2.30
*/
- gboolean ( *is_able_to_write ) ( const NAIIOProvider *instance );
+ gboolean ( *is_able_to_write ) ( const FMAIIOProvider *instance );
/**
* write_item:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
* @item: a NAObjectItem-derived item, menu or action.
* @messages: a pointer to a GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
@@ -374,16 +374,16 @@ typedef struct {
* The I/O provider should implement this method, or return
* FALSE in is_willing_to_write() method above.
*
- * Return value: NA_IIO_PROVIDER_CODE_OK if the write operation
+ * Return value: FMA_IIO_PROVIDER_CODE_OK if the write operation
* was successful, or another code depending of the detected error.
*
* Since: 2.30
*/
- guint ( *write_item ) ( const NAIIOProvider *instance, const NAObjectItem *item, GSList
**messages );
+ guint ( *write_item ) ( const FMAIIOProvider *instance, const NAObjectItem *item, GSList
**messages );
/**
* delete_item:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
* @item: a NAObjectItem-derived item, menu or action.
* @messages: a pointer to a GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
@@ -393,16 +393,16 @@ typedef struct {
* The I/O provider should implement this method, or return
* FALSE in is_willing_to_write() method above.
*
- * Return value: NA_IIO_PROVIDER_CODE_OK if the delete operation was
+ * Return value: FMA_IIO_PROVIDER_CODE_OK if the delete operation was
* successful, or another code depending of the detected error.
*
* Since: 2.30
*/
- guint ( *delete_item ) ( const NAIIOProvider *instance, const NAObjectItem *item, GSList
**messages );
+ guint ( *delete_item ) ( const FMAIIOProvider *instance, const NAObjectItem *item, GSList
**messages );
/**
* duplicate_data:
- * @instance: the NAIIOProvider provider.
+ * @instance: the FMAIIOProvider provider.
* @dest: a NAObjectItem-derived item, menu or action.
* @source: a NAObjectItem-derived item, menu or action.
* @messages: a pointer to a GSList list of strings; the provider
@@ -418,31 +418,31 @@ typedef struct {
* the provider-specific data which may have been attached to
* the NAObjectItem-derived object.
*
- * Return value: NA_IIO_PROVIDER_CODE_OK if the duplicate operation
+ * Return value: FMA_IIO_PROVIDER_CODE_OK if the duplicate operation
* was successful, or another code depending of the detected error.
*
* Since: 2.30
*/
- guint ( *duplicate_data ) ( const NAIIOProvider *instance, NAObjectItem *dest, const
NAObjectItem *source, GSList **messages );
+ guint ( *duplicate_data ) ( const FMAIIOProvider *instance, NAObjectItem *dest, const
NAObjectItem *source, GSList **messages );
}
- NAIIOProviderInterface;
+ FMAIIOProviderInterface;
/* -- adding a new status here should imply also adding a new tooltip
* -- in na_io_provider_get_readonly_tooltip().
*/
/**
- * NAIIOProviderWritabilityStatus:
- * @NA_IIO_PROVIDER_STATUS_WRITABLE: item and i/o provider are writable.
- * @NA_IIO_PROVIDER_STATUS_UNAVAILABLE: unavailable i/o provider.
- * @NA_IIO_PROVIDER_STATUS_INCOMPLETE_API: i/o provider has an incomplete write api.
- * @NA_IIO_PROVIDER_STATUS_NOT_WILLING_TO: i/o provider is not willing to write.
- * @NA_IIO_PROVIDER_STATUS_NOT_ABLE_TO: i/o provider is not able to write.
- * @NA_IIO_PROVIDER_STATUS_LOCKED_BY_ADMIN: i/o provider has been locked by the administrator.
- * @NA_IIO_PROVIDER_STATUS_LOCKED_BY_USER: i/o provider has been locked by the user.
- * @NA_IIO_PROVIDER_STATUS_ITEM_READONLY: item is read-only.
- * @NA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND: no writable i/o provider found.
- * @NA_IIO_PROVIDER_STATUS_LEVEL_ZERO: level zero is not writable.
- * @NA_IIO_PROVIDER_STATUS_UNDETERMINED: unknwon reason (and probably a bug).
+ * FMAIIOProviderWritabilityStatus:
+ * @FMA_IIO_PROVIDER_STATUS_WRITABLE: item and i/o provider are writable.
+ * @FMA_IIO_PROVIDER_STATUS_UNAVAILABLE: unavailable i/o provider.
+ * @FMA_IIO_PROVIDER_STATUS_INCOMPLETE_API: i/o provider has an incomplete write api.
+ * @FMA_IIO_PROVIDER_STATUS_NOT_WILLING_TO: i/o provider is not willing to write.
+ * @FMA_IIO_PROVIDER_STATUS_NOT_ABLE_TO: i/o provider is not able to write.
+ * @FMA_IIO_PROVIDER_STATUS_LOCKED_BY_ADMIN: i/o provider has been locked by the administrator.
+ * @FMA_IIO_PROVIDER_STATUS_LOCKED_BY_USER: i/o provider has been locked by the user.
+ * @FMA_IIO_PROVIDER_STATUS_ITEM_READONLY: item is read-only.
+ * @FMA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND: no writable i/o provider found.
+ * @FMA_IIO_PROVIDER_STATUS_LEVEL_ZERO: level zero is not writable.
+ * @FMA_IIO_PROVIDER_STATUS_UNDETERMINED: unknwon reason (and probably a bug).
*
* The reasons for which an item may not be writable.
*
@@ -450,55 +450,55 @@ typedef struct {
* Some are to be used only internally from &prodname; programs.
*/
typedef enum {
- NA_IIO_PROVIDER_STATUS_WRITABLE = 0,
- NA_IIO_PROVIDER_STATUS_UNAVAILABLE,
- NA_IIO_PROVIDER_STATUS_INCOMPLETE_API,
- NA_IIO_PROVIDER_STATUS_NOT_WILLING_TO,
- NA_IIO_PROVIDER_STATUS_NOT_ABLE_TO,
- NA_IIO_PROVIDER_STATUS_LOCKED_BY_ADMIN,
- NA_IIO_PROVIDER_STATUS_LOCKED_BY_USER,
- NA_IIO_PROVIDER_STATUS_ITEM_READONLY,
- NA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND,
- NA_IIO_PROVIDER_STATUS_LEVEL_ZERO,
- NA_IIO_PROVIDER_STATUS_UNDETERMINED,
+ FMA_IIO_PROVIDER_STATUS_WRITABLE = 0,
+ FMA_IIO_PROVIDER_STATUS_UNAVAILABLE,
+ FMA_IIO_PROVIDER_STATUS_INCOMPLETE_API,
+ FMA_IIO_PROVIDER_STATUS_NOT_WILLING_TO,
+ FMA_IIO_PROVIDER_STATUS_NOT_ABLE_TO,
+ FMA_IIO_PROVIDER_STATUS_LOCKED_BY_ADMIN,
+ FMA_IIO_PROVIDER_STATUS_LOCKED_BY_USER,
+ FMA_IIO_PROVIDER_STATUS_ITEM_READONLY,
+ FMA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND,
+ FMA_IIO_PROVIDER_STATUS_LEVEL_ZERO,
+ FMA_IIO_PROVIDER_STATUS_UNDETERMINED,
/*< private >*/
- NA_IIO_PROVIDER_STATUS_LAST,
+ FMA_IIO_PROVIDER_STATUS_LAST,
}
- NAIIOProviderWritabilityStatus;
+ FMAIIOProviderWritabilityStatus;
/* -- adding a new code here should imply also adding a new label
* -- in #na_io_provider_get_return_code_label().
*/
/**
- * NAIIOProviderOperationStatus:
- * @NA_IIO_PROVIDER_CODE_OK: the requested operation has been successful.
- * @NA_IIO_PROVIDER_CODE_PROGRAM_ERROR: a program error has been detected;
+ * FMAIIOProviderOperationStatus:
+ * @FMA_IIO_PROVIDER_CODE_OK: the requested operation has been successful.
+ * @FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR: a program error has been detected;
* you should open a bug in
* <ulink
url="https://bugzilla.gnome.org/enter_bug.cgi?product=file-manager-actions";>Bugzilla</ulink>.
- * @NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN: the provider is not willing
+ * @FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN: the provider is not willing
* to do the requested action.
- * @NA_IIO_PROVIDER_CODE_WRITE_ERROR: a write error has been detected.
- * @NA_IIO_PROVIDER_CODE_DELETE_SCHEMAS_ERROR: the schemas could not be deleted.
- * @NA_IIO_PROVIDER_CODE_DELETE_CONFIG_ERROR: the configuration could not be deleted.
+ * @FMA_IIO_PROVIDER_CODE_WRITE_ERROR: a write error has been detected.
+ * @FMA_IIO_PROVIDER_CODE_DELETE_SCHEMAS_ERROR: the schemas could not be deleted.
+ * @FMA_IIO_PROVIDER_CODE_DELETE_CONFIG_ERROR: the configuration could not be deleted.
*
* The return code of operations.
*/
typedef enum {
- NA_IIO_PROVIDER_CODE_OK = 0,
- NA_IIO_PROVIDER_CODE_PROGRAM_ERROR = 1 + NA_IIO_PROVIDER_STATUS_LAST,
- NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN,
- NA_IIO_PROVIDER_CODE_WRITE_ERROR,
- NA_IIO_PROVIDER_CODE_DELETE_SCHEMAS_ERROR,
- NA_IIO_PROVIDER_CODE_DELETE_CONFIG_ERROR,
+ FMA_IIO_PROVIDER_CODE_OK = 0,
+ FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR = 1 + FMA_IIO_PROVIDER_STATUS_LAST,
+ FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN,
+ FMA_IIO_PROVIDER_CODE_WRITE_ERROR,
+ FMA_IIO_PROVIDER_CODE_DELETE_SCHEMAS_ERROR,
+ FMA_IIO_PROVIDER_CODE_DELETE_CONFIG_ERROR,
}
- NAIIOProviderOperationStatus;
+ FMAIIOProviderOperationStatus;
-GType na_iio_provider_get_type ( void );
+GType fma_iio_provider_get_type ( void );
/* -- to be called by the I/O provider when an item has changed
*/
-void na_iio_provider_item_changed( const NAIIOProvider *instance );
+void fma_iio_provider_item_changed( const FMAIIOProvider *instance );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_NA_IIO_PROVIDER_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_IIO_PROVIDER_H__ */
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 97a4fb1..9f0d347 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -83,7 +83,7 @@ libna_core_la_SOURCES = \
fma-ifactory-object.c \
fma-ifactory-provider.c \
fma-iimporter.c \
- na-iio-provider.c \
+ fma-iio-provider.c \
na-import-mode.c \
na-import-mode.h \
na-importer.c \
diff --git a/src/core/fma-ifactory-provider.c b/src/core/fma-ifactory-provider.c
index f0613c4..d29a08b 100644
--- a/src/core/fma-ifactory-provider.c
+++ b/src/core/fma-ifactory-provider.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-ifactory-provider.h>
#include "na-factory-object.h"
@@ -155,7 +155,7 @@ ifactory_provider_get_version( const FMAIFactoryProvider *instance )
* @messages: a pointer to a #GSList list of strings; the implementation
* may append messages to this list, but shouldn't reinitialize it.
*
- * This function is to be called by a #NAIIOProvider which would wish read
+ * This function is to be called by a #FMAIIOProvider which would wish read
* its items. The function takes care of collecting and structuring data,
* while the callback interface methods #FMAIFactoryProviderInterface.read_start(),
* #FMAIFactoryProviderInterface.read_data() and #FMAIFactoryProviderInterface.read_done()
@@ -203,10 +203,10 @@ fma_ifactory_provider_read_item( const FMAIFactoryProvider *reader, void *reader
* @messages: a pointer to a #GSList list of strings; the implementation
* may append messages to this list, but shouldn't reinitialize it.
*
- * This function is to be called by a #NAIIOProvider which would wish write
+ * This function is to be called by a #FMAIIOProvider which would wish write
* an item. The function takes care of collecting and writing elementary data.
*
- * Returns: a NAIIOProvider operation return code.
+ * Returns: a FMAIIOProvider operation return code.
*
* Since: 2.30
*/
@@ -216,19 +216,19 @@ fma_ifactory_provider_write_item( const FMAIFactoryProvider *writer, void *write
static const gchar *thisfn = "fma_ifactory_provider_write_item";
guint code;
- g_return_val_if_fail( FMA_IS_IFACTORY_PROVIDER( writer ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( FMA_IS_IFACTORY_PROVIDER( writer ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
g_debug( "%s: writer=%p, writer_data=%p, object=%p (%s)",
thisfn, ( void * ) writer, ( void * ) writer_data, ( void * ) object,
G_OBJECT_TYPE_NAME( object ));
code = v_factory_provider_write_start( writer, writer_data, object, messages );
- if( code == NA_IIO_PROVIDER_CODE_OK ){
+ if( code == FMA_IIO_PROVIDER_CODE_OK ){
code = na_factory_object_write_item( object, writer, writer_data, messages );
}
- if( code == NA_IIO_PROVIDER_CODE_OK ){
+ if( code == FMA_IIO_PROVIDER_CODE_OK ){
code = v_factory_provider_write_done( writer, writer_data, object, messages );
}
@@ -254,7 +254,7 @@ v_factory_provider_read_done( const FMAIFactoryProvider *reader, void *reader_da
static guint
v_factory_provider_write_start( const FMAIFactoryProvider *writer, void *writer_data, FMAIFactoryObject
*serializable, GSList **messages )
{
- guint code = NA_IIO_PROVIDER_CODE_OK;
+ guint code = FMA_IIO_PROVIDER_CODE_OK;
if( FMA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_start ){
code = FMA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_start( writer, writer_data,
serializable, messages );
@@ -266,7 +266,7 @@ v_factory_provider_write_start( const FMAIFactoryProvider *writer, void *writer_
static guint
v_factory_provider_write_done( const FMAIFactoryProvider *writer, void *writer_data, FMAIFactoryObject
*serializable, GSList **messages )
{
- guint code = NA_IIO_PROVIDER_CODE_OK;
+ guint code = FMA_IIO_PROVIDER_CODE_OK;
if( FMA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_done ){
code = FMA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_done( writer, writer_data,
serializable, messages );
diff --git a/src/core/na-iio-provider.c b/src/core/fma-iio-provider.c
similarity index 72%
rename from src/core/na-iio-provider.c
rename to src/core/fma-iio-provider.c
index a813dbb..89b0823 100644
--- a/src/core/na-iio-provider.c
+++ b/src/core/fma-iio-provider.c
@@ -31,13 +31,13 @@
#include <config.h>
#endif
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include "na-io-provider.h"
/* private interface data
*/
-struct _NAIIOProviderInterfacePrivate {
+struct _FMAIIOProviderInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
@@ -52,19 +52,19 @@ static guint st_initializations = 0; /* interface initialization count */
static gint st_signals[ LAST_SIGNAL ] = { 0 };
static GType register_type( void );
-static void interface_base_init( NAIIOProviderInterface *klass );
-static void interface_base_finalize( NAIIOProviderInterface *klass );
+static void interface_base_init( FMAIIOProviderInterface *klass );
+static void interface_base_finalize( FMAIIOProviderInterface *klass );
-static gboolean do_is_willing_to_write( const NAIIOProvider *instance );
-static gboolean do_is_able_to_write( const NAIIOProvider *instance );
+static gboolean do_is_willing_to_write( const FMAIIOProvider *instance );
+static gboolean do_is_able_to_write( const FMAIIOProvider *instance );
/**
- * na_iio_provider_get_type:
+ * fma_iio_provider_get_type:
*
* Returns: the #GType type of this interface.
*/
GType
-na_iio_provider_get_type( void )
+fma_iio_provider_get_type( void )
{
static GType type = 0;
@@ -76,18 +76,18 @@ na_iio_provider_get_type( void )
}
/*
- * na_iio_provider_register_type:
+ * fma_iio_provider_register_type:
*
* Registers this interface.
*/
static GType
register_type( void )
{
- static const gchar *thisfn = "na_iio_provider_register_type";
+ static const gchar *thisfn = "fma_iio_provider_register_type";
GType type;
static const GTypeInfo info = {
- sizeof( NAIIOProviderInterface ),
+ sizeof( FMAIIOProviderInterface ),
( GBaseInitFunc ) interface_base_init,
( GBaseFinalizeFunc ) interface_base_finalize,
NULL,
@@ -100,7 +100,7 @@ register_type( void )
g_debug( "%s", thisfn );
- type = g_type_register_static( G_TYPE_INTERFACE, "NAIIOProvider", &info, 0 );
+ type = g_type_register_static( G_TYPE_INTERFACE, "FMAIIOProvider", &info, 0 );
g_type_interface_add_prerequisite( type, G_TYPE_OBJECT );
@@ -108,15 +108,15 @@ register_type( void )
}
static void
-interface_base_init( NAIIOProviderInterface *klass )
+interface_base_init( FMAIIOProviderInterface *klass )
{
- static const gchar *thisfn = "na_iio_provider_interface_base_init";
+ static const gchar *thisfn = "fma_iio_provider_interface_base_init";
if( !st_initializations ){
g_debug( "%s: klass%p (%s)", thisfn, ( void * ) klass, G_OBJECT_CLASS_NAME( klass ));
- klass->private = g_new0( NAIIOProviderInterfacePrivate, 1 );
+ klass->private = g_new0( FMAIIOProviderInterfacePrivate, 1 );
klass->get_id = NULL;
klass->get_version = NULL;
@@ -128,21 +128,21 @@ interface_base_init( NAIIOProviderInterface *klass )
klass->duplicate_data = NULL;
/**
- * NAIIOProvider::io-provider-item-changed:
- * @provider: the #NAIIOProvider which has called the
- * na_iio_provider_item_changed() function.
+ * FMAIIOProvider::io-provider-item-changed:
+ * @provider: the #FMAIIOProvider which has called the
+ * fma_iio_provider_item_changed() function.
*
* This signal is registered without any default handler.
*
* This signal is not meant to be directly sent by a plugin.
- * Instead, the plugin should call the na_iio_provider_item_changed()
+ * Instead, the plugin should call the fma_iio_provider_item_changed()
* function.
*
- * See also na_iio_provider_item_changed().
+ * See also fma_iio_provider_item_changed().
*/
st_signals[ ITEM_CHANGED ] = g_signal_new(
IO_PROVIDER_SIGNAL_ITEM_CHANGED,
- NA_TYPE_IIO_PROVIDER,
+ FMA_TYPE_IIO_PROVIDER,
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
/* class offset */
NULL, /*
accumulator */
@@ -156,9 +156,9 @@ interface_base_init( NAIIOProviderInterface *klass )
}
static void
-interface_base_finalize( NAIIOProviderInterface *klass )
+interface_base_finalize( FMAIIOProviderInterface *klass )
{
- static const gchar *thisfn = "na_iio_provider_interface_base_finalize";
+ static const gchar *thisfn = "fma_iio_provider_interface_base_finalize";
st_initializations -= 1;
@@ -171,22 +171,22 @@ interface_base_finalize( NAIIOProviderInterface *klass )
}
static gboolean
-do_is_willing_to_write( const NAIIOProvider *instance )
+do_is_willing_to_write( const FMAIIOProvider *instance )
{
return( FALSE );
}
static gboolean
-do_is_able_to_write( const NAIIOProvider *instance )
+do_is_able_to_write( const FMAIIOProvider *instance )
{
return( FALSE );
}
/**
- * na_iio_provider_item_changed:
- * @instance: the calling #NAIIOProvider.
+ * fma_iio_provider_item_changed:
+ * @instance: the calling #FMAIIOProvider.
*
- * Informs &prodname; that this #NAIIOProvider @instance has
+ * Informs &prodname; that this #FMAIIOProvider @instance has
* detected a modification in (at least) one of its items (menu
* or action).
*
@@ -208,9 +208,9 @@ do_is_able_to_write( const NAIIOProvider *instance )
* Since: 2.30
*/
void
-na_iio_provider_item_changed( const NAIIOProvider *instance )
+fma_iio_provider_item_changed( const FMAIIOProvider *instance )
{
- static const gchar *thisfn = "na_iio_provider_item_changed";
+ static const gchar *thisfn = "fma_iio_provider_item_changed";
g_debug( "%s: instance=%p", thisfn, ( void * ) instance );
diff --git a/src/core/na-factory-object.c b/src/core/na-factory-object.c
index 07598ee..bb98e02 100644
--- a/src/core/na-factory-object.c
+++ b/src/core/na-factory-object.c
@@ -38,7 +38,7 @@
#include <api/fma-core-utils.h>
#include <api/fma-data-boxed.h>
#include <api/fma-data-types.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-ifactory-provider.h>
#include <api/na-object-api.h>
@@ -660,7 +660,7 @@ read_data_iter( FMADataDef *def, NafoReadIter *iter )
*
* Serializes the object down to the @writer.
*
- * Returns: a NAIIOProvider operation return code.
+ * Returns: a FMAIIOProvider operation return code.
*/
guint
na_factory_object_write_item( FMAIFactoryObject *object, const FMAIFactoryProvider *writer, void
*writer_data, GSList **messages )
@@ -670,10 +670,10 @@ na_factory_object_write_item( FMAIFactoryObject *object, const FMAIFactoryProvid
FMADataGroup *groups;
gchar *msg;
- g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- g_return_val_if_fail( FMA_IS_IFACTORY_PROVIDER( writer ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( FMA_IS_IFACTORY_PROVIDER( writer ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- code = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ code = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
groups = v_get_groups( object );
@@ -687,7 +687,7 @@ na_factory_object_write_item( FMAIFactoryObject *object, const FMAIFactoryProvid
*messages = g_slist_append( *messages, msg );
}
- if( code == NA_IIO_PROVIDER_CODE_OK ){
+ if( code == FMA_IIO_PROVIDER_CODE_OK ){
NafoWriteIter *iter = g_new0( NafoWriteIter, 1 );
iter->writer = ( FMAIFactoryProvider * ) writer;
@@ -701,7 +701,7 @@ na_factory_object_write_item( FMAIFactoryObject *object, const FMAIFactoryProvid
g_free( iter );
}
- if( code == NA_IIO_PROVIDER_CODE_OK ){
+ if( code == FMA_IIO_PROVIDER_CODE_OK ){
code = v_write_done( object, writer, writer_data, messages );
}
@@ -718,7 +718,7 @@ write_data_iter( const FMAIFactoryObject *object, FMADataBoxed *boxed, NafoWrite
}
/* iter while code is ok */
- return( iter->code != NA_IIO_PROVIDER_CODE_OK );
+ return( iter->code != FMA_IIO_PROVIDER_CODE_OK );
}
/*
@@ -918,7 +918,7 @@ v_read_done( FMAIFactoryObject *serializable, const FMAIFactoryProvider *reader,
static guint
v_write_start( FMAIFactoryObject *serializable, const FMAIFactoryProvider *writer, void *writer_data, GSList
**messages )
{
- guint code = NA_IIO_PROVIDER_CODE_OK;
+ guint code = FMA_IIO_PROVIDER_CODE_OK;
if( FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_start ){
code = FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_start( serializable, writer,
writer_data, messages );
@@ -930,7 +930,7 @@ v_write_start( FMAIFactoryObject *serializable, const FMAIFactoryProvider *write
static guint
v_write_done( FMAIFactoryObject *serializable, const FMAIFactoryProvider *writer, void *writer_data, GSList
**messages )
{
- guint code = NA_IIO_PROVIDER_CODE_OK;
+ guint code = FMA_IIO_PROVIDER_CODE_OK;
if( FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_done ){
code = FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_done( serializable, writer,
writer_data, messages );
diff --git a/src/core/na-factory-provider.c b/src/core/na-factory-provider.c
index f0ff364..f58e9d6 100644
--- a/src/core/na-factory-provider.c
+++ b/src/core/na-factory-provider.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include "na-factory-provider.h"
@@ -76,7 +76,7 @@ na_factory_provider_read_data( const FMAIFactoryProvider *reader, void *reader_d
* @messages: a pointer to a #GSList list of strings; the implementation
* may append messages to this list, but shouldn't reinitialize it.
*
- * Returns: a NAIIOProvider operation return code.
+ * Returns: a FMAIIOProvider operation return code.
*/
guint
na_factory_provider_write_data( const FMAIFactoryProvider *writer, void *writer_data,
@@ -85,10 +85,10 @@ na_factory_provider_write_data( const FMAIFactoryProvider *writer, void *writer_
{
guint code;
- g_return_val_if_fail( FMA_IS_IFACTORY_PROVIDER( writer ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( FMA_IS_IFACTORY_PROVIDER( writer ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- code = NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN;
+ code = FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN;
if( FMA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_data ){
code = FMA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_data( writer, writer_data,
object, boxed, messages );
diff --git a/src/core/na-io-provider.c b/src/core/na-io-provider.c
index ffb75f1..2ab431b 100644
--- a/src/core/na-io-provider.c
+++ b/src/core/na-io-provider.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/na-object-api.h>
#include <api/fma-core-utils.h>
@@ -52,7 +52,7 @@ struct _NAIOProviderClassPrivate {
struct _NAIOProviderPrivate {
gboolean dispose_has_run;
gchar *id;
- NAIIOProvider *provider;
+ FMAIIOProvider *provider;
gulong item_changed_handler;
gboolean writable;
guint reason;
@@ -85,13 +85,13 @@ static void instance_finalize( GObject *object );
static void dump( const NAIOProvider *provider );
static void dump_providers_list( GList *providers );
#endif
-static NAIOProvider *io_provider_new( const NAPivot *pivot, NAIIOProvider *module, const gchar *id );
+static NAIOProvider *io_provider_new( const NAPivot *pivot, FMAIIOProvider *module, const gchar *id );
static GList *io_providers_list_add_from_plugins( const NAPivot *pivot, GList *list );
static GList *io_providers_list_add_from_prefs( const NAPivot *pivot, GList *objects_list );
static GSList *io_providers_get_from_prefs( void );
static GList *io_providers_list_add_from_write_order( const NAPivot *pivot, GList *objects_list );
-static GList *io_providers_list_append_object( const NAPivot *pivot, GList *list, NAIIOProvider
*module, const gchar *id );
-static void io_providers_list_set_module( const NAPivot *pivot, NAIOProvider *provider_object,
NAIIOProvider *provider_module );
+static GList *io_providers_list_append_object( const NAPivot *pivot, GList *list, FMAIIOProvider
*module, const gchar *id );
+static void io_providers_list_set_module( const NAPivot *pivot, NAIOProvider *provider_object,
FMAIIOProvider *provider_module );
static gboolean is_conf_writable( const NAIOProvider *provider, const NAPivot *pivot, gboolean
*mandatory );
static gboolean is_finally_writable( const NAIOProvider *provider, const NAPivot *pivot, guint *reason
);
static GList *load_items_filter_unwanted_items( const NAPivot *pivot, GList *merged, guint
loadable_set );
@@ -187,7 +187,7 @@ instance_init( GTypeInstance *instance, gpointer klass )
self->private->provider = NULL;
self->private->item_changed_handler = 0;
self->private->writable = FALSE;
- self->private->reason = NA_IIO_PROVIDER_STATUS_UNAVAILABLE;
+ self->private->reason = FMA_IIO_PROVIDER_STATUS_UNAVAILABLE;
}
static void
@@ -375,7 +375,7 @@ na_io_provider_find_io_provider_by_id( const NAPivot *pivot, const gchar *id )
*
* A NAIOProvider object may be created:
* - either because we have loaded a plugin which claims to implement the
- * NAIIOProvider interface;
+ * FMAIIOProvider interface;
* - or because an i/o provider identifier has been found in preferences.
*
* The objects in this list must be in write order:
@@ -404,7 +404,7 @@ na_io_provider_get_io_providers_list( const NAPivot *pivot )
/*
* adding from write-order means we only create NAIOProvider objects
- * without having any pointer to the underlying NAIIOProvider (if it exists)
+ * without having any pointer to the underlying FMAIIOProvider (if it exists)
*/
static GList *
io_providers_list_add_from_write_order( const NAPivot *pivot, GList *objects_list )
@@ -428,7 +428,7 @@ io_providers_list_add_from_write_order( const NAPivot *pivot, GList *objects_lis
/*
* add to the list a NAIOProvider object for each loaded plugin which claim
- * to implement the NAIIOProvider interface
+ * to implement the FMAIIOProvider interface
*/
static GList *
io_providers_list_add_from_plugins( const NAPivot *pivot, GList *objects_list )
@@ -437,25 +437,25 @@ io_providers_list_add_from_plugins( const NAPivot *pivot, GList *objects_list )
GList *merged;
GList *modules_list, *im;
gchar *id;
- NAIIOProvider *provider_module;
+ FMAIIOProvider *provider_module;
merged = objects_list;
- modules_list = na_pivot_get_providers( pivot, NA_TYPE_IIO_PROVIDER );
+ modules_list = na_pivot_get_providers( pivot, FMA_TYPE_IIO_PROVIDER );
for( im = modules_list ; im ; im = im->next ){
id = NULL;
- provider_module = NA_IIO_PROVIDER( im->data );
+ provider_module = FMA_IIO_PROVIDER( im->data );
- if( NA_IIO_PROVIDER_GET_INTERFACE( provider_module )->get_id ){
- id = NA_IIO_PROVIDER_GET_INTERFACE( provider_module )->get_id( provider_module );
+ if( FMA_IIO_PROVIDER_GET_INTERFACE( provider_module )->get_id ){
+ id = FMA_IIO_PROVIDER_GET_INTERFACE( provider_module )->get_id( provider_module );
if( !id || !strlen( id )){
- g_warning( "%s: NAIIOProvider %p get_id() interface returns null or empty
id", thisfn, ( void * ) im->data );
+ g_warning( "%s: FMAIIOProvider %p get_id() interface returns null or empty
id", thisfn, ( void * ) im->data );
g_free( id );
id = NULL;
}
} else {
- g_warning( "%s: NAIIOProvider %p doesn't support get_id() interface", thisfn, ( void
* ) im->data );
+ g_warning( "%s: FMAIIOProvider %p doesn't support get_id() interface", thisfn, ( void
* ) im->data );
}
if( id ){
@@ -543,7 +543,7 @@ io_providers_get_from_prefs( void )
* if it does not have been already registered
*/
static GList *
-io_providers_list_append_object( const NAPivot *pivot, GList *list, NAIIOProvider *module, const gchar *id )
+io_providers_list_append_object( const NAPivot *pivot, GList *list, FMAIIOProvider *module, const gchar *id )
{
GList *merged;
NAIOProvider *object;
@@ -584,7 +584,7 @@ peek_provider_by_id( const GList *providers, const gchar *id )
* module may be NULL
*/
static NAIOProvider *
-io_provider_new( const NAPivot *pivot, NAIIOProvider *module, const gchar *id )
+io_provider_new( const NAPivot *pivot, FMAIIOProvider *module, const gchar *id )
{
NAIOProvider *object;
@@ -604,7 +604,7 @@ io_provider_new( const NAPivot *pivot, NAIIOProvider *module, const gchar *id )
* we connect the NAPivot callback to the 'item-changed' signal
*/
static void
-io_providers_list_set_module( const NAPivot *pivot, NAIOProvider *provider_object, NAIIOProvider
*provider_module )
+io_providers_list_set_module( const NAPivot *pivot, NAIOProvider *provider_object, FMAIIOProvider
*provider_module )
{
provider_object->private->provider = g_object_ref( provider_module );
@@ -641,7 +641,7 @@ na_io_provider_unref_io_providers_list( void )
* na_io_provider_get_id:
* @provider: this #NAIOProvider.
*
- * Returns: the internal id of this #NAIIOProvider, as a newly
+ * Returns: the internal id of this #FMAIIOProvider, as a newly
* allocated string which should be g_free() by the caller.
*/
gchar *
@@ -665,11 +665,11 @@ na_io_provider_get_id( const NAIOProvider *provider )
* na_io_provider_get_name:
* @provider: this #NAIOProvider.
*
- * Returns: the displayable name of this #NAIIOProvider, as a newly
+ * Returns: the displayable name of this #FMAIIOProvider, as a newly
* allocated string which should be g_free() by the caller.
*
* This function makes sure to never return %NULL. An empty string
- * may be returned if the NAIIOProvider is not present at runtime,
+ * may be returned if the FMAIIOProvider is not present at runtime,
* or does not implement the needed interface, or returns itself %NULL
* or an empty string.
*/
@@ -685,18 +685,18 @@ na_io_provider_get_name( const NAIOProvider *provider )
if( !provider->private->dispose_has_run ){
if( na_io_provider_is_available( provider ) &&
- NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->get_name ){
+ FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->get_name ){
g_free( name );
name = NULL;
- name = NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider
)->get_name( provider->private->provider );
+ name = FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider
)->get_name( provider->private->provider );
if( !name ){
- g_message( "%s: NAIIOProvider %s get_name() interface returns NULL",
thisfn, provider->private->id );
+ g_message( "%s: FMAIIOProvider %s get_name() interface returns NULL",
thisfn, provider->private->id );
name = g_strdup( "" );
}
} else {
- g_message( "%s: NAIIOProvider %s is not available or doesn't support get_name()
interface", thisfn, provider->private->id );
+ g_message( "%s: FMAIIOProvider %s is not available or doesn't support get_name()
interface", thisfn, provider->private->id );
}
}
@@ -707,7 +707,7 @@ na_io_provider_get_name( const NAIOProvider *provider )
* na_io_provider_is_available:
* @provider: the #NAIOProvider object.
*
- * Returns: %TRUE if the corresponding #NAIIOProvider module is available
+ * Returns: %TRUE if the corresponding #FMAIIOProvider module is available
* at runtime, %FALSE else.
*/
gboolean
@@ -721,7 +721,7 @@ na_io_provider_is_available( const NAIOProvider *provider )
if( !provider->private->dispose_has_run ){
- is_available = ( provider->private->provider && NA_IS_IIO_PROVIDER(
provider->private->provider ));
+ is_available = ( provider->private->provider && FMA_IS_IIO_PROVIDER(
provider->private->provider ));
}
return( is_available );
@@ -780,7 +780,7 @@ na_io_provider_is_conf_readable( const NAIOProvider *provider, const NAPivot *pi
* - whether this flag has been set as mandatory by an admin.
*
* This property does not say that an item can actually be written by this
- * NAIIOProvider module. See also is_willing_to() and is_able_to().
+ * FMAIIOProvider module. See also is_willing_to() and is_able_to().
*/
gboolean
na_io_provider_is_conf_writable( const NAIOProvider *provider, const NAPivot *pivot, gboolean *mandatory )
@@ -813,7 +813,7 @@ na_io_provider_is_finally_writable( const NAIOProvider *provider, guint *reason
gboolean is_writable;
if( reason ){
- *reason = NA_IIO_PROVIDER_STATUS_UNDETERMINED;
+ *reason = FMA_IIO_PROVIDER_STATUS_UNDETERMINED;
}
g_return_val_if_fail( NA_IS_IO_PROVIDER( provider ), FALSE );
@@ -968,35 +968,35 @@ is_finally_writable( const NAIOProvider *provider, const NAPivot *pivot, guint *
g_return_val_if_fail( reason, FALSE );
writable = FALSE;
- *reason = NA_IIO_PROVIDER_STATUS_UNAVAILABLE;
+ *reason = FMA_IIO_PROVIDER_STATUS_UNAVAILABLE;
- if( provider->private->provider && NA_IS_IIO_PROVIDER( provider->private->provider )){
+ if( provider->private->provider && FMA_IS_IIO_PROVIDER( provider->private->provider )){
writable = TRUE;
- *reason = NA_IIO_PROVIDER_STATUS_WRITABLE;
+ *reason = FMA_IIO_PROVIDER_STATUS_WRITABLE;
- if( !NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->is_willing_to_write ||
- !NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->is_able_to_write ||
- !NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->write_item ||
- !NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->delete_item ){
+ if( !FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->is_willing_to_write ||
+ !FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->is_able_to_write ||
+ !FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->write_item ||
+ !FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->delete_item ){
writable = FALSE;
- *reason = NA_IIO_PROVIDER_STATUS_INCOMPLETE_API;
- g_debug( "%s: provider_module=%p (%s), writable=False,
reason=NA_IIO_PROVIDER_STATUS_INCOMPLETE_API",
+ *reason = FMA_IIO_PROVIDER_STATUS_INCOMPLETE_API;
+ g_debug( "%s: provider_module=%p (%s), writable=False,
reason=FMA_IIO_PROVIDER_STATUS_INCOMPLETE_API",
thisfn, ( void * ) provider->private->provider,
provider->private->id );
- } else if( !NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider
)->is_willing_to_write( provider->private->provider )){
+ } else if( !FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider
)->is_willing_to_write( provider->private->provider )){
writable = FALSE;
- *reason = NA_IIO_PROVIDER_STATUS_NOT_WILLING_TO;
- g_debug( "%s: provider_module=%p (%s), writable=False,
reason=NA_IIO_PROVIDER_STATUS_NOT_WILLING_TO",
+ *reason = FMA_IIO_PROVIDER_STATUS_NOT_WILLING_TO;
+ g_debug( "%s: provider_module=%p (%s), writable=False,
reason=FMA_IIO_PROVIDER_STATUS_NOT_WILLING_TO",
thisfn, ( void * ) provider->private->provider,
provider->private->id );
- } else if( !NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->is_able_to_write(
provider->private->provider )){
+ } else if( !FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->is_able_to_write(
provider->private->provider )){
writable = FALSE;
- *reason = NA_IIO_PROVIDER_STATUS_NOT_ABLE_TO;
- g_debug( "%s: provider_module=%p (%s), writable=False,
reason=NA_IIO_PROVIDER_STATUS_NOT_ABLE_TO",
+ *reason = FMA_IIO_PROVIDER_STATUS_NOT_ABLE_TO;
+ g_debug( "%s: provider_module=%p (%s), writable=False,
reason=FMA_IIO_PROVIDER_STATUS_NOT_ABLE_TO",
thisfn, ( void * ) provider->private->provider,
provider->private->id );
} else {
@@ -1004,11 +1004,11 @@ is_finally_writable( const NAIOProvider *provider, const NAPivot *pivot, guint *
if( !is_writable ){
writable = FALSE;
if( mandatory ){
- *reason = NA_IIO_PROVIDER_STATUS_LOCKED_BY_ADMIN;
+ *reason = FMA_IIO_PROVIDER_STATUS_LOCKED_BY_ADMIN;
} else {
- *reason = NA_IIO_PROVIDER_STATUS_LOCKED_BY_USER;
+ *reason = FMA_IIO_PROVIDER_STATUS_LOCKED_BY_USER;
}
- g_debug( "%s: provider_module=%p (%s), writable=False,
reason=NA_IIO_PROVIDER_STATUS_LOCKED_BY_someone, mandatory=%s",
+ g_debug( "%s: provider_module=%p (%s), writable=False,
reason=FMA_IIO_PROVIDER_STATUS_LOCKED_BY_someone, mandatory=%s",
thisfn, ( void * ) provider->private->provider,
provider->private->id,
mandatory ? "True":"False" );
}
@@ -1107,7 +1107,7 @@ load_items_get_merged_list( const NAPivot *pivot, guint loadable_set, GSList **m
const GList *ip;
GList *merged, *items, *it;
const NAIOProvider *provider_object;
- const NAIIOProvider *provider_module;
+ const FMAIIOProvider *provider_module;
merged = NULL;
providers = na_io_provider_get_io_providers_list( pivot );
@@ -1117,10 +1117,10 @@ load_items_get_merged_list( const NAPivot *pivot, guint loadable_set, GSList **m
provider_module = provider_object->private->provider;
if( provider_module &&
- NA_IIO_PROVIDER_GET_INTERFACE( provider_module )->read_items &&
+ FMA_IIO_PROVIDER_GET_INTERFACE( provider_module )->read_items &&
na_io_provider_is_conf_readable( provider_object, pivot, NULL )){
- items = NA_IIO_PROVIDER_GET_INTERFACE( provider_module )->read_items(
provider_module, messages );
+ items = FMA_IIO_PROVIDER_GET_INTERFACE( provider_module )->read_items(
provider_module, messages );
for( it = items ; it ; it = it->next ){
na_object_set_provider( it->data, provider_object );
@@ -1236,7 +1236,7 @@ peek_item_by_id_compare( const NAObject *obj, const gchar *id )
*
* Writes an @item to the storage subsystem.
*
- * Returns: the NAIIOProvider return code.
+ * Returns: the FMAIIOProvider return code.
*
* #NAPivot class, which should be the only caller of this function,
* has already check that this item is writable, i.e. that all conditions
@@ -1254,16 +1254,16 @@ na_io_provider_write_item( const NAIOProvider *provider, const NAObjectItem *ite
( void * ) item, G_OBJECT_TYPE_NAME( item ),
( void * ) messages );
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
g_return_val_if_fail( NA_IS_IO_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), ret );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider->private->provider ), ret );
- g_return_val_if_fail( NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->write_item, ret );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider->private->provider ), ret );
+ g_return_val_if_fail( FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->write_item, ret
);
- ret = NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->write_item(
provider->private->provider, item, messages );
+ ret = FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->write_item(
provider->private->provider, item, messages );
- if( ret == NA_IIO_PROVIDER_CODE_OK ){
+ if( ret == FMA_IIO_PROVIDER_CODE_OK ){
na_object_set_provider( item, provider );
}
@@ -1278,7 +1278,7 @@ na_io_provider_write_item( const NAIOProvider *provider, const NAObjectItem *ite
*
* Deletes an item (action or menu) from the storage subsystem.
*
- * Returns: the NAIIOProvider return code.
+ * Returns: the FMAIIOProvider return code.
*/
guint
na_io_provider_delete_item( const NAIOProvider *provider, const NAObjectItem *item, GSList **messages )
@@ -1291,14 +1291,14 @@ na_io_provider_delete_item( const NAIOProvider *provider, const NAObjectItem *it
( void * ) item, G_OBJECT_TYPE_NAME( item ),
( void * ) messages );
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
g_return_val_if_fail( NA_IS_IO_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), ret );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider->private->provider ), ret );
- g_return_val_if_fail( NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->delete_item, ret
);
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider->private->provider ), ret );
+ g_return_val_if_fail( FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->delete_item, ret
);
- ret = NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->delete_item(
provider->private->provider, item, messages );
+ ret = FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->delete_item(
provider->private->provider, item, messages );
return( ret );
}
@@ -1312,7 +1312,7 @@ na_io_provider_delete_item( const NAIOProvider *provider, const NAObjectItem *it
*
* Duplicates provider data (if any) from @source to @dest.
*
- * Returns: the NAIIOProvider return code.
+ * Returns: the FMAIIOProvider return code.
*/
guint
na_io_provider_duplicate_data( const NAIOProvider *provider, NAObjectItem *dest, const NAObjectItem *source,
GSList **messages )
@@ -1327,19 +1327,19 @@ na_io_provider_duplicate_data( const NAIOProvider *provider, NAObjectItem *dest,
( void * ) source, G_OBJECT_TYPE_NAME( source ),
( void * ) messages );
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
g_return_val_if_fail( NA_IS_IO_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( dest ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( source ), ret );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider->private->provider ), ret );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider->private->provider ), ret );
na_object_set_provider_data( dest, NULL );
provider_data = na_object_get_provider_data( source );
if( provider_data &&
- NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->duplicate_data ){
- ret = NA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->duplicate_data(
provider->private->provider, dest, source, messages );
+ FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->duplicate_data ){
+ ret = FMA_IIO_PROVIDER_GET_INTERFACE( provider->private->provider )->duplicate_data(
provider->private->provider, dest, source, messages );
}
return( ret );
@@ -1361,39 +1361,39 @@ na_io_provider_get_readonly_tooltip( guint reason )
switch( reason ){
/* item is writable, so tooltip is empty */
- case NA_IIO_PROVIDER_STATUS_WRITABLE:
+ case FMA_IIO_PROVIDER_STATUS_WRITABLE:
tooltip = g_strdup( "" );
break;
- case NA_IIO_PROVIDER_STATUS_UNAVAILABLE:
+ case FMA_IIO_PROVIDER_STATUS_UNAVAILABLE:
tooltip = g_strdup( _( "Unavailable I/O provider." ));
break;
- case NA_IIO_PROVIDER_STATUS_INCOMPLETE_API:
+ case FMA_IIO_PROVIDER_STATUS_INCOMPLETE_API:
tooltip = g_strdup( _( "I/O provider implementation lacks of required API." ));
break;
- case NA_IIO_PROVIDER_STATUS_NOT_WILLING_TO:
+ case FMA_IIO_PROVIDER_STATUS_NOT_WILLING_TO:
tooltip = g_strdup( _( "I/O provider is not willing to write." ));
break;
- case NA_IIO_PROVIDER_STATUS_NOT_ABLE_TO:
+ case FMA_IIO_PROVIDER_STATUS_NOT_ABLE_TO:
tooltip = g_strdup( _( "I/O provider announces itself as unable to write." ));
break;
- case NA_IIO_PROVIDER_STATUS_LOCKED_BY_ADMIN:
+ case FMA_IIO_PROVIDER_STATUS_LOCKED_BY_ADMIN:
tooltip = g_strdup( _( "I/O provider has been locked down by an administrator." ));
break;
- case NA_IIO_PROVIDER_STATUS_LOCKED_BY_USER:
+ case FMA_IIO_PROVIDER_STATUS_LOCKED_BY_USER:
tooltip = g_strdup( _( "I/O provider has been locked down by the user." ));
break;
- case NA_IIO_PROVIDER_STATUS_ITEM_READONLY:
+ case FMA_IIO_PROVIDER_STATUS_ITEM_READONLY:
tooltip = g_strdup( _( "Item is read-only." ));
break;
- case NA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND:
+ case FMA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND:
tooltip = g_strdup( _( "No writable I/O provider found." ));
break;
@@ -1421,27 +1421,27 @@ na_io_provider_get_return_code_label( guint code )
label = NULL;
switch( code ){
- case NA_IIO_PROVIDER_CODE_OK:
+ case FMA_IIO_PROVIDER_CODE_OK:
label = g_strdup( _( "OK." ));
break;
- case NA_IIO_PROVIDER_CODE_PROGRAM_ERROR:
+ case FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR:
label = g_strdup_printf( _( "Program flow error.\n%s" ), st_enter_bug );
break;
- case NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN:
+ case FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN:
label = g_strdup( _( "The I/O provider is not willing to do that." ));
break;
- case NA_IIO_PROVIDER_CODE_WRITE_ERROR:
+ case FMA_IIO_PROVIDER_CODE_WRITE_ERROR:
label = g_strdup( _( "Write error in I/O provider." ));
break;
- case NA_IIO_PROVIDER_CODE_DELETE_SCHEMAS_ERROR:
+ case FMA_IIO_PROVIDER_CODE_DELETE_SCHEMAS_ERROR:
label = g_strdup( _( "Unable to delete GConf schemas." ));
break;
- case NA_IIO_PROVIDER_CODE_DELETE_CONFIG_ERROR:
+ case FMA_IIO_PROVIDER_CODE_DELETE_CONFIG_ERROR:
label = g_strdup( _( "Unable to delete configuration." ));
break;
diff --git a/src/core/na-io-provider.h b/src/core/na-io-provider.h
index 689a38f..361e5d3 100644
--- a/src/core/na-io-provider.h
+++ b/src/core/na-io-provider.h
@@ -35,12 +35,12 @@
* @include: core/na-io-provider.h
*
* #NAIOProvider is the FileManager-Actions class which is used to manage
- * external I/O Providers which implement #NAIIOProvider interface. Each
- * #NAIOProvider objects may (or not) encapsulates one #NAIIOProvider
+ * external I/O Providers which implement #FMAIIOProvider interface. Each
+ * #NAIOProvider objects may (or not) encapsulates one #FMAIIOProvider
* provider.
*
* Internal FileManager-Actions code should never directly call a
- * #NAIIOProvider interface method, but rather should call the
+ * #FMAIIOProvider interface method, but rather should call the
* corresponding NAIOProvider class method.
*
* Two preferences are used for each i/o provider:
@@ -88,8 +88,8 @@ typedef struct {
}
NAIOProviderClass;
-/* signal sent from a NAIIOProvider
- * via the na_iio_provider_item_changed() function
+/* signal sent from a FMAIIOProvider
+ * via the fma_iio_provider_item_changed() function
*/
#define IO_PROVIDER_SIGNAL_ITEM_CHANGED "io-provider-item-changed"
diff --git a/src/core/na-module.h b/src/core/na-module.h
index ce5d9db..6e99b91 100644
--- a/src/core/na-module.h
+++ b/src/core/na-module.h
@@ -57,7 +57,7 @@
* returns the type of GObjects implemented in the plugin
* - NAPivot dynamically instantiates a GObject for each returned GType.
*
- * After that, when NAPivot wants to access, say to NAIIOProvider
+ * After that, when NAPivot wants to access, say to FMAIIOProvider
* interfaces, it asks each module for its list of objects which implement
* this given interface.
* Interface API is then called against the returned GObject.
diff --git a/src/core/na-object-action.c b/src/core/na-object-action.c
index 17b71d6..6adcaa4 100644
--- a/src/core/na-object-action.c
+++ b/src/core/na-object-action.c
@@ -37,7 +37,7 @@
#include <stdlib.h>
#include <api/fma-core-utils.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/na-object-api.h>
#include "na-factory-provider.h"
@@ -418,7 +418,7 @@ ifactory_object_write_start( FMAIFactoryObject *instance, const FMAIFactoryProvi
{
na_object_item_rebuild_children_slist( NA_OBJECT_ITEM( instance ));
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
static guint
@@ -426,7 +426,7 @@ ifactory_object_write_done( FMAIFactoryObject *instance, const FMAIFactoryProvid
{
guint code;
- g_return_val_if_fail( NA_IS_OBJECT_ACTION( instance ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( NA_IS_OBJECT_ACTION( instance ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
code = write_done_write_profiles( instance, writer, writer_data, messages );
@@ -538,10 +538,10 @@ write_done_write_profiles( FMAIFactoryObject *instance, const FMAIFactoryProvide
GSList *children_slist, *ic;
NAObjectProfile *profile;
- code = NA_IIO_PROVIDER_CODE_OK;
+ code = FMA_IIO_PROVIDER_CODE_OK;
children_slist = na_object_get_items_slist( instance );
- for( ic = children_slist ; ic && code == NA_IIO_PROVIDER_CODE_OK ; ic = ic->next ){
+ for( ic = children_slist ; ic && code == FMA_IIO_PROVIDER_CODE_OK ; ic = ic->next ){
profile = NA_OBJECT_PROFILE( na_object_get_item( instance, ic->data ));
if( profile ){
diff --git a/src/core/na-object-item-factory.c b/src/core/na-object-item-factory.c
index a7dfd01..11c9c77 100644
--- a/src/core/na-object-item-factory.c
+++ b/src/core/na-object-item-factory.c
@@ -311,7 +311,7 @@ FMADataDef data_def_item [] = {
NULL },
/* dynamic data, so non readable / non writable
- * must be set by the NAIIOProvider when reading the item
+ * must be set by the FMAIIOProvider when reading the item
*/
{ FMAFO_DATA_READONLY,
FALSE,
@@ -365,8 +365,8 @@ FMADataDef data_def_item [] = {
NULL },
/* dynamic data, so non readable / non writable (but has property)
- * is left at the NAIIOProvider disposition
- * not copyable as directly duplicated by NAIIOProvider interface
+ * is left at the FMAIIOProvider disposition
+ * not copyable as directly duplicated by FMAIIOProvider interface
* (see NAObjectItem::object_copy)
*/
{ FMAFO_DATA_PROVIDER_DATA,
diff --git a/src/core/na-object-item.c b/src/core/na-object-item.c
index bfc03b2..fc41e1d 100644
--- a/src/core/na-object-item.c
+++ b/src/core/na-object-item.c
@@ -885,7 +885,7 @@ na_object_item_is_finally_writable( const NAObjectItem *item, guint *reason )
gboolean writable;
if( reason ){
- *reason = NA_IIO_PROVIDER_STATUS_UNDETERMINED;
+ *reason = FMA_IIO_PROVIDER_STATUS_UNDETERMINED;
}
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), FALSE );
diff --git a/src/core/na-object-menu.c b/src/core/na-object-menu.c
index cdb749b..b36c6f6 100644
--- a/src/core/na-object-menu.c
+++ b/src/core/na-object-menu.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-ifactory-object.h>
#include <api/na-object-api.h>
@@ -312,13 +312,13 @@ ifactory_object_write_start( FMAIFactoryObject *instance, const FMAIFactoryProvi
{
na_object_item_rebuild_children_slist( NA_OBJECT_ITEM( instance ));
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
static guint
ifactory_object_write_done( FMAIFactoryObject *instance, const FMAIFactoryProvider *writer, void
*writer_data, GSList **messages )
{
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
static void
diff --git a/src/core/na-object-profile.c b/src/core/na-object-profile.c
index 1e31048..923abd2 100644
--- a/src/core/na-object-profile.c
+++ b/src/core/na-object-profile.c
@@ -37,7 +37,7 @@
#include <libnautilus-extension/nautilus-file-info.h>
#include <api/fma-core-utils.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-ifactory-object.h>
#include <api/na-object-api.h>
@@ -368,7 +368,7 @@ ifactory_object_read_done( FMAIFactoryObject *instance, const FMAIFactoryProvide
static guint
ifactory_object_write_done( FMAIFactoryObject *instance, const FMAIFactoryProvider *writer, void
*writer_data, GSList **messages )
{
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
static void
diff --git a/src/core/na-pivot.c b/src/core/na-pivot.c
index 2dba6f1..51c29f0 100644
--- a/src/core/na-pivot.c
+++ b/src/core/na-pivot.c
@@ -100,7 +100,7 @@ static void instance_finalize( GObject *object );
static NAObjectItem *get_item_from_tree( const NAPivot *pivot, GList *tree, const gchar *id );
-/* NAIIOProvider management */
+/* FMAIIOProvider management */
static void on_items_changed_timeout( NAPivot *pivot );
GType
@@ -425,7 +425,7 @@ na_pivot_dump( const NAPivot *pivot )
* na_pivot_get_providers:
* @pivot: this #NAPivot instance.
* @type: the type of searched interface.
- * For now, we only have NA_TYPE_IIO_PROVIDER interfaces.
+ * For now, we only have FMA_TYPE_IIO_PROVIDER interfaces.
*
* Returns: a newly allocated list of providers of the required interface.
*
@@ -607,13 +607,13 @@ na_pivot_set_new_items( NAPivot *pivot, GList *items )
/*
* na_pivot_on_item_changed_handler:
- * @provider: the #NAIIOProvider which has emitted the signal.
+ * @provider: the #FMAIIOProvider which has emitted the signal.
* @pivot: this #NAPivot instance.
*
- * This handler is trigerred by #NAIIOProvider providers when an action
+ * This handler is trigerred by #FMAIIOProvider providers when an action
* is changed in their underlying storage subsystems.
*
- * The NAIIOProvider is supposed to have itself already summarized
+ * The FMAIIOProvider is supposed to have itself already summarized
* a minima its own burst of notifications.
*
* We don't care of updating our internal list with each and every
@@ -621,11 +621,11 @@ na_pivot_set_new_items( NAPivot *pivot, GList *items )
* serie, and then signal our consumers.
*/
void
-na_pivot_on_item_changed_handler( NAIIOProvider *provider, NAPivot *pivot )
+na_pivot_on_item_changed_handler( FMAIIOProvider *provider, NAPivot *pivot )
{
static const gchar *thisfn = "na_pivot_on_item_changed_handler";
- g_return_if_fail( NA_IS_IIO_PROVIDER( provider ));
+ g_return_if_fail( FMA_IS_IIO_PROVIDER( provider ));
g_return_if_fail( NA_IS_PIVOT( pivot ));
if( !pivot->private->dispose_has_run ){
diff --git a/src/core/na-pivot.h b/src/core/na-pivot.h
index e45d0ef..bc511dc 100644
--- a/src/core/na-pivot.h
+++ b/src/core/na-pivot.h
@@ -54,11 +54,11 @@
* to summarize its notifications messages;
*
* - At the end of this first stage of summarization, the I/O provider
- * should call the na_iio_provider_item_changed() function, which
+ * should call the fma_iio_provider_item_changed() function, which
* itself will emit the "io-provider-item-changed" signal.
* This is done so that an external I/O provider does not have to know
* anything with the signal name, but has only to take care of calling
- * a function of the NAIIOProvider API.
+ * a function of the FMAIIOProvider API.
*
* - The emitted signal is catched by na_pivot_on_item_changed_handler(),
* which was connected when the I/O provider plugin was associated with
@@ -72,7 +72,7 @@
* choose itself whether to reload items or not.
*/
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/na-object-api.h>
#include "na-settings.h"
@@ -114,7 +114,7 @@ GType na_pivot_get_type( void );
/* signals
*
* NAPivot acts as a 'summarizing' proxy for signals emitted by the
- * NAIIOProvider providers when they detect a modification in their
+ * FMAIIOProvider providers when they detect a modification in their
* underlying items storage subsystems.
*
* As several to many signals may be emitted when such a modification occurs,
@@ -138,7 +138,7 @@ NAPivot *na_pivot_new ( void );
void na_pivot_dump( const NAPivot *pivot );
/* Management of the plugins which claim to implement a FileManager-Actions interface.
- * As of 2.30, these may be NAIIOProvider, FMAIImporter or FMAIExporter
+ * As of 2.30, these may be FMAIIOProvider, FMAIImporter or FMAIExporter
*/
GList *na_pivot_get_providers ( const NAPivot *pivot, GType type );
void na_pivot_free_providers( GList *providers );
@@ -150,7 +150,7 @@ GList *na_pivot_get_items ( const NAPivot *pivot );
void na_pivot_load_items ( NAPivot *pivot );
void na_pivot_set_new_items( NAPivot *pivot, GList *tree );
-void na_pivot_on_item_changed_handler( NAIIOProvider *provider, NAPivot *pivot );
+void na_pivot_on_item_changed_handler( FMAIIOProvider *provider, NAPivot *pivot );
/* NAPivot properties and configuration
*/
diff --git a/src/core/na-updater.c b/src/core/na-updater.c
index fb452ed..2fea621 100644
--- a/src/core/na-updater.c
+++ b/src/core/na-updater.c
@@ -259,12 +259,12 @@ na_updater_check_item_writability_status( const NAUpdater *updater, const NAObje
g_return_if_fail( NA_IS_OBJECT_ITEM( item ));
writable = FALSE;
- reason = NA_IIO_PROVIDER_STATUS_UNDETERMINED;
+ reason = FMA_IIO_PROVIDER_STATUS_UNDETERMINED;
if( !updater->private->dispose_has_run ){
writable = TRUE;
- reason = NA_IIO_PROVIDER_STATUS_WRITABLE;
+ reason = FMA_IIO_PROVIDER_STATUS_WRITABLE;
/* Writability status of the item has been determined at load time
* (cf. e.g. io-desktop/nadp-reader.c:read_done_item_is_writable()).
@@ -276,7 +276,7 @@ na_updater_check_item_writability_status( const NAUpdater *updater, const NAObje
if( writable ){
if( na_object_is_readonly( item )){
writable = FALSE;
- reason = NA_IIO_PROVIDER_STATUS_ITEM_READONLY;
+ reason = FMA_IIO_PROVIDER_STATUS_ITEM_READONLY;
}
}
@@ -291,7 +291,7 @@ na_updater_check_item_writability_status( const NAUpdater *updater, const NAObje
provider = na_io_provider_find_writable_io_provider( NA_PIVOT( updater ));
if( !provider ){
writable = FALSE;
- reason = NA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND;
+ reason = FMA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND;
}
}
}
@@ -302,7 +302,7 @@ na_updater_check_item_writability_status( const NAUpdater *updater, const NAObje
parent = ( NAObjectItem * ) na_object_get_parent( item );
if( !parent ){
if( updater->private->is_level_zero_writable ){
- reason = NA_IIO_PROVIDER_STATUS_LEVEL_ZERO;
+ reason = FMA_IIO_PROVIDER_STATUS_LEVEL_ZERO;
}
}
}
@@ -551,14 +551,14 @@ set_writability_status( NAObjectItem *item, const NAUpdater *updater )
*
* Writes an item (an action or a menu).
*
- * Returns: the #NAIIOProvider return code.
+ * Returns: the #FMAIIOProvider return code.
*/
guint
na_updater_write_item( const NAUpdater *updater, NAObjectItem *item, GSList **messages )
{
guint ret;
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
g_return_val_if_fail( NA_IS_UPDATER( updater ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), ret );
@@ -570,7 +570,7 @@ na_updater_write_item( const NAUpdater *updater, NAObjectItem *item, GSList **me
if( !provider ){
provider = na_io_provider_find_writable_io_provider( NA_PIVOT( updater ));
- g_return_val_if_fail( provider, NA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND );
+ g_return_val_if_fail( provider, FMA_IIO_PROVIDER_STATUS_NO_PROVIDER_FOUND );
}
if( provider ){
@@ -590,7 +590,7 @@ na_updater_write_item( const NAUpdater *updater, NAObjectItem *item, GSList **me
*
* Deletes an item, action or menu, from the I/O storage subsystem.
*
- * Returns: the #NAIIOProvider return code.
+ * Returns: the #FMAIIOProvider return code.
*
* Note that a new item, not already written to an I/O subsystem,
* doesn't have any attached provider. We so do nothing and return OK...
@@ -601,11 +601,11 @@ na_updater_delete_item( const NAUpdater *updater, const NAObjectItem *item, GSLi
guint ret;
NAIOProvider *provider;
- g_return_val_if_fail( NA_IS_UPDATER( updater ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- g_return_val_if_fail( messages, NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( NA_IS_UPDATER( updater ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( messages, FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- ret = NA_IIO_PROVIDER_CODE_OK;
+ ret = FMA_IIO_PROVIDER_CODE_OK;
if( !updater->private->dispose_has_run ){
@@ -615,7 +615,7 @@ na_updater_delete_item( const NAUpdater *updater, const NAObjectItem *item, GSLi
* without having been ever saved
*/
if( provider ){
- g_return_val_if_fail( NA_IS_IO_PROVIDER( provider ),
NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( NA_IS_IO_PROVIDER( provider ),
FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
ret = na_io_provider_delete_item( provider, item, messages );
}
}
diff --git a/src/io-desktop/nadp-desktop-provider.c b/src/io-desktop/nadp-desktop-provider.c
index 2c6d14b..5e2072f 100644
--- a/src/io-desktop/nadp-desktop-provider.c
+++ b/src/io-desktop/nadp-desktop-provider.c
@@ -59,10 +59,10 @@ static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
-static void iio_provider_iface_init( NAIIOProviderInterface *iface );
-static gchar *iio_provider_get_id( const NAIIOProvider *provider );
-static gchar *iio_provider_get_name( const NAIIOProvider *provider );
-static guint iio_provider_get_version( const NAIIOProvider *provider );
+static void iio_provider_iface_init( FMAIIOProviderInterface *iface );
+static gchar *iio_provider_get_id( const FMAIIOProvider *provider );
+static gchar *iio_provider_get_name( const FMAIIOProvider *provider );
+static guint iio_provider_get_version( const FMAIIOProvider *provider );
static void ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface );
static guint ifactory_provider_get_version( const FMAIFactoryProvider *reader );
@@ -129,7 +129,7 @@ nadp_desktop_provider_register_type( GTypeModule *module )
st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NadpDesktopProvider", &info, 0
);
- g_type_module_add_interface( module, st_module_type, NA_TYPE_IIO_PROVIDER, &iio_provider_iface_info );
+ g_type_module_add_interface( module, st_module_type, FMA_TYPE_IIO_PROVIDER, &iio_provider_iface_info
);
g_type_module_add_interface( module, st_module_type, FMA_TYPE_IFACTORY_PROVIDER,
&ifactory_provider_iface_info );
@@ -224,7 +224,7 @@ instance_finalize( GObject *object )
}
static void
-iio_provider_iface_init( NAIIOProviderInterface *iface )
+iio_provider_iface_init( FMAIIOProviderInterface *iface )
{
static const gchar *thisfn = "nadp_desktop_provider_iio_provider_iface_init";
@@ -242,19 +242,19 @@ iio_provider_iface_init( NAIIOProviderInterface *iface )
}
static guint
-iio_provider_get_version( const NAIIOProvider *provider )
+iio_provider_get_version( const FMAIIOProvider *provider )
{
return( 1 );
}
static gchar *
-iio_provider_get_id( const NAIIOProvider *provider )
+iio_provider_get_id( const FMAIIOProvider *provider )
{
return( g_strdup( PROVIDER_ID ));
}
static gchar *
-iio_provider_get_name( const NAIIOProvider *provider )
+iio_provider_get_name( const FMAIIOProvider *provider )
{
return( g_strdup( _( "FileManager-Actions Desktop I/O Provider" )));
}
@@ -400,10 +400,10 @@ on_monitor_timeout( NadpDesktopProvider *provider )
static const gchar *thisfn = "nadp_desktop_provider_on_monitor_timeout";
/* last individual notification is older that the st_burst_timeout
- * so triggers the NAIIOProvider interface and destroys this timeout
+ * so triggers the FMAIIOProvider interface and destroys this timeout
*/
- g_debug( "%s: triggering NAIIOProvider interface for provider=%p (%s)",
+ g_debug( "%s: triggering FMAIIOProvider interface for provider=%p (%s)",
thisfn, ( void * ) provider, G_OBJECT_TYPE_NAME( provider ));
- na_iio_provider_item_changed( NA_IIO_PROVIDER( provider ));
+ fma_iio_provider_item_changed( FMA_IIO_PROVIDER( provider ));
}
diff --git a/src/io-desktop/nadp-desktop-provider.h b/src/io-desktop/nadp-desktop-provider.h
index 1b1dd27..2f01c41 100644
--- a/src/io-desktop/nadp-desktop-provider.h
+++ b/src/io-desktop/nadp-desktop-provider.h
@@ -36,8 +36,8 @@
* @include: nadp-desktop-provider.h
*
* This class manages .desktop files I/O storage subsystem, or, in
- * other words, .desktop files as NAIIOProvider providers. As this, it
- * should only be used through the NAIIOProvider interface.
+ * other words, .desktop files as FMAIIOProvider providers. As this, it
+ * should only be used through the FMAIIOProvider interface.
*/
#include <api/na-object-item.h>
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index aef76b0..dd830b1 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -82,10 +82,10 @@ static void read_done_action_load_profile( const FMAIFactoryProvide
/*
* Returns an unordered list of FMAIFactoryObject-derived objects
*
- * This is implementation of NAIIOProvider::read_items method
+ * This is implementation of FMAIIOProvider::read_items method
*/
GList *
-nadp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages )
+nadp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages )
{
static const gchar *thisfn = "nadp_iio_provider_read_items";
GList *items;
@@ -95,7 +95,7 @@ nadp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages )
g_debug( "%s: provider=%p (%s), messages=%p",
thisfn, ( void * ) provider, G_OBJECT_TYPE_NAME( provider ), ( void * ) messages );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), NULL );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), NULL );
items = NULL;
nadp_desktop_provider_release_monitors( NADP_DESKTOP_PROVIDER( provider ));
diff --git a/src/io-desktop/nadp-reader.h b/src/io-desktop/nadp-reader.h
index 3edc8cd..00ca927 100644
--- a/src/io-desktop/nadp-reader.h
+++ b/src/io-desktop/nadp-reader.h
@@ -30,13 +30,13 @@
#ifndef __NADP_READER_H__
#define __NADP_READER_H__
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-iimporter.h>
#include <api/fma-ifactory-provider.h>
G_BEGIN_DECLS
-GList *nadp_iio_provider_read_items ( const NAIIOProvider *provider, GSList **messages );
+GList *nadp_iio_provider_read_items ( const FMAIIOProvider *provider, GSList **messages );
guint nadp_reader_iimporter_import_from_uri ( const FMAIImporter *instance, void *parms_ptr );
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 17fbc9c..52f7f6a 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -63,7 +63,7 @@ static ExportFormatFn st_export_format_fn[] = {
{ NULL }
};
-static guint write_item( const NAIIOProvider *provider, const NAObjectItem *item, NadpDesktopFile
*ndf, GSList **messages );
+static guint write_item( const FMAIIOProvider *provider, const NAObjectItem *item, NadpDesktopFile
*ndf, GSList **messages );
static void desktop_weak_notify( NadpDesktopFile *ndf, GObject *item );
@@ -77,10 +77,10 @@ static ExportFormatFn *find_export_format_fn_from_quark( GQuark format );
#endif
/*
- * This is implementation of NAIIOProvider::is_willing_to_write method
+ * This is implementation of FMAIIOProvider::is_willing_to_write method
*/
gboolean
-nadp_iio_provider_is_willing_to_write( const NAIIOProvider *provider )
+nadp_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
{
return( TRUE );
}
@@ -89,10 +89,10 @@ nadp_iio_provider_is_willing_to_write( const NAIIOProvider *provider )
* NadpDesktopProvider is able to write if user data dir exists (or
* can be created) and is writable
*
- * This is implementation of NAIIOProvider::is_able_to_write method
+ * This is implementation of FMAIIOProvider::is_able_to_write method
*/
gboolean
-nadp_iio_provider_is_able_to_write( const NAIIOProvider *provider )
+nadp_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
{
static const gchar *thisfn = "nadp_writer_iio_provider_is_able_to_write";
gboolean able_to;
@@ -121,10 +121,10 @@ nadp_iio_provider_is_able_to_write( const NAIIOProvider *provider )
}
/*
- * This is implementation of NAIIOProvider::write_item method
+ * This is implementation of FMAIIOProvider::write_item method
*/
guint
-nadp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem *item, GSList **messages )
+nadp_iio_provider_write_item( const FMAIIOProvider *provider, const NAObjectItem *item, GSList **messages )
{
static const gchar *thisfn = "nadp_iio_provider_write_item";
guint ret;
@@ -137,7 +137,7 @@ nadp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem
gchar *fulldir;
gboolean dir_ok;
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
g_return_val_if_fail( NADP_IS_DESKTOP_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), ret );
@@ -205,7 +205,7 @@ nadp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem
* -> as a side effect, we lose comments inside of these groups :(
*/
static guint
-write_item( const NAIIOProvider *provider, const NAObjectItem *item, NadpDesktopFile *ndf, GSList **messages
)
+write_item( const FMAIIOProvider *provider, const NAObjectItem *item, NadpDesktopFile *ndf, GSList
**messages )
{
static const gchar *thisfn = "nadp_iio_provider_write_item";
guint ret;
@@ -218,9 +218,9 @@ write_item( const NAIIOProvider *provider, const NAObjectItem *item, NadpDesktop
( void * ) ndf,
( void * ) messages );
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), ret );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), ret );
g_return_val_if_fail( NADP_IS_DESKTOP_PROVIDER( provider ), ret );
g_return_val_if_fail( FMA_IS_IFACTORY_PROVIDER( provider ), ret );
@@ -232,22 +232,22 @@ write_item( const NAIIOProvider *provider, const NAObjectItem *item, NadpDesktop
self = NADP_DESKTOP_PROVIDER( provider );
if( self->private->dispose_has_run ){
- return( NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
+ return( FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
}
- ret = NA_IIO_PROVIDER_CODE_OK;
+ ret = FMA_IIO_PROVIDER_CODE_OK;
fma_ifactory_provider_write_item( FMA_IFACTORY_PROVIDER( provider ), ndf, FMA_IFACTORY_OBJECT( item
), messages );
if( !nadp_desktop_file_write( ndf )){
- ret = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_WRITE_ERROR;
}
return( ret );
}
guint
-nadp_iio_provider_delete_item( const NAIIOProvider *provider, const NAObjectItem *item, GSList **messages )
+nadp_iio_provider_delete_item( const FMAIIOProvider *provider, const NAObjectItem *item, GSList **messages )
{
static const gchar *thisfn = "nadp_iio_provider_delete_item";
guint ret;
@@ -261,16 +261,16 @@ nadp_iio_provider_delete_item( const NAIIOProvider *provider, const NAObjectItem
( void * ) item, G_OBJECT_TYPE_NAME( item ),
( void * ) messages );
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), ret );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), ret );
g_return_val_if_fail( NADP_IS_DESKTOP_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), ret );
self = NADP_DESKTOP_PROVIDER( provider );
if( self->private->dispose_has_run ){
- return( NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
+ return( FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
}
ndf = ( NadpDesktopFile * ) na_object_get_provider_data( item );
@@ -279,13 +279,13 @@ nadp_iio_provider_delete_item( const NAIIOProvider *provider, const NAObjectItem
g_return_val_if_fail( NADP_IS_DESKTOP_FILE( ndf ), ret );
uri = nadp_desktop_file_get_key_file_uri( ndf );
if( nadp_utils_uri_delete( uri )){
- ret = NA_IIO_PROVIDER_CODE_OK;
+ ret = FMA_IIO_PROVIDER_CODE_OK;
}
g_free( uri );
} else {
g_warning( "%s: NadpDesktopFile is null", thisfn );
- ret = NA_IIO_PROVIDER_CODE_OK;
+ ret = FMA_IIO_PROVIDER_CODE_OK;
}
return( ret );
@@ -304,12 +304,12 @@ desktop_weak_notify( NadpDesktopFile *ndf, GObject *item )
}
/*
- * Implementation of NAIIOProvider::duplicate_data
+ * Implementation of FMAIIOProvider::duplicate_data
* Add a ref on NadpDesktopFile data, so that unreffing origin object in NACT
* does not invalid duplicated pointer
*/
guint
-nadp_iio_provider_duplicate_data( const NAIIOProvider *provider, NAObjectItem *dest, const NAObjectItem
*source, GSList **messages )
+nadp_iio_provider_duplicate_data( const FMAIIOProvider *provider, NAObjectItem *dest, const NAObjectItem
*source, GSList **messages )
{
static const gchar *thisfn = "nadp_iio_provider_duplicate_data";
guint ret;
@@ -323,9 +323,9 @@ nadp_iio_provider_duplicate_data( const NAIIOProvider *provider, NAObjectItem *d
( void * ) source, G_OBJECT_TYPE_NAME( source ),
( void * ) messages );
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), ret );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), ret );
g_return_val_if_fail( NADP_IS_DESKTOP_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( dest ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( source ), ret );
@@ -333,7 +333,7 @@ nadp_iio_provider_duplicate_data( const NAIIOProvider *provider, NAObjectItem *d
self = NADP_DESKTOP_PROVIDER( provider );
if( self->private->dispose_has_run ){
- return( NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
+ return( FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
}
ndf = ( NadpDesktopFile * ) na_object_get_provider_data( source );
@@ -341,7 +341,7 @@ nadp_iio_provider_duplicate_data( const NAIIOProvider *provider, NAObjectItem *d
na_object_set_provider_data( dest, g_object_ref( ndf ));
g_object_weak_ref( G_OBJECT( dest ), ( GWeakNotify ) desktop_weak_notify, ndf );
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
/**
@@ -388,7 +388,7 @@ nadp_writer_iexporter_export_to_buffer( const FMAIExporter *instance, FMAIExport
ndf = nadp_desktop_file_new();
write_code = fma_ifactory_provider_write_item( FMA_IFACTORY_PROVIDER( instance ),
ndf, FMA_IFACTORY_OBJECT( parms->exported ), &parms->messages );
- if( write_code != NA_IIO_PROVIDER_CODE_OK ){
+ if( write_code != FMA_IIO_PROVIDER_CODE_OK ){
code = FMA_IEXPORTER_CODE_ERROR;
} else {
@@ -456,7 +456,7 @@ nadp_writer_iexporter_export_to_file( const FMAIExporter *instance, FMAIExporter
ndf = nadp_desktop_file_new_for_write( dest_path );
write_code = fma_ifactory_provider_write_item( FMA_IFACTORY_PROVIDER( instance ),
ndf, FMA_IFACTORY_OBJECT( parms->exported ), &parms->messages );
- if( write_code != NA_IIO_PROVIDER_CODE_OK ){
+ if( write_code != FMA_IIO_PROVIDER_CODE_OK ){
code = FMA_IEXPORTER_CODE_ERROR;
} else if( !nadp_desktop_file_write( ndf )){
@@ -480,7 +480,7 @@ nadp_writer_ifactory_provider_write_start( const FMAIFactoryProvider *provider,
write_start_write_type( NADP_DESKTOP_FILE( writer_data ), NA_OBJECT_ITEM( object ));
}
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
static void
@@ -514,10 +514,10 @@ nadp_writer_ifactory_provider_write_data(
guint uint_value;
gchar *parms, *tmp;
- g_return_val_if_fail( NADP_IS_DESKTOP_FILE( writer_data ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( NADP_IS_DESKTOP_FILE( writer_data ), FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
/*g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));*/
- code = NA_IIO_PROVIDER_CODE_OK;
+ code = FMA_IIO_PROVIDER_CODE_OK;
ndf = NADP_DESKTOP_FILE( writer_data );
def = fma_data_boxed_get_data_def( boxed );
@@ -575,7 +575,7 @@ nadp_writer_ifactory_provider_write_data(
default:
g_warning( "%s: unknown type=%u for %s", thisfn, def->type, def->name
);
- code = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ code = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
}
} else {
@@ -596,7 +596,7 @@ nadp_writer_ifactory_provider_write_done( const FMAIFactoryProvider *provider, v
write_done_write_subitems_list( NADP_DESKTOP_FILE( writer_data ), NA_OBJECT_ITEM( object ));
}
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
static void
diff --git a/src/io-desktop/nadp-writer.h b/src/io-desktop/nadp-writer.h
index f2adb3e..c553336 100644
--- a/src/io-desktop/nadp-writer.h
+++ b/src/io-desktop/nadp-writer.h
@@ -30,18 +30,18 @@
#ifndef __NADP_WRITER_H__
#define __NADP_WRITER_H__
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-iexporter.h>
#include <api/fma-ifactory-provider.h>
G_BEGIN_DECLS
-gboolean nadp_iio_provider_is_willing_to_write ( const NAIIOProvider *provider );
-gboolean nadp_iio_provider_is_able_to_write ( const NAIIOProvider *provider );
+gboolean nadp_iio_provider_is_willing_to_write ( const FMAIIOProvider *provider );
+gboolean nadp_iio_provider_is_able_to_write ( const FMAIIOProvider *provider );
-guint nadp_iio_provider_write_item ( const NAIIOProvider *provider, const NAObjectItem *item,
GSList **messages );
-guint nadp_iio_provider_delete_item ( const NAIIOProvider *provider, const NAObjectItem *item,
GSList **messages );
-guint nadp_iio_provider_duplicate_data ( const NAIIOProvider *provider, NAObjectItem *dest, const
NAObjectItem *source, GSList **messages );
+guint nadp_iio_provider_write_item ( const FMAIIOProvider *provider, const NAObjectItem *item,
GSList **messages );
+guint nadp_iio_provider_delete_item ( const FMAIIOProvider *provider, const NAObjectItem *item,
GSList **messages );
+guint nadp_iio_provider_duplicate_data ( const FMAIIOProvider *provider, NAObjectItem *dest, const
NAObjectItem *source, GSList **messages );
guint nadp_writer_iexporter_export_to_buffer( const FMAIExporter *instance, FMAIExporterBufferParmsv2
*parms );
guint nadp_writer_iexporter_export_to_file ( const FMAIExporter *instance, FMAIExporterFileParmsv2
*parms );
diff --git a/src/io-gconf/nagp-gconf-provider.c b/src/io-gconf/nagp-gconf-provider.c
index aa98a3c..a4a0a23 100644
--- a/src/io-gconf/nagp-gconf-provider.c
+++ b/src/io-gconf/nagp-gconf-provider.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <api/fma-ifactory-provider.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-gconf-monitor.h>
#include "nagp-gconf-provider.h"
@@ -61,10 +61,10 @@ static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
-static void iio_provider_iface_init( NAIIOProviderInterface *iface );
-static gchar *iio_provider_get_id( const NAIIOProvider *provider );
-static gchar *iio_provider_get_name( const NAIIOProvider *provider );
-static guint iio_provider_get_version( const NAIIOProvider *provider );
+static void iio_provider_iface_init( FMAIIOProviderInterface *iface );
+static gchar *iio_provider_get_id( const FMAIIOProvider *provider );
+static gchar *iio_provider_get_name( const FMAIIOProvider *provider );
+static guint iio_provider_get_version( const FMAIIOProvider *provider );
static void ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface );
static guint ifactory_provider_get_version( const FMAIFactoryProvider *provider );
@@ -115,7 +115,7 @@ nagp_gconf_provider_register_type( GTypeModule *module )
st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NagpGConfProvider", &info, 0 );
- g_type_module_add_interface( module, st_module_type, NA_TYPE_IIO_PROVIDER, &iio_provider_iface_info );
+ g_type_module_add_interface( module, st_module_type, FMA_TYPE_IIO_PROVIDER, &iio_provider_iface_info
);
g_type_module_add_interface( module, st_module_type, FMA_TYPE_IFACTORY_PROVIDER,
&ifactory_provider_iface_info );
}
@@ -213,7 +213,7 @@ instance_finalize( GObject *object )
}
static void
-iio_provider_iface_init( NAIIOProviderInterface *iface )
+iio_provider_iface_init( FMAIIOProviderInterface *iface )
{
static const gchar *thisfn = "nagp_gconf_provider_iio_provider_iface_init";
@@ -236,19 +236,19 @@ iio_provider_iface_init( NAIIOProviderInterface *iface )
}
static gchar *
-iio_provider_get_id( const NAIIOProvider *provider )
+iio_provider_get_id( const FMAIIOProvider *provider )
{
return( g_strdup( "na-gconf" ));
}
static gchar *
-iio_provider_get_name( const NAIIOProvider *provider )
+iio_provider_get_name( const FMAIIOProvider *provider )
{
return( g_strdup( _( "FileManager-Actions GConf I/O Provider" )));
}
static guint
-iio_provider_get_version( const NAIIOProvider *provider )
+iio_provider_get_version( const FMAIIOProvider *provider )
{
return( 1 );
}
@@ -288,7 +288,7 @@ install_monitors( NagpGConfProvider *provider )
GList *list = NULL;
g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), NULL );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), NULL );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), NULL );
g_return_val_if_fail( !provider->private->dispose_has_run, NULL );
/* monitor the configurations/ directory which contains all menus,
@@ -336,14 +336,14 @@ install_monitors( NagpGConfProvider *provider )
* - first, GConf underlying subsystem advertises us, through the watch
* mechanism, of each and every modification ; this leads us to be
* triggered for each new/modified/deleted _entry_
- * - as we want trigger the NAIIOProvider interface only once for each
+ * - as we want trigger the FMAIIOProvider interface only once for each
* update operation (i.e. once for each flow of individual notifications),
* then we install a timer in order to wait for all
* entries have been modified
* - when a [burst_timeout] reasonable delay has elapsed without having
* received any new individual notification, then we can assume that
* we have reached the end of the flow and that we can now trigger
- * the NAIIOProvider interface
+ * the FMAIIOProvider interface
*
* Note that we used to try to send one notification per modified object.
* This cannot work as we are not sure at all that we will received
@@ -353,7 +353,7 @@ static void
config_path_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, NagpGConfProvider *provider )
{
g_return_if_fail( NAGP_IS_GCONF_PROVIDER( provider ));
- g_return_if_fail( NA_IS_IIO_PROVIDER( provider ));
+ g_return_if_fail( FMA_IS_IIO_PROVIDER( provider ));
if( !provider->private->dispose_has_run ){
@@ -391,12 +391,12 @@ config_path_changed_trigger_interface( NagpGConfProvider *provider )
}
/* last individual notification is older that the st_burst_timeout
- * so triggers the NAIIOProvider interface and destroys this timeout
+ * so triggers the FMAIIOProvider interface and destroys this timeout
*/
- g_debug( "%s: triggering NAIIOProvider interface for provider=%p (%s)",
+ g_debug( "%s: triggering FMAIIOProvider interface for provider=%p (%s)",
thisfn, ( void * ) provider, G_OBJECT_TYPE_NAME( provider ));
- na_iio_provider_item_changed( NA_IIO_PROVIDER( provider ));
+ fma_iio_provider_item_changed( FMA_IIO_PROVIDER( provider ));
provider->private->event_source_id = 0;
return( FALSE );
}
diff --git a/src/io-gconf/nagp-gconf-provider.h b/src/io-gconf/nagp-gconf-provider.h
index 0b316e6..a765f4a 100644
--- a/src/io-gconf/nagp-gconf-provider.h
+++ b/src/io-gconf/nagp-gconf-provider.h
@@ -36,11 +36,11 @@
* @include: na-gconf-provider.h
*
* This class manages the GConf I/O storage subsystem, or, in other words,
- * the GConf subsystem as an #NAIIOProvider. As this, it should only be
- * used through the #NAIIOProvider interface.
+ * the GConf subsystem as an #FMAIIOProvider. As this, it should only be
+ * used through the #FMAIIOProvider interface.
*
* #NagpGConfProvider uses #FMAGConfMonitor to watch at the configuration
- * tree. Modifications are notified to the #NAIIOProvider interface.
+ * tree. Modifications are notified to the #FMAIIOProvider interface.
*/
#include <glib-object.h>
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index 10ab971..b602e5a 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -36,7 +36,7 @@
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
#include <api/fma-ifactory-provider.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/na-object-api.h>
#include <api/fma-core-utils.h>
#include <api/fma-gconf-utils.h>
@@ -71,7 +71,7 @@ static gboolean is_key_writable( NagpGConfProvider *gconf, const gchar *key
* latest, version of these classes.
*/
GList *
-nagp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages )
+nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages )
{
static const gchar *thisfn = "nagp_reader_nagp_iio_provider_read_items";
NagpGConfProvider *self;
@@ -81,7 +81,7 @@ nagp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages )
g_debug( "%s: provider=%p, messages=%p", thisfn, ( void * ) provider, ( void * ) messages );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), NULL );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), NULL );
g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), NULL );
self = NAGP_GCONF_PROVIDER( provider );
@@ -120,7 +120,7 @@ read_item( NagpGConfProvider *provider, const gchar *path, GSList **messages )
g_debug( "%s: provider=%p, path=%s", thisfn, ( void * ) provider, path );
g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), NULL );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), NULL );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), NULL );
g_return_val_if_fail( !provider->private->dispose_has_run, NULL );
full_path = gconf_concat_dir_and_key( path, NAGP_ENTRY_TYPE );
diff --git a/src/io-gconf/nagp-reader.h b/src/io-gconf/nagp-reader.h
index 7a5501d..adc64bd 100644
--- a/src/io-gconf/nagp-reader.h
+++ b/src/io-gconf/nagp-reader.h
@@ -30,12 +30,12 @@
#ifndef __NAGP_READER_H__
#define __NAGP_READER_H__
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-ifactory-provider.h>
G_BEGIN_DECLS
-GList *nagp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages );
+GList *nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages );
void nagp_reader_read_start( const FMAIFactoryProvider *provider, void *reader_data, const
FMAIFactoryObject *object, GSList **messages );
FMADataBoxed *nagp_reader_read_data ( const FMAIFactoryProvider *provider, void *reader_data, const
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages );
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index bb2152b..8bbb55c 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -35,7 +35,7 @@
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-ifactory-provider.h>
#include <api/na-object-api.h>
#include <api/fma-core-utils.h>
@@ -51,10 +51,10 @@ static void write_start_write_version( NagpGConfProvider *provider, NAObjectItem
#endif
/*
- * API function: should only be called through NAIIOProvider interface
+ * API function: should only be called through FMAIIOProvider interface
*/
gboolean
-nagp_iio_provider_is_willing_to_write( const NAIIOProvider *provider )
+nagp_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
{
#ifdef NA_ENABLE_DEPRECATED
return( TRUE );
@@ -72,10 +72,10 @@ nagp_iio_provider_is_willing_to_write( const NAIIOProvider *provider )
* So, we try to write a 'foo' key somewhere: if it is ok, then the
* provider is supposed able to write...
*
- * API function: should only be called through NAIIOProvider interface
+ * API function: should only be called through FMAIIOProvider interface
*/
gboolean
-nagp_iio_provider_is_able_to_write( const NAIIOProvider *provider )
+nagp_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
{
#ifdef NA_ENABLE_DEPRECATED
static const gchar *thisfn = "nagp_iio_provider_is_able_to_write";
@@ -85,7 +85,7 @@ nagp_iio_provider_is_able_to_write( const NAIIOProvider *provider )
/*g_debug( "%s: provider=%p", thisfn, ( void * ) provider );*/
g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), FALSE );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), FALSE );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), FALSE );
self = NAGP_GCONF_PROVIDER( provider );
@@ -126,7 +126,7 @@ nagp_iio_provider_is_able_to_write( const NAIIOProvider *provider )
* before trying to write the new ones
*/
guint
-nagp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem *item, GSList **messages )
+nagp_iio_provider_write_item( const FMAIIOProvider *provider, const NAObjectItem *item, GSList **messages )
{
static const gchar *thisfn = "nagp_gconf_provider_iio_provider_write_item";
NagpGConfProvider *self;
@@ -138,21 +138,21 @@ nagp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem
( void * ) item, G_OBJECT_TYPE_NAME( item ),
( void * ) messages );
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), ret );
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), ret );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), ret );
self = NAGP_GCONF_PROVIDER( provider );
if( self->private->dispose_has_run ){
- return( NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
+ return( FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
}
ret = nagp_iio_provider_delete_item( provider, item, messages );
- if( ret == NA_IIO_PROVIDER_CODE_OK ){
+ if( ret == FMA_IIO_PROVIDER_CODE_OK ){
fma_ifactory_provider_write_item( FMA_IFACTORY_PROVIDER( provider ), NULL,
FMA_IFACTORY_OBJECT( item ), messages );
}
@@ -166,7 +166,7 @@ nagp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem
* cf. http://bugzilla.gnome.org/show_bug.cgi?id=325585
*/
guint
-nagp_iio_provider_delete_item( const NAIIOProvider *provider, const NAObjectItem *item, GSList **messages )
+nagp_iio_provider_delete_item( const FMAIIOProvider *provider, const NAObjectItem *item, GSList **messages )
{
static const gchar *thisfn = "nagp_gconf_provider_iio_provider_delete_item";
NagpGConfProvider *self;
@@ -180,26 +180,26 @@ nagp_iio_provider_delete_item( const NAIIOProvider *provider, const NAObjectItem
( void * ) item, G_OBJECT_TYPE_NAME( item ),
( void * ) messages );
- ret = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
- g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), ret );
+ g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), ret );
g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), ret );
self = NAGP_GCONF_PROVIDER( provider );
if( self->private->dispose_has_run ){
- return( NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
+ return( FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
}
- ret = NA_IIO_PROVIDER_CODE_OK;
+ ret = FMA_IIO_PROVIDER_CODE_OK;
uuid = na_object_get_id( NA_OBJECT( item ));
/* GCONF_UNSET_INCLUDING_SCHEMA_NAMES seems mean: including the name
* of the schemas which is embedded in the GConfEntry - this doesn't
* mean including the schemas themselves
*/
- if( ret == NA_IIO_PROVIDER_CODE_OK ){
+ if( ret == FMA_IIO_PROVIDER_CODE_OK ){
path = gconf_concat_dir_and_key( NAGP_CONFIGURATIONS_PATH, uuid );
gconf_client_recursive_unset( self->private->gconf, path, GCONF_UNSET_INCLUDING_SCHEMA_NAMES,
&error );
if( error ){
@@ -207,13 +207,13 @@ nagp_iio_provider_delete_item( const NAIIOProvider *provider, const NAObjectItem
*messages = g_slist_append( *messages, g_strdup( error->message ));
g_error_free( error );
error = NULL;
- ret = NA_IIO_PROVIDER_CODE_DELETE_CONFIG_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_DELETE_CONFIG_ERROR;
}
gconf_client_suggest_sync( self->private->gconf, NULL );
g_free( path );
}
- if( ret == NA_IIO_PROVIDER_CODE_OK ){
+ if( ret == FMA_IIO_PROVIDER_CODE_OK ){
path = gconf_concat_dir_and_key( NAGP_SCHEMAS_PATH, uuid );
gconf_client_recursive_unset( self->private->gconf, path, 0, &error );
if( error ){
@@ -221,7 +221,7 @@ nagp_iio_provider_delete_item( const NAIIOProvider *provider, const NAObjectItem
*messages = g_slist_append( *messages, g_strdup( error->message ));
g_error_free( error );
error = NULL;
- ret = NA_IIO_PROVIDER_CODE_DELETE_SCHEMAS_ERROR;
+ ret = FMA_IIO_PROVIDER_CODE_DELETE_SCHEMAS_ERROR;
}
g_free( path );
gconf_client_suggest_sync( self->private->gconf, NULL );
@@ -241,7 +241,7 @@ nagp_writer_write_start( const FMAIFactoryProvider *writer, void *writer_data,
write_start_write_version( NAGP_GCONF_PROVIDER( writer ), NA_OBJECT_ITEM( object ));
}
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
static void
@@ -298,7 +298,7 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
/*g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));*/
msg = NULL;
- code = NA_IIO_PROVIDER_CODE_OK;
+ code = FMA_IIO_PROVIDER_CODE_OK;
def = fma_data_boxed_get_data_def( boxed );
if( !fma_data_boxed_is_default( boxed ) || def->write_if_default ){
@@ -327,7 +327,7 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
fma_gconf_utils_write_string( gconf, path, str_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
- code = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
+ code = FMA_IIO_PROVIDER_CODE_WRITE_ERROR;
}
g_free( str_value );
break;
@@ -337,7 +337,7 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
fma_gconf_utils_write_string( gconf, path, str_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
- code = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
+ code = FMA_IIO_PROVIDER_CODE_WRITE_ERROR;
}
g_free( str_value );
break;
@@ -347,7 +347,7 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
fma_gconf_utils_write_bool( gconf, path, bool_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
- code = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
+ code = FMA_IIO_PROVIDER_CODE_WRITE_ERROR;
}
break;
@@ -356,7 +356,7 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
fma_gconf_utils_write_string_list( gconf, path, slist_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
- code = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
+ code = FMA_IIO_PROVIDER_CODE_WRITE_ERROR;
}
fma_core_utils_slist_free( slist_value );
break;
@@ -366,13 +366,13 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
fma_gconf_utils_write_int( gconf, path, uint_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
- code = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
+ code = FMA_IIO_PROVIDER_CODE_WRITE_ERROR;
}
break;
default:
g_warning( "%s: unknown type=%u for %s", thisfn, def->type, def->name );
- code = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
+ code = FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
}
/*g_debug( "%s: gconf=%p, code=%u, path=%s", thisfn, ( void * ) gconf, code, path );*/
@@ -391,6 +391,6 @@ nagp_writer_write_done( const FMAIFactoryProvider *writer, void *writer_data,
const FMAIFactoryObject *object,
GSList **messages )
{
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
#endif /* NA_ENABLE_DEPRECATED */
diff --git a/src/io-gconf/nagp-writer.h b/src/io-gconf/nagp-writer.h
index 70f4538..7690b89 100644
--- a/src/io-gconf/nagp-writer.h
+++ b/src/io-gconf/nagp-writer.h
@@ -31,24 +31,24 @@
#define __NAGP_WRITE_H__
#include <api/fma-data-boxed.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/fma-ifactory-provider.h>
G_BEGIN_DECLS
-/* NAIIOProvider interface
+/* FMAIIOProvider interface
*/
-gboolean nagp_iio_provider_is_willing_to_write( const NAIIOProvider *provider );
+gboolean nagp_iio_provider_is_willing_to_write( const FMAIIOProvider *provider );
-gboolean nagp_iio_provider_is_able_to_write ( const NAIIOProvider *provider );
+gboolean nagp_iio_provider_is_able_to_write ( const FMAIIOProvider *provider );
/* Writing into GConf is deprecated since 3.1.0
*/
#ifdef NA_ENABLE_DEPRECATED
-guint nagp_iio_provider_write_item ( const NAIIOProvider *provider,
+guint nagp_iio_provider_write_item ( const FMAIIOProvider *provider,
const
NAObjectItem *item, GSList **message );
-guint nagp_iio_provider_delete_item ( const NAIIOProvider *provider,
+guint nagp_iio_provider_delete_item ( const FMAIIOProvider *provider,
const
NAObjectItem *item, GSList **message );
/* FMAIFactoryProvider interface
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index 0069d8b..eb02f56 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -40,7 +40,7 @@
#include <api/fma-data-types.h>
#include <api/na-object-api.h>
#include <api/fma-ifactory-provider.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <io-gconf/nagp-keys.h>
@@ -432,7 +432,7 @@ naxml_writer_write_start( const FMAIFactoryProvider *provider, void *writer_data
write_start_write_version( writer, NA_OBJECT_ITEM( object ), groups );
}
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
/* at end of write_start (list_node already created)
@@ -493,13 +493,13 @@ naxml_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
( *writer->private->fn_str->write_data_fn )( writer, NA_OBJECT_ID( object ), boxed, def );
}
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
guint
naxml_writer_write_done( const FMAIFactoryProvider *provider, void *writer_data, const FMAIFactoryObject
*object, GSList **messages )
{
- return( NA_IIO_PROVIDER_CODE_OK );
+ return( FMA_IIO_PROVIDER_CODE_OK );
}
static void
diff --git a/src/nact/nact-menu-file.c b/src/nact/nact-menu-file.c
index a51e621..bbbcbfd 100644
--- a/src/nact/nact-menu-file.c
+++ b/src/nact/nact-menu-file.c
@@ -350,7 +350,7 @@ save_item( NactMainWindow *window, NAUpdater *updater, NAObjectItem *item, GSLis
g_free( label );
save_ret = na_updater_write_item( updater, item, messages );
- ret = ( save_ret == NA_IIO_PROVIDER_CODE_OK );
+ ret = ( save_ret == FMA_IIO_PROVIDER_CODE_OK );
if( ret ){
if( NA_IS_OBJECT_ACTION( item )){
diff --git a/src/nact/nact-tree-ieditable.c b/src/nact/nact-tree-ieditable.c
index 52b09d0..964e755 100644
--- a/src/nact/nact-tree-ieditable.c
+++ b/src/nact/nact-tree-ieditable.c
@@ -584,7 +584,7 @@ nact_tree_ieditable_remove_deleted( NactTreeIEditable *instance, GSList **messag
g_debug( "%s: item=%p (%s)", thisfn, ( void * ) item, G_OBJECT_TYPE_NAME( item ));
na_object_dump_norec( item );
- if( na_updater_delete_item( ied->updater, item, messages ) != NA_IIO_PROVIDER_CODE_OK ){
+ if( na_updater_delete_item( ied->updater, item, messages ) != FMA_IIO_PROVIDER_CODE_OK ){
not_deleted = g_list_prepend( not_deleted, na_object_ref( item ));
delete_ok = FALSE;
}
diff --git a/src/test/test-module-plugin.c b/src/test/test-module-plugin.c
index 5b42eb6..ea692a0 100755
--- a/src/test/test-module-plugin.c
+++ b/src/test/test-module-plugin.c
@@ -167,7 +167,7 @@ na_module_plugin_register_type( GTypeModule *module )
st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NAModulePlugin", &info, 0 );
- /*g_type_module_add_interface( module, st_module_type, NA_TYPE_IIO_PROVIDER, &iio_provider_iface_info
);*/
+ /*g_type_module_add_interface( module, st_module_type, FMA_TYPE_IIO_PROVIDER,
&iio_provider_iface_info );*/
}
static void
diff --git a/src/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
index 19d4028..ebd3b1d 100644
--- a/src/utils/nautilus-actions-new.c
+++ b/src/utils/nautilus-actions-new.c
@@ -39,7 +39,7 @@
#include <stdlib.h>
#include <api/fma-core-utils.h>
-#include <api/na-iio-provider.h>
+#include <api/fma-iio-provider.h>
#include <api/na-object-api.h>
#include <core/na-gconf-migration.h>
@@ -588,7 +588,7 @@ output_to_desktop( NAObjectAction *action, GSList **msgs )
if( provider ){
na_object_set_provider( action, provider );
ret = na_updater_write_item( updater, NA_OBJECT_ITEM( action ), msgs );
- code = ( ret == NA_IIO_PROVIDER_CODE_OK );
+ code = ( ret == FMA_IIO_PROVIDER_CODE_OK );
} else {
/* i18n: 'na-desktop' is a plugin identifier - do not translate */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
