[nautilus-actions] NAIFactoryObject interface is renamed to FMAIObjectInterface
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] NAIFactoryObject interface is renamed to FMAIObjectInterface
- Date: Wed, 15 Feb 2017 22:46:10 +0000 (UTC)
commit f7c3a65402b55fe467ca86fa6cbefd9c4ad3ae02
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Sep 7 22:17:08 2015 +0200
NAIFactoryObject interface is renamed to FMAIObjectInterface
src/api/Makefile.am | 4 +-
src/api/fma-data-boxed.h | 2 +-
src/api/fma-data-def.h | 10 +-
...ry-object-data.h => fma-ifactory-object-data.h} | 10 +-
...{na-ifactory-object.h => fma-ifactory-object.h} | 84 ++++----
src/api/na-ifactory-provider.h | 36 ++--
src/api/na-iio-provider.h | 2 +-
src/api/na-object-api.h | 186 +++++++-------
src/core/Makefile.am | 2 +-
src/core/fma-icontext-factory.c | 2 +-
...{na-ifactory-object.c => fma-ifactory-object.c} | 72 +++---
src/core/na-factory-object.c | 252 ++++++++++----------
src/core/na-factory-object.h | 44 ++--
src/core/na-factory-provider.c | 8 +-
src/core/na-factory-provider.h | 4 +-
src/core/na-ifactory-provider.c | 30 ++--
src/core/na-object-action-factory.c | 2 +-
src/core/na-object-action.c | 54 ++--
src/core/na-object-id-factory.c | 2 +-
src/core/na-object-item-factory.c | 2 +-
src/core/na-object-item.c | 2 +-
src/core/na-object-menu-factory.c | 2 +-
src/core/na-object-menu.c | 38 ++--
src/core/na-object-profile-factory.c | 2 +-
src/core/na-object-profile.c | 44 ++--
src/core/na-object.c | 20 +-
src/io-desktop/nadp-reader.c | 42 ++--
src/io-desktop/nadp-reader.h | 6 +-
src/io-desktop/nadp-writer.c | 14 +-
src/io-desktop/nadp-writer.h | 6 +-
src/io-gconf/nagp-reader.c | 16 +-
src/io-gconf/nagp-reader.h | 6 +-
src/io-gconf/nagp-writer.c | 8 +-
src/io-gconf/nagp-writer.h | 6 +-
src/io-xml/naxml-reader.c | 22 +-
src/io-xml/naxml-reader.h | 6 +-
src/io-xml/naxml-writer.c | 10 +-
src/io-xml/naxml-writer.h | 6 +-
src/nact/nact-tree-ieditable.c | 2 +-
src/utils/na-print-schemas.c | 2 +-
40 files changed, 534 insertions(+), 534 deletions(-)
---
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 3e7e325..a36def2 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -46,8 +46,8 @@ api_include_HEADERS = \
fma-gconf-utils.h \
fma-icontext.h \
fma-iduplicable.h \
- na-ifactory-object.h \
- na-ifactory-object-data.h \
+ fma-ifactory-object.h \
+ fma-ifactory-object-data.h \
na-object-api.h \
na-object.h \
na-object-id.h \
diff --git a/src/api/fma-data-boxed.h b/src/api/fma-data-boxed.h
index de7647d..121ea0d 100644
--- a/src/api/fma-data-boxed.h
+++ b/src/api/fma-data-boxed.h
@@ -36,7 +36,7 @@
* @short_description: The Data Factory Element Class Definition
* @include: file-manager-actions/fma-data-boxed.h
*
- * The object which encapsulates an elementary data of #NAIFactoryObject.
+ * The object which encapsulates an elementary data of #FMAIFactoryObject.
* A #FMADataBoxed object has a type and a value.
*
* #FMADataBoxed class is derived from #FMABoxed one, and implements the same
diff --git a/src/api/fma-data-def.h b/src/api/fma-data-def.h
index 79db09f..c158051 100644
--- a/src/api/fma-data-def.h
+++ b/src/api/fma-data-def.h
@@ -38,7 +38,7 @@
*
* #FMADataDef and #FMADataGroup are structures which handle the list of
* elementary datas for each and every #NAObjectItem which happens to
- * implement the #NAIFactoryObject interface.
+ * implement the #FMAIFactoryObject interface.
*/
#include <glib.h>
@@ -49,7 +49,7 @@ G_BEGIN_DECLS
* FMADataDef:
* @name: both the id and the canonical name.
* Used when getting/setting properties.
- * Is defined in na-ifactory-object-data.h and must be globally unique.
+ * Is defined in fma-ifactory-object-data.h and must be globally unique.
* Must be an invariant as it is known from plugin extensions.
* @readable: whether the data should be read on unserialization operations.
* If FALSE, then no attempt will be made to read it
@@ -95,7 +95,7 @@ G_BEGIN_DECLS
* @option_arg_label: the localizable description for the argument.
*
* This structure fully describes an elementary factory data.
- * Each #NAIFactoryObject item definition may include several groups of
+ * Each #FMAIFactoryObject item definition may include several groups of
* this structure.
*/
typedef struct {
@@ -125,11 +125,11 @@ typedef struct {
/**
* FMADataGroup:
- * @group: the name of the group, as defined in na-ifactory-object-data.h.
+ * @group: the name of the group, as defined in fma-ifactory-object-data.h.
* @def: the list of the corresponding data structures.
*
* This structure fully describes a logical group of data.
- * Each #NAIFactoryObject item definition is built from a list of
+ * Each #FMAIFactoryObject item definition is built from a list of
* these groups.
*/
typedef struct {
diff --git a/src/api/na-ifactory-object-data.h b/src/api/fma-ifactory-object-data.h
similarity index 95%
rename from src/api/na-ifactory-object-data.h
rename to src/api/fma-ifactory-object-data.h
index dad511f..6c62c5d 100644
--- a/src/api/na-ifactory-object-data.h
+++ b/src/api/fma-ifactory-object-data.h
@@ -27,19 +27,19 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__
-#define __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__
+#define __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__
/**
* SECTION: data-name
* @title: Constants
* @short_description: The Data Factory Constant Definitions
- * @include: file-manager-actions/na-ifactory-object-data.h
+ * @include: file-manager-actions/fma-ifactory-object-data.h
*
* Each elementary data get its own name here.
*
* Through #FMADataDef and #FMADataGroup definitions, each #NAObjectItem
- * derived object which implement the #NAIFactoryObject interface will
+ * derived object which implement the #FMAIFactoryObject interface will
* dynamically define a property for each attached elementary data.
*/
@@ -153,4 +153,4 @@ G_BEGIN_DECLS
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__ */
diff --git a/src/api/na-ifactory-object.h b/src/api/fma-ifactory-object.h
similarity index 63%
rename from src/api/na-ifactory-object.h
rename to src/api/fma-ifactory-object.h
index ea6a450..cfc52b8 100644
--- a/src/api/na-ifactory-object.h
+++ b/src/api/fma-ifactory-object.h
@@ -27,19 +27,19 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_H__
-#define __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_H__
+#define __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_H__
/**
* SECTION: ifactory-object
- * @title: NAIFactoryObject
+ * @title: FMAIFactoryObject
* @short_description: The #NAObjectItem Interface v 1
* @include: file-manager-actions/na-ifactory_object.h
*
* This interface is implemented by #NAObjectItem derived objects so that they
* can take advantage of our data factory management system.
*
- * A #NAObjectItem derived object which would implement this #NAIFactoryObject
+ * A #NAObjectItem derived object which would implement this #FMAIFactoryObject
* interface must meet following conditions:
* <itemizedlist>
* <listitem>
@@ -52,7 +52,7 @@
* <refsect2>
* <title>Versions historic</title>
* <table>
- * <title>Historic of the versions of the #NAIFactoryObject interface</title>
+ * <title>Historic of the versions of the #FMAIFactoryObject interface</title>
* <tgroup rowsep="1" colsep="1" align="center" cols="3">
* <colspec colname="na-version" />
* <colspec colname="api-version" />
@@ -60,7 +60,7 @@
* <thead>
* <row>
* <entry>&prodname; version</entry>
- * <entry>#NAIFactoryObject interface version</entry>
+ * <entry>#FMAIFactoryObject interface version</entry>
* <entry></entry>
* </row>
* </thead>
@@ -82,16 +82,16 @@
G_BEGIN_DECLS
-#define NA_TYPE_IFACTORY_OBJECT ( na_ifactory_object_get_type())
-#define NA_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance,
NA_TYPE_IFACTORY_OBJECT, NAIFactoryObject ))
-#define NA_IS_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance,
NA_TYPE_IFACTORY_OBJECT ))
-#define NA_IFACTORY_OBJECT_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ),
NA_TYPE_IFACTORY_OBJECT, NAIFactoryObjectInterface ))
+#define FMA_TYPE_IFACTORY_OBJECT ( fma_ifactory_object_get_type())
+#define FMA_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance,
FMA_TYPE_IFACTORY_OBJECT, FMAIFactoryObject ))
+#define FMA_IS_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance,
FMA_TYPE_IFACTORY_OBJECT ))
+#define FMA_IFACTORY_OBJECT_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ),
FMA_TYPE_IFACTORY_OBJECT, FMAIFactoryObjectInterface ))
-typedef struct _NAIFactoryObject NAIFactoryObject;
-typedef struct _NAIFactoryObjectInterfacePrivate NAIFactoryObjectInterfacePrivate;
+typedef struct _FMAIFactoryObject FMAIFactoryObject;
+typedef struct _FMAIFactoryObjectInterfacePrivate FMAIFactoryObjectInterfacePrivate;
/**
- * NAIFactoryObjectInterface:
+ * FMAIFactoryObjectInterface:
* @get_version: returns the version of this interface the NAObjectItem implements.
* @get_groups: returns a pointer to the FMADataGroup which defines this object.
* @copy: post copy callback.
@@ -103,18 +103,18 @@ typedef struct _NAIFactoryObjectInterfacePrivate NAIFactoryObjectInterfacePr
* @write_done: triggered after a NAObjectItem has been unserialized.
*
* In order to take full advantage of our data managament system,
- * NAObjectItem-derived objects all implement this #NAIFactoryObject
+ * NAObjectItem-derived objects all implement this #FMAIFactoryObject
* interface.
*/
typedef struct {
/*< private >*/
GTypeInterface parent;
- NAIFactoryObjectInterfacePrivate *private;
+ FMAIFactoryObjectInterfacePrivate *private;
/*< public >*/
/**
* get_version:
- * @instance: this #NAIFactoryObject instance.
+ * @instance: this #FMAIFactoryObject instance.
*
* Defaults to 1.
*
@@ -122,22 +122,22 @@ typedef struct {
*
* Since: 2.30
*/
- guint ( *get_version )( const NAIFactoryObject *instance );
+ guint ( *get_version )( const FMAIFactoryObject *instance );
/**
* get_groups:
- * @instance: this #NAIFactoryObject instance.
+ * @instance: this #FMAIFactoryObject instance.
*
* Returns: a pointer to the FMADataGroup which defines this object.
*
* Since: 2.30
*/
- FMADataGroup * ( *get_groups ) ( const NAIFactoryObject *instance );
+ FMADataGroup * ( *get_groups ) ( const FMAIFactoryObject *instance );
/**
* copy:
- * @instance: the target #NAIFactoryObject instance.
- * @source: the source #NAIFactoryObject instance.
+ * @instance: the target #FMAIFactoryObject instance.
+ * @source: the source #FMAIFactoryObject instance.
*
* This function is triggered after having copied @source to
* @instance target. This later may take advantage of this call
@@ -145,12 +145,12 @@ typedef struct {
*
* Since: 2.30
*/
- void ( *copy ) ( NAIFactoryObject *instance, const NAIFactoryObject *source );
+ void ( *copy ) ( FMAIFactoryObject *instance, const FMAIFactoryObject *source );
/**
* are_equal:
- * @a: the first #NAIFactoryObject instance.
- * @b: the second #NAIFactoryObject instance.
+ * @a: the first #FMAIFactoryObject instance.
+ * @b: the second #FMAIFactoryObject instance.
*
* This function is triggered after all elementary data comparisons
* have been sucessfully made.
@@ -159,11 +159,11 @@ typedef struct {
*
* Since: 2.30
*/
- gboolean ( *are_equal ) ( const NAIFactoryObject *a, const NAIFactoryObject *b );
+ gboolean ( *are_equal ) ( const FMAIFactoryObject *a, const FMAIFactoryObject *b );
/**
* is_valid:
- * @object: the #NAIFactoryObject instance whose validity is to be checked.
+ * @object: the #FMAIFactoryObject instance whose validity is to be checked.
*
* This function is triggered after all elementary data comparisons
* have been sucessfully made.
@@ -172,11 +172,11 @@ typedef struct {
*
* Since: 2.30
*/
- gboolean ( *is_valid ) ( const NAIFactoryObject *object );
+ gboolean ( *is_valid ) ( const FMAIFactoryObject *object );
/**
* read_start:
- * @instance: this #NAIFactoryObject instance.
+ * @instance: this #FMAIFactoryObject instance.
* @reader: the instance which has provided read services.
* @reader_data: the data associated to @reader.
* @messages: a pointer to a #GSList list of strings; the instance
@@ -186,11 +186,11 @@ typedef struct {
*
* Since: 2.30
*/
- void ( *read_start ) ( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
+ void ( *read_start ) ( FMAIFactoryObject *instance, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
/**
* read_done:
- * @instance: this #NAIFactoryObject instance.
+ * @instance: this #FMAIFactoryObject instance.
* @reader: the instance which has provided read services.
* @reader_data: the data associated to @reader.
* @messages: a pointer to a #GSList list of strings; the instance
@@ -200,11 +200,11 @@ typedef struct {
*
* Since: 2.30
*/
- void ( *read_done ) ( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
+ void ( *read_done ) ( FMAIFactoryObject *instance, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
/**
* write_start:
- * @instance: this #NAIFactoryObject instance.
+ * @instance: this #FMAIFactoryObject instance.
* @writer: the instance which has provided writing services.
* @writer_data: the data associated to @writer.
* @messages: a pointer to a #GSList list of strings; the instance
@@ -216,11 +216,11 @@ typedef struct {
*
* Since: 2.30
*/
- guint ( *write_start )( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages );
+ guint ( *write_start )( FMAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages );
/**
* write_done:
- * @instance: this #NAIFactoryObject instance.
+ * @instance: this #FMAIFactoryObject instance.
* @writer: the instance which has provided writing services.
* @writer_data: the data associated to @writer.
* @messages: a pointer to a #GSList list of strings; the instance
@@ -232,17 +232,17 @@ typedef struct {
*
* Since: 2.30
*/
- guint ( *write_done ) ( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages );
+ guint ( *write_done ) ( FMAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages );
}
- NAIFactoryObjectInterface;
+ FMAIFactoryObjectInterface;
-GType na_ifactory_object_get_type( void );
+GType fma_ifactory_object_get_type( void );
-FMADataBoxed *na_ifactory_object_get_data_boxed ( const NAIFactoryObject *object, const gchar *name );
-FMADataGroup *na_ifactory_object_get_data_groups( const NAIFactoryObject *object );
-void *na_ifactory_object_get_as_void ( const NAIFactoryObject *object, const gchar *name );
-void na_ifactory_object_set_from_void ( NAIFactoryObject *object, const gchar *name, const void
*data );
+FMADataBoxed *fma_ifactory_object_get_data_boxed ( const FMAIFactoryObject *object, const gchar *name );
+FMADataGroup *fma_ifactory_object_get_data_groups( const FMAIFactoryObject *object );
+void *fma_ifactory_object_get_as_void ( const FMAIFactoryObject *object, const gchar *name );
+void fma_ifactory_object_set_from_void ( FMAIFactoryObject *object, const gchar *name, const void
*data );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_H__ */
diff --git a/src/api/na-ifactory-provider.h b/src/api/na-ifactory-provider.h
index 540d100..6504695 100644
--- a/src/api/na-ifactory-provider.h
+++ b/src/api/na-ifactory-provider.h
@@ -135,7 +135,7 @@
*/
#include "fma-data-boxed.h"
-#include "na-ifactory-object.h"
+#include "fma-ifactory-object.h"
#include "na-ifactory-provider-provider.h"
G_BEGIN_DECLS
@@ -182,15 +182,15 @@ typedef struct {
* @reader: this #NAIFactoryProvider instance.
* @reader_data: the data associated to this instance, as provided
* when na_ifactory_provider_read_item() was called.
- * @object: the #NAIFactoryObject object which comes to be read.
+ * @object: the #FMAIFactoryObject object which comes to be read.
* @messages: a pointer to a #GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
*
- * API called by #NAIFactoryObject just before starting with reading data.
+ * API called by #FMAIFactoryObject just before starting with reading data.
*
* Since: 2.30
*/
- void ( *read_start ) ( const NAIFactoryProvider *reader, void *reader_data, const
NAIFactoryObject *object, GSList **messages );
+ void ( *read_start ) ( const NAIFactoryProvider *reader, void *reader_data, const
FMAIFactoryObject *object, GSList **messages );
/**
* read_data:
@@ -209,45 +209,45 @@ typedef struct {
*
* Since: 2.30
*/
- FMADataBoxed * ( *read_data ) ( const NAIFactoryProvider *reader, void *reader_data, const
NAIFactoryObject *object, const FMADataDef *def, GSList **messages );
+ FMADataBoxed * ( *read_data ) ( const NAIFactoryProvider *reader, void *reader_data, const
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages );
/**
* read_done:
* @reader: this #NAIFactoryProvider instance.
* @reader_data: the data associated to this instance, as provided
* when na_ifactory_provider_read_item() was called.
- * @object: the #NAIFactoryObject object which comes to be read.
+ * @object: the #FMAIFactoryObject object which comes to be read.
* @messages: a pointer to a #GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
*
- * API called by #NAIFactoryObject when all data have been read.
+ * API called by #FMAIFactoryObject when all data have been read.
* Implementor may take advantage of this to do some cleanup.
*
* Since: 2.30
*/
- void ( *read_done ) ( const NAIFactoryProvider *reader, void *reader_data, const
NAIFactoryObject *object, GSList **messages );
+ void ( *read_done ) ( const NAIFactoryProvider *reader, void *reader_data, const
FMAIFactoryObject *object, GSList **messages );
/**
* write_start:
* @writer: this #NAIFactoryProvider instance.
* @writer_data: the data associated to this instance.
- * @object: the #NAIFactoryObject object which comes to be written.
+ * @object: the #FMAIFactoryObject object which comes to be written.
* @messages: a pointer to a #GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
*
- * API called by #NAIFactoryObject just before starting with writing data.
+ * API called by #FMAIFactoryObject just before starting with writing data.
*
* Returns: a NAIIOProvider operation return code.
*
* Since: 2.30
*/
- guint ( *write_start )( const NAIFactoryProvider *writer, void *writer_data, const
NAIFactoryObject *object, GSList **messages );
+ guint ( *write_start )( const NAIFactoryProvider *writer, void *writer_data, const
FMAIFactoryObject *object, GSList **messages );
/**
* write_data:
* @writer: this #NAIFactoryProvider instance.
* @writer_data: the data associated to this instance.
- * @object: the #NAIFactoryObject object being written.
+ * @object: the #FMAIFactoryObject object being written.
* @def: the description of the data to be written.
* @value: the #FMADataBoxed to be written down.
* @messages: a pointer to a #GSList list of strings; the provider
@@ -261,31 +261,31 @@ typedef struct {
*
* Since: 2.30
*/
- guint ( *write_data ) ( const NAIFactoryProvider *writer, void *writer_data, const
NAIFactoryObject *object, const FMADataBoxed *boxed, GSList **messages );
+ guint ( *write_data ) ( const NAIFactoryProvider *writer, void *writer_data, const
FMAIFactoryObject *object, const FMADataBoxed *boxed, GSList **messages );
/**
* write_done:
* @writer: this #NAIFactoryProvider instance.
* @writer_data: the data associated to this instance.
- * @object: the #NAIFactoryObject object which comes to be written.
+ * @object: the #FMAIFactoryObject object which comes to be written.
* @messages: a pointer to a #GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
*
- * API called by #NAIFactoryObject when all data have been written.
+ * 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.
*
* Since: 2.30
*/
- guint ( *write_done ) ( const NAIFactoryProvider *writer, void *writer_data, const
NAIFactoryObject *object, GSList **messages );
+ guint ( *write_done ) ( const NAIFactoryProvider *writer, void *writer_data, const
FMAIFactoryObject *object, GSList **messages );
}
NAIFactoryProviderInterface;
GType na_ifactory_provider_get_type( void );
-void na_ifactory_provider_read_item ( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject
*object, GSList **messages );
-guint na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject
*object, GSList **messages );
+void na_ifactory_provider_read_item ( const NAIFactoryProvider *reader, void *reader_data,
FMAIFactoryObject *object, GSList **messages );
+guint na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_data,
FMAIFactoryObject *object, GSList **messages );
G_END_DECLS
diff --git a/src/api/na-iio-provider.h b/src/api/na-iio-provider.h
index 308b43d..83c39d9 100644
--- a/src/api/na-iio-provider.h
+++ b/src/api/na-iio-provider.h
@@ -101,7 +101,7 @@
*
* These services may be fully implemented by the I/O provider itself.
* Or, the I/O provider may also prefer to take advantage of the data
- * factory management (see #NAIFactoryObject and #NAIFactoryProvider
+ * factory management (see #FMAIFactoryObject and #NAIFactoryProvider
* interfaces) services.
*
* <refsect2>
diff --git a/src/api/na-object-api.h b/src/api/na-object-api.h
index 1008b27..6ada04c 100644
--- a/src/api/na-object-api.h
+++ b/src/api/na-object-api.h
@@ -41,8 +41,8 @@
* are casted directly in the macro.
*/
-#include "na-ifactory-object.h"
-#include "na-ifactory-object-data.h"
+#include "fma-ifactory-object.h"
+#include "fma-ifactory-object-data.h"
#include "fma-iduplicable.h"
#include "fma-icontext.h"
#include "na-object-action.h"
@@ -75,14 +75,14 @@ G_BEGIN_DECLS
/* NAObjectId
*/
-#define na_object_get_id( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ID ))
-#define na_object_get_label( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), ( NA_IS_OBJECT_PROFILE( obj ) ? NAFO_DATA_DESCNAME : NAFO_DATA_LABEL )))
-#define na_object_get_label_noloc( obj ) (( gchar * )( NA_IS_OBJECT_PROFILE( obj ) ?
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCNAME_NOLOC ) : NULL ))
-#define na_object_get_parent( obj ) (( NAObjectItem * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARENT ))
+#define na_object_get_id( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ID ))
+#define na_object_get_label( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), ( NA_IS_OBJECT_PROFILE( obj ) ? NAFO_DATA_DESCNAME : NAFO_DATA_LABEL )))
+#define na_object_get_label_noloc( obj ) (( gchar * )( NA_IS_OBJECT_PROFILE( obj ) ?
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCNAME_NOLOC ) : NULL ))
+#define na_object_get_parent( obj ) (( NAObjectItem * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARENT ))
-#define na_object_set_id( obj, id ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ID, ( const void * )( id ))
-#define na_object_set_label( obj, label ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), ( NA_IS_OBJECT_PROFILE( obj ) ? NAFO_DATA_DESCNAME : NAFO_DATA_LABEL ), ( const
void * )( label ))
-#define na_object_set_parent( obj, parent ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARENT, ( const void * )( parent ))
+#define na_object_set_id( obj, id ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ID, ( const void * )( id ))
+#define na_object_set_label( obj, label ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), ( NA_IS_OBJECT_PROFILE( obj ) ? NAFO_DATA_DESCNAME : NAFO_DATA_LABEL ), ( const
void * )( label ))
+#define na_object_set_parent( obj, parent ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARENT, ( const void * )( parent ))
#define na_object_sort_alpha_asc( a, b ) na_object_id_sort_alpha_asc( NA_OBJECT_ID( a ),
NA_OBJECT_ID( b ))
#define na_object_sort_alpha_desc( a, b ) na_object_id_sort_alpha_desc( NA_OBJECT_ID( a ),
NA_OBJECT_ID( b ))
@@ -94,30 +94,30 @@ G_BEGIN_DECLS
/* NAObjectItem
*/
-#define na_object_get_tooltip( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLTIP ))
-#define na_object_get_icon( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON ))
-#define na_object_get_icon_noloc( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON_NOLOC ))
-#define na_object_get_description( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCRIPTION ))
-#define na_object_get_items( obj ) (( GList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS ))
-#define na_object_get_items_slist( obj ) (( GSList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS_SLIST ))
-#define na_object_is_enabled( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ENABLED )))
-#define na_object_is_readonly( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_READONLY )))
-#define na_object_get_provider( obj ) na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT(
obj ), NAFO_DATA_PROVIDER )
-#define na_object_get_provider_data( obj ) na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT(
obj ), NAFO_DATA_PROVIDER_DATA )
-#define na_object_get_iversion( obj ) GPOINTER_TO_UINT( na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_IVERSION ))
-#define na_object_get_shortcut( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHORTCUT ))
-
-#define na_object_set_tooltip( obj, tooltip ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLTIP, ( const void * )( tooltip ))
-#define na_object_set_icon( obj, icon ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON, ( const void * )( icon ))
-#define na_object_set_description( obj, desc ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCRIPTION, ( const void * )( desc ))
-#define na_object_set_items( obj, list ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS, ( const void * )( list ))
-#define na_object_set_items_slist( obj, slist ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS_SLIST, ( const void * )( slist ))
-#define na_object_set_enabled( obj, enabled ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ENABLED, ( const void * ) GUINT_TO_POINTER( enabled ))
-#define na_object_set_readonly( obj, readonly ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_READONLY, ( const void * ) GUINT_TO_POINTER( readonly ))
-#define na_object_set_provider( obj, provider ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER, ( const void * )( provider ))
-#define na_object_set_provider_data( obj, data ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER_DATA, ( const void * )( data ))
-#define na_object_set_iversion( obj, version ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_IVERSION, ( const void * ) GUINT_TO_POINTER( version ))
-#define na_object_set_shortcut( obj, shortcut ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHORTCUT, ( const void * )( shortcut ))
+#define na_object_get_tooltip( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLTIP ))
+#define na_object_get_icon( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON ))
+#define na_object_get_icon_noloc( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON_NOLOC ))
+#define na_object_get_description( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCRIPTION ))
+#define na_object_get_items( obj ) (( GList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS ))
+#define na_object_get_items_slist( obj ) (( GSList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS_SLIST ))
+#define na_object_is_enabled( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ENABLED )))
+#define na_object_is_readonly( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_READONLY )))
+#define na_object_get_provider( obj ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER )
+#define na_object_get_provider_data( obj ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER_DATA )
+#define na_object_get_iversion( obj ) GPOINTER_TO_UINT( fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_IVERSION ))
+#define na_object_get_shortcut( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHORTCUT ))
+
+#define na_object_set_tooltip( obj, tooltip ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLTIP, ( const void * )( tooltip ))
+#define na_object_set_icon( obj, icon ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON, ( const void * )( icon ))
+#define na_object_set_description( obj, desc ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCRIPTION, ( const void * )( desc ))
+#define na_object_set_items( obj, list ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS, ( const void * )( list ))
+#define na_object_set_items_slist( obj, slist ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS_SLIST, ( const void * )( slist ))
+#define na_object_set_enabled( obj, enabled ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ENABLED, ( const void * ) GUINT_TO_POINTER( enabled ))
+#define na_object_set_readonly( obj, readonly ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_READONLY, ( const void * ) GUINT_TO_POINTER( readonly ))
+#define na_object_set_provider( obj, provider ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER, ( const void * )( provider ))
+#define na_object_set_provider_data( obj, data ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER_DATA, ( const void * )( data ))
+#define na_object_set_iversion( obj, version ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_IVERSION, ( const void * ) GUINT_TO_POINTER( version ))
+#define na_object_set_shortcut( obj, shortcut ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHORTCUT, ( const void * )( shortcut ))
#define na_object_get_item( obj, id ) na_object_item_get_item( NA_OBJECT_ITEM( obj ),(
const gchar * )( id ))
#define na_object_get_position( obj, child ) na_object_item_get_position( NA_OBJECT_ITEM( obj ),
NA_OBJECT_ID( child ))
@@ -136,81 +136,81 @@ G_BEGIN_DECLS
/* NAObjectAction
*/
-#define na_object_get_version( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_VERSION ))
-#define na_object_is_target_selection( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_SELECTION )))
-#define na_object_is_target_location( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_LOCATION )))
-#define na_object_is_target_toolbar( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_TOOLBAR )))
-#define na_object_get_toolbar_label( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_LABEL ))
-#define na_object_is_toolbar_same_label( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_SAME_LABEL )))
-#define na_object_get_last_allocated( obj ) (( guint ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED )))
-
-#define na_object_set_version( obj, version ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_VERSION, ( const void * )( version ))
-#define na_object_set_target_selection( obj, target ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_SELECTION, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_target_location( obj, target ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_LOCATION, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_target_toolbar( obj, target ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_TOOLBAR, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_toolbar_label( obj, label ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_LABEL, ( const void * )( label ))
-#define na_object_set_toolbar_same_label( obj, same ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_SAME_LABEL, ( const void * ) GUINT_TO_POINTER( same ))
-#define na_object_set_last_allocated( obj, last ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( last ))
+#define na_object_get_version( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_VERSION ))
+#define na_object_is_target_selection( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_SELECTION )))
+#define na_object_is_target_location( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_LOCATION )))
+#define na_object_is_target_toolbar( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_TOOLBAR )))
+#define na_object_get_toolbar_label( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_LABEL ))
+#define na_object_is_toolbar_same_label( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_SAME_LABEL )))
+#define na_object_get_last_allocated( obj ) (( guint ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED )))
+
+#define na_object_set_version( obj, version ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_VERSION, ( const void * )( version ))
+#define na_object_set_target_selection( obj, target ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_SELECTION, ( const void * ) GUINT_TO_POINTER( target ))
+#define na_object_set_target_location( obj, target ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_LOCATION, ( const void * ) GUINT_TO_POINTER( target ))
+#define na_object_set_target_toolbar( obj, target ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_TOOLBAR, ( const void * ) GUINT_TO_POINTER( target ))
+#define na_object_set_toolbar_label( obj, label ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_LABEL, ( const void * )( label ))
+#define na_object_set_toolbar_same_label( obj, same ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_SAME_LABEL, ( const void * ) GUINT_TO_POINTER( same ))
+#define na_object_set_last_allocated( obj, last ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( last ))
#define na_object_set_last_version( obj ) na_object_action_set_last_version( NA_OBJECT_ACTION(
obj ))
-#define na_object_reset_last_allocated( obj ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( 0 ))
+#define na_object_reset_last_allocated( obj ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( 0 ))
#define na_object_attach_profile( obj, profile ) na_object_action_attach_profile( NA_OBJECT_ACTION(
obj ), NA_OBJECT_PROFILE( profile ))
/* NAObjectProfile
*/
-#define na_object_get_path( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_PATH ))
-#define na_object_get_parameters( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARAMETERS ))
-#define na_object_get_working_dir( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_WORKING_DIR ))
-#define na_object_get_execution_mode( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTION_MODE ))
-#define na_object_get_startup_notify( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_NOTIFY )))
-#define na_object_get_startup_class( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_WMCLASS ))
-#define na_object_get_execute_as( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTE_AS ))
-
-#define na_object_set_path( obj, path ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_PATH, ( const void * )( path ))
-#define na_object_set_parameters( obj, parms ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARAMETERS, ( const void * )( parms ))
-#define na_object_set_working_dir( obj, uri ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_WORKING_DIR, ( const void * )( uri ))
-#define na_object_set_execution_mode( obj, mode ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTION_MODE, ( const void * )( mode ))
-#define na_object_set_startup_notify( obj, notify ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_NOTIFY, ( const void * ) GUINT_TO_POINTER( notify ))
-#define na_object_set_startup_class( obj, class ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_WMCLASS, ( const void * )( class ))
-#define na_object_set_execute_as( obj, user ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTE_AS, ( const void * )( user ))
+#define na_object_get_path( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PATH ))
+#define na_object_get_parameters( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARAMETERS ))
+#define na_object_get_working_dir( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_WORKING_DIR ))
+#define na_object_get_execution_mode( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTION_MODE ))
+#define na_object_get_startup_notify( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_NOTIFY )))
+#define na_object_get_startup_class( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_WMCLASS ))
+#define na_object_get_execute_as( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTE_AS ))
+
+#define na_object_set_path( obj, path ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PATH, ( const void * )( path ))
+#define na_object_set_parameters( obj, parms ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARAMETERS, ( const void * )( parms ))
+#define na_object_set_working_dir( obj, uri ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_WORKING_DIR, ( const void * )( uri ))
+#define na_object_set_execution_mode( obj, mode ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTION_MODE, ( const void * )( mode ))
+#define na_object_set_startup_notify( obj, notify ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_NOTIFY, ( const void * ) GUINT_TO_POINTER( notify ))
+#define na_object_set_startup_class( obj, class ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_WMCLASS, ( const void * )( class ))
+#define na_object_set_execute_as( obj, user ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTE_AS, ( const void * )( user ))
/* FMAIContext
*/
#define na_object_check_mimetypes( obj ) fma_icontext_check_mimetypes( FMA_ICONTEXT( obj ))
-#define na_object_get_basenames( obj ) (( GSList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_BASENAMES ))
-#define na_object_get_matchcase( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_MATCHCASE )))
-#define na_object_get_mimetypes( obj ) (( GSList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES ))
-#define na_object_get_all_mimetypes( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES_IS_ALL )))
-#define na_object_get_folders( obj ) (( GSList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_FOLDERS ))
-#define na_object_get_schemes( obj ) (( GSList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SCHEMES ))
-#define na_object_get_only_show_in( obj ) (( GSList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ONLY_SHOW ))
-#define na_object_get_not_show_in( obj ) (( GSList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_NOT_SHOW ))
-#define na_object_get_try_exec( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TRY_EXEC ))
-#define na_object_get_show_if_registered( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_REGISTERED ))
-#define na_object_get_show_if_true( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_TRUE ))
-#define na_object_get_show_if_running( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_RUNNING ))
-#define na_object_get_selection_count( obj ) (( gchar * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SELECTION_COUNT ))
-#define na_object_get_capabilities( obj ) (( GSList * ) na_ifactory_object_get_as_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_CAPABILITITES ))
-
-#define na_object_set_basenames( obj, bnames ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_BASENAMES, ( const void * )( bnames ))
-#define na_object_set_matchcase( obj, match ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_MATCHCASE, ( const void * ) GUINT_TO_POINTER( match ))
-#define na_object_set_mimetypes( obj, types ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES, ( const void * )( types ))
-#define na_object_set_all_mimetypes( obj, all ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES_IS_ALL, ( const void * ) GUINT_TO_POINTER( all ))
-#define na_object_set_folders( obj, folders ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_FOLDERS, ( const void * )( folders ))
+#define na_object_get_basenames( obj ) (( GSList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_BASENAMES ))
+#define na_object_get_matchcase( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MATCHCASE )))
+#define na_object_get_mimetypes( obj ) (( GSList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES ))
+#define na_object_get_all_mimetypes( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES_IS_ALL )))
+#define na_object_get_folders( obj ) (( GSList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_FOLDERS ))
+#define na_object_get_schemes( obj ) (( GSList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SCHEMES ))
+#define na_object_get_only_show_in( obj ) (( GSList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ONLY_SHOW ))
+#define na_object_get_not_show_in( obj ) (( GSList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_NOT_SHOW ))
+#define na_object_get_try_exec( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TRY_EXEC ))
+#define na_object_get_show_if_registered( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_REGISTERED ))
+#define na_object_get_show_if_true( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_TRUE ))
+#define na_object_get_show_if_running( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_RUNNING ))
+#define na_object_get_selection_count( obj ) (( gchar * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SELECTION_COUNT ))
+#define na_object_get_capabilities( obj ) (( GSList * ) fma_ifactory_object_get_as_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_CAPABILITITES ))
+
+#define na_object_set_basenames( obj, bnames ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_BASENAMES, ( const void * )( bnames ))
+#define na_object_set_matchcase( obj, match ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MATCHCASE, ( const void * ) GUINT_TO_POINTER( match ))
+#define na_object_set_mimetypes( obj, types ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES, ( const void * )( types ))
+#define na_object_set_all_mimetypes( obj, all ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES_IS_ALL, ( const void * ) GUINT_TO_POINTER( all ))
+#define na_object_set_folders( obj, folders ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_FOLDERS, ( const void * )( folders ))
#define na_object_replace_folder( obj, old, new ) fma_icontext_replace_folder( FMA_ICONTEXT( obj ), (
const gchar * )( old ), ( const gchar * )( new ))
#define na_object_set_scheme( obj, scheme, add ) fma_icontext_set_scheme( FMA_ICONTEXT( obj ), (
const gchar * )( scheme ), ( add ))
-#define na_object_set_schemes( obj, schemes ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SCHEMES, ( const void * )( schemes ))
-#define na_object_set_only_show_in( obj, list ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ONLY_SHOW, ( const void * )( list ))
+#define na_object_set_schemes( obj, schemes ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SCHEMES, ( const void * )( schemes ))
+#define na_object_set_only_show_in( obj, list ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ONLY_SHOW, ( const void * )( list ))
#define na_object_set_only_desktop( obj, desktop, add ) fma_icontext_set_only_desktop( FMA_ICONTEXT( obj ),
( const gchar * )( desktop ), ( add ))
-#define na_object_set_not_show_in( obj, list ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_NOT_SHOW, ( const void * )( list ))
+#define na_object_set_not_show_in( obj, list ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_NOT_SHOW, ( const void * )( list ))
#define na_object_set_not_desktop( obj, desktop, add ) fma_icontext_set_not_desktop( FMA_ICONTEXT( obj ), (
const gchar * )( desktop ), ( add ))
-#define na_object_set_try_exec( obj, exec ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_TRY_EXEC, ( const void * )( exec ))
-#define na_object_set_show_if_registered( obj, name ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_REGISTERED, ( const void * )( name ))
-#define na_object_set_show_if_true( obj, exec ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_TRUE, ( const void * )( exec ))
-#define na_object_set_show_if_running( obj, name ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_RUNNING, ( const void * )( name ))
-#define na_object_set_selection_count( obj, cond ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SELECTION_COUNT, ( const void * )( cond ))
-#define na_object_set_capabilities( obj, cap ) na_ifactory_object_set_from_void(
NA_IFACTORY_OBJECT( obj ), NAFO_DATA_CAPABILITITES, ( const void * )( cap ))
+#define na_object_set_try_exec( obj, exec ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TRY_EXEC, ( const void * )( exec ))
+#define na_object_set_show_if_registered( obj, name ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_REGISTERED, ( const void * )( name ))
+#define na_object_set_show_if_true( obj, exec ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_TRUE, ( const void * )( exec ))
+#define na_object_set_show_if_running( obj, name ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_RUNNING, ( const void * )( name ))
+#define na_object_set_selection_count( obj, cond ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SELECTION_COUNT, ( const void * )( cond ))
+#define na_object_set_capabilities( obj, cap ) fma_ifactory_object_set_from_void(
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_CAPABILITITES, ( const void * )( cap ))
#ifdef NA_ENABLE_DEPRECATED
#define na_object_set_modified( obj, modified ) fma_iduplicable_set_modified( FMA_IDUPLICABLE( obj
), ( modified ))
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 39c3d52..a3b0a1e 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -80,7 +80,7 @@ libna_core_la_SOURCES = \
fma-icontext-factory.c \
fma-iduplicable.c \
fma-iexporter.c \
- na-ifactory-object.c \
+ fma-ifactory-object.c \
na-ifactory-provider.c \
na-iimporter.c \
na-iio-provider.c \
diff --git a/src/core/fma-icontext-factory.c b/src/core/fma-icontext-factory.c
index b564a5a..c06793b 100644
--- a/src/core/fma-icontext-factory.c
+++ b/src/core/fma-icontext-factory.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-ifactory-object-data.h>
+#include <api/fma-ifactory-object-data.h>
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
diff --git a/src/core/na-ifactory-object.c b/src/core/fma-ifactory-object.c
similarity index 64%
rename from src/core/na-ifactory-object.c
rename to src/core/fma-ifactory-object.c
index 8bad586..109da27 100644
--- a/src/core/na-ifactory-object.c
+++ b/src/core/fma-ifactory-object.c
@@ -33,29 +33,29 @@
#include <string.h>
-#include <api/na-ifactory-object.h>
+#include <api/fma-ifactory-object.h>
#include "na-factory-object.h"
/* private interface data
*/
-struct _NAIFactoryObjectInterfacePrivate {
+struct _FMAIFactoryObjectInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
static guint st_initializations = 0; /* interface initialization count */
static GType register_type( void );
-static void interface_base_init( NAIFactoryObjectInterface *klass );
-static void interface_base_finalize( NAIFactoryObjectInterface *klass );
+static void interface_base_init( FMAIFactoryObjectInterface *klass );
+static void interface_base_finalize( FMAIFactoryObjectInterface *klass );
-static guint ifactory_object_get_version( const NAIFactoryObject *instance );
+static guint ifactory_object_get_version( const FMAIFactoryObject *instance );
/*
* Registers the GType of this interface.
*/
GType
-na_ifactory_object_get_type( void )
+fma_ifactory_object_get_type( void )
{
static GType object_type = 0;
@@ -69,11 +69,11 @@ na_ifactory_object_get_type( void )
static GType
register_type( void )
{
- static const gchar *thisfn = "na_ifactory_object_register_type";
+ static const gchar *thisfn = "fma_ifactory_object_register_type";
GType type;
static const GTypeInfo info = {
- sizeof( NAIFactoryObjectInterface ),
+ sizeof( FMAIFactoryObjectInterface ),
( GBaseInitFunc ) interface_base_init,
( GBaseFinalizeFunc ) interface_base_finalize,
NULL,
@@ -86,7 +86,7 @@ register_type( void )
g_debug( "%s", thisfn );
- type = g_type_register_static( G_TYPE_INTERFACE, "NAIFactoryObject", &info, 0 );
+ type = g_type_register_static( G_TYPE_INTERFACE, "FMAIFactoryObject", &info, 0 );
g_type_interface_add_prerequisite( type, G_TYPE_OBJECT );
@@ -94,15 +94,15 @@ register_type( void )
}
static void
-interface_base_init( NAIFactoryObjectInterface *klass )
+interface_base_init( FMAIFactoryObjectInterface *klass )
{
- static const gchar *thisfn = "na_ifactory_object_interface_base_init";
+ static const gchar *thisfn = "fma_ifactory_object_interface_base_init";
if( !st_initializations ){
g_debug( "%s: klass=%p (%s)", thisfn, ( void * ) klass, G_OBJECT_CLASS_NAME( klass ));
- klass->private = g_new0( NAIFactoryObjectInterfacePrivate, 1 );
+ klass->private = g_new0( FMAIFactoryObjectInterfacePrivate, 1 );
klass->get_version = ifactory_object_get_version;
klass->get_groups = NULL;
@@ -119,9 +119,9 @@ interface_base_init( NAIFactoryObjectInterface *klass )
}
static void
-interface_base_finalize( NAIFactoryObjectInterface *klass )
+interface_base_finalize( FMAIFactoryObjectInterface *klass )
{
- static const gchar *thisfn = "na_ifactory_object_interface_base_finalize";
+ static const gchar *thisfn = "fma_ifactory_object_interface_base_finalize";
st_initializations -= 1;
@@ -134,17 +134,17 @@ interface_base_finalize( NAIFactoryObjectInterface *klass )
}
static guint
-ifactory_object_get_version( const NAIFactoryObject *instance )
+ifactory_object_get_version( const FMAIFactoryObject *instance )
{
return( 1 );
}
/**
- * na_ifactory_object_get_data_boxed:
- * @object: a #NAIFactoryObject object.
+ * fma_ifactory_object_get_data_boxed:
+ * @object: a #FMAIFactoryObject object.
* @name: the name of the elementary data we are searching for.
*
- * The returned #FMADataBoxed is owned by #NAIFactoryObject @object, and
+ * The returned #FMADataBoxed is owned by #FMAIFactoryObject @object, and
* should not be released by the caller.
*
* Returns: The #FMADataBoxed object which contains the specified data,
@@ -153,13 +153,13 @@ ifactory_object_get_version( const NAIFactoryObject *instance )
* Since: 2.30
*/
FMADataBoxed *
-na_ifactory_object_get_data_boxed( const NAIFactoryObject *object, const gchar *name )
+fma_ifactory_object_get_data_boxed( const FMAIFactoryObject *object, const gchar *name )
{
GList *list, *ip;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
- list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), FMA_IFACTORY_OBJECT_PROP_DATA );
/*g_debug( "list=%p (count=%u)", ( void * ) list, g_list_length( list ));*/
for( ip = list ; ip ; ip = ip->next ){
@@ -175,10 +175,10 @@ na_ifactory_object_get_data_boxed( const NAIFactoryObject *object, const gchar *
}
/**
- * na_ifactory_object_get_data_groups:
- * @object: a #NAIFactoryObject object.
+ * fma_ifactory_object_get_data_groups:
+ * @object: a #FMAIFactoryObject object.
*
- * The returned #FMADataGroup is owned by the #NAIFactoryObject @object,
+ * The returned #FMADataGroup is owned by the #FMAIFactoryObject @object,
* and should not be released by the caller.
*
* Returns: The #FMADataGroup groups definition, or %NULL.
@@ -186,24 +186,24 @@ na_ifactory_object_get_data_boxed( const NAIFactoryObject *object, const gchar *
* Since: 2.30
*/
FMADataGroup *
-na_ifactory_object_get_data_groups( const NAIFactoryObject *object )
+fma_ifactory_object_get_data_groups( const FMAIFactoryObject *object )
{
FMADataGroup *groups;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
groups = NULL;
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups ){
- groups = NA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups( object );
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups ){
+ groups = FMA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups( object );
}
return( groups );
}
/**
- * na_ifactory_object_get_as_void:
- * @object: this #NAIFactoryObject instance.
+ * fma_ifactory_object_get_as_void:
+ * @object: this #FMAIFactoryObject instance.
* @name: the elementary data whose value is to be got.
*
* If the type of the value is %NA_DATA_TYPE_STRING, %NA_DATA_TYPE_LOCALE_STRING,
@@ -216,16 +216,16 @@ na_ifactory_object_get_data_groups( const NAIFactoryObject *object )
* Since: 2.30
*/
void *
-na_ifactory_object_get_as_void( const NAIFactoryObject *object, const gchar *name )
+fma_ifactory_object_get_as_void( const FMAIFactoryObject *object, const gchar *name )
{
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
return( na_factory_object_get_as_void( object, name ));
}
/**
- * na_ifactory_object_set_from_void:
- * @object: this #NAIFactoryObject instance.
+ * fma_ifactory_object_set_from_void:
+ * @object: this #FMAIFactoryObject instance.
* @name: the name of the elementary data whose value is to be set.
* @data: the value to set.
*
@@ -234,9 +234,9 @@ na_ifactory_object_get_as_void( const NAIFactoryObject *object, const gchar *nam
* Since: 2.30
*/
void
-na_ifactory_object_set_from_void( NAIFactoryObject *object, const gchar *name, const void *data )
+fma_ifactory_object_set_from_void( FMAIFactoryObject *object, const gchar *name, const void *data )
{
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
na_factory_object_set_from_void( object, name, data );
}
diff --git a/src/core/na-factory-object.c b/src/core/na-factory-object.c
index 9194761..7163072 100644
--- a/src/core/na-factory-object.c
+++ b/src/core/na-factory-object.c
@@ -57,7 +57,7 @@ enum {
/* while iterating on read item
*/
typedef struct {
- NAIFactoryObject *object;
+ FMAIFactoryObject *object;
NAIFactoryProvider *reader;
void *reader_data;
GSList **messages;
@@ -77,7 +77,7 @@ typedef struct {
/* while iterating on is_valid
*/
typedef struct {
- NAIFactoryObject *object;
+ FMAIFactoryObject *object;
gboolean is_valid;
}
NafoValidIter;
@@ -85,7 +85,7 @@ typedef struct {
/* while iterating on set defaults
*/
typedef struct {
- NAIFactoryObject *object;
+ FMAIFactoryObject *object;
}
NafoDefaultIter;
@@ -96,19 +96,19 @@ static gboolean define_class_properties_iter( const FMADataDef *def, GObject
static gboolean set_defaults_iter( FMADataDef *def, NafoDefaultIter *data );
static gboolean is_valid_mandatory_iter( const FMADataDef *def, NafoValidIter *data );
static gboolean read_data_iter( FMADataDef *def, NafoReadIter *iter );
-static gboolean write_data_iter( const NAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteIter
*iter );
-
-static FMADataGroup *v_get_groups( const NAIFactoryObject *object );
-static void v_copy( NAIFactoryObject *target, const NAIFactoryObject *source );
-static gboolean v_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b );
-static gboolean v_is_valid( const NAIFactoryObject *object );
-static void v_read_start( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
-static void v_read_done( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
-static guint v_write_start( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
-static guint v_write_done( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
-
-static void attach_boxed_to_object( NAIFactoryObject *object, FMADataBoxed *boxed );
-static void free_data_boxed_list( NAIFactoryObject *object );
+static gboolean write_data_iter( const FMAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteIter
*iter );
+
+static FMADataGroup *v_get_groups( const FMAIFactoryObject *object );
+static void v_copy( FMAIFactoryObject *target, const FMAIFactoryObject *source );
+static gboolean v_are_equal( const FMAIFactoryObject *a, const FMAIFactoryObject *b );
+static gboolean v_is_valid( const FMAIFactoryObject *object );
+static void v_read_start( FMAIFactoryObject *serializable, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
+static void v_read_done( FMAIFactoryObject *serializable, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
+static guint v_write_start( FMAIFactoryObject *serializable, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
+static guint v_write_done( FMAIFactoryObject *serializable, const NAIFactoryProvider *reader, void
*reader_data, GSList **messages );
+
+static void attach_boxed_to_object( FMAIFactoryObject *object, FMADataBoxed *boxed );
+static void free_data_boxed_list( FMAIFactoryObject *object );
static void iter_on_data_defs( const FMADataGroup *idgroups, guint mode, FMADataDefIterFunc pfn,
void *user_data );
/*
@@ -158,17 +158,17 @@ define_class_properties_iter( const FMADataDef *def, GObjectClass *class )
/*
* na_factory_object_get_data_def:
- * @object: this #NAIFactoryObject object.
+ * @object: this #FMAIFactoryObject object.
* @name: the searched name.
*
* Returns: the #FMADataDef structure which describes this @name, or %NULL.
*/
FMADataDef *
-na_factory_object_get_data_def( const NAIFactoryObject *object, const gchar *name )
+na_factory_object_get_data_def( const FMAIFactoryObject *object, const gchar *name )
{
FMADataDef *def;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
def = NULL;
@@ -193,16 +193,16 @@ na_factory_object_get_data_def( const NAIFactoryObject *object, const gchar *nam
/*
* na_factory_object_get_data_groups:
- * @object: the #NAIFactoryObject instance.
+ * @object: the #FMAIFactoryObject instance.
*
* Returns: a pointer to the list of #FMADataGroup which define the data.
*/
FMADataGroup *
-na_factory_object_get_data_groups( const NAIFactoryObject *object )
+na_factory_object_get_data_groups( const FMAIFactoryObject *object )
{
FMADataGroup *groups;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
groups = v_get_groups( object );
@@ -211,7 +211,7 @@ na_factory_object_get_data_groups( const NAIFactoryObject *object )
/*
* na_factory_object_iter_on_boxed:
- * @object: this #NAIFactoryObject object.
+ * @object: this #FMAIFactoryObject object.
* @pfn: the function to be called.
* @user_data: data to be provided to the user function.
*
@@ -220,14 +220,14 @@ na_factory_object_get_data_groups( const NAIFactoryObject *object )
* The @fn called function may return %TRUE to stop the iteration.
*/
void
-na_factory_object_iter_on_boxed( const NAIFactoryObject *object, NAFactoryObjectIterBoxedFn pfn, void
*user_data )
+na_factory_object_iter_on_boxed( const FMAIFactoryObject *object, NAFactoryObjectIterBoxedFn pfn, void
*user_data )
{
GList *list, *ibox;
gboolean stop;
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
- list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), FMA_IFACTORY_OBJECT_PROP_DATA );
/*g_debug( "list=%p (count=%u)", ( void * ) list, g_list_length( list ));*/
stop = FALSE;
@@ -238,20 +238,20 @@ na_factory_object_iter_on_boxed( const NAIFactoryObject *object, NAFactoryObject
/*
* na_factory_object_get_default:
- * @object: this #NAIFactoryObject object.
+ * @object: this #FMAIFactoryObject object.
* @name: the searched name.
*
* Returns: the default value for this @object, as a newly allocated
* string which should be g_free() by the caller.
*/
gchar *
-na_factory_object_get_default( NAIFactoryObject *object, const gchar *name )
+na_factory_object_get_default( FMAIFactoryObject *object, const gchar *name )
{
static const gchar *thisfn = "na_factory_object_set_defaults";
gchar *value;
FMADataDef *def;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
value = NULL;
@@ -267,18 +267,18 @@ na_factory_object_get_default( NAIFactoryObject *object, const gchar *name )
/*
* na_factory_object_set_defaults:
- * @object: this #NAIFactoryObject object.
+ * @object: this #FMAIFactoryObject object.
*
* Implement default values in this new @object.
*/
void
-na_factory_object_set_defaults( NAIFactoryObject *object )
+na_factory_object_set_defaults( FMAIFactoryObject *object )
{
static const gchar *thisfn = "na_factory_object_set_defaults";
FMADataGroup *groups;
NafoDefaultIter *iter_data;
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
@@ -297,7 +297,7 @@ na_factory_object_set_defaults( NAIFactoryObject *object )
}
/*
- * because this function is called very early in the NAIFactoryObject life,
+ * because this function is called very early in the FMAIFactoryObject life,
* we assume here that if a FMADataBoxed has been allocated, then this is
* most probably because it is set. Thus a 'null' value is not considered
* as an 'unset' value.
@@ -305,7 +305,7 @@ na_factory_object_set_defaults( NAIFactoryObject *object )
static gboolean
set_defaults_iter( FMADataDef *def, NafoDefaultIter *data )
{
- FMADataBoxed *boxed = na_ifactory_object_get_data_boxed( data->object, def->name );
+ FMADataBoxed *boxed = fma_ifactory_object_get_data_boxed( data->object, def->name );
if( !boxed ){
boxed = fma_data_boxed_new( def );
@@ -319,24 +319,24 @@ set_defaults_iter( FMADataDef *def, NafoDefaultIter *data )
/*
* na_factory_object_move_boxed:
- * @target: the target #NAIFactoryObject instance.
- * @source: the source #NAIFactoryObject instance.
+ * @target: the target #FMAIFactoryObject instance.
+ * @source: the source #FMAIFactoryObject instance.
* @boxed: a #FMADataBoxed.
*
* Move the @boxed from @source to @target, detaching from @source list
* to be attached to @target one.
*/
void
-na_factory_object_move_boxed( NAIFactoryObject *target, const NAIFactoryObject *source, FMADataBoxed *boxed )
+na_factory_object_move_boxed( FMAIFactoryObject *target, const FMAIFactoryObject *source, FMADataBoxed
*boxed )
{
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( target ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( source ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( target ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( source ));
- GList *src_list = g_object_get_data( G_OBJECT( source ), NA_IFACTORY_OBJECT_PROP_DATA );
+ GList *src_list = g_object_get_data( G_OBJECT( source ), FMA_IFACTORY_OBJECT_PROP_DATA );
if( g_list_find( src_list, boxed )){
src_list = g_list_remove( src_list, boxed );
- g_object_set_data( G_OBJECT( source ), NA_IFACTORY_OBJECT_PROP_DATA, src_list );
+ g_object_set_data( G_OBJECT( source ), FMA_IFACTORY_OBJECT_PROP_DATA, src_list );
attach_boxed_to_object( target, boxed );
@@ -348,14 +348,14 @@ na_factory_object_move_boxed( NAIFactoryObject *target, const NAIFactoryObject *
/*
* na_factory_object_copy:
- * @target: the target #NAIFactoryObject instance.
- * @source: the source #NAIFactoryObject instance.
+ * @target: the target #FMAIFactoryObject instance.
+ * @source: the source #FMAIFactoryObject instance.
*
* Copies one instance to another.
* Takes care of not overriding provider data.
*/
void
-na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source )
+na_factory_object_copy( FMAIFactoryObject *target, const FMAIFactoryObject *source )
{
static const gchar *thisfn = "na_factory_object_copy";
GList *dest_list, *idest, *inext;
@@ -364,8 +364,8 @@ na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source
const FMADataDef *def;
void *provider, *provider_data;
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( target ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( source ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( target ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( source ));
g_debug( "%s: target=%p (%s), source=%p (%s)",
thisfn,
@@ -377,7 +377,7 @@ na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source
provider = na_object_get_provider( target );
provider_data = na_object_get_provider_data( target );
- idest = dest_list = g_object_get_data( G_OBJECT( target ), NA_IFACTORY_OBJECT_PROP_DATA );
+ idest = dest_list = g_object_get_data( G_OBJECT( target ), FMA_IFACTORY_OBJECT_PROP_DATA );
while( idest ){
boxed = FMA_DATA_BOXED( idest->data );
inext = idest->next;
@@ -388,16 +388,16 @@ na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source
}
idest = inext;
}
- g_object_set_data( G_OBJECT( target ), NA_IFACTORY_OBJECT_PROP_DATA, dest_list );
+ g_object_set_data( G_OBJECT( target ), FMA_IFACTORY_OBJECT_PROP_DATA, dest_list );
/* only then copy copyable data from source
*/
- src_list = g_object_get_data( G_OBJECT( source ), NA_IFACTORY_OBJECT_PROP_DATA );
+ src_list = g_object_get_data( G_OBJECT( source ), FMA_IFACTORY_OBJECT_PROP_DATA );
for( isrc = src_list ; isrc ; isrc = isrc->next ){
boxed = FMA_DATA_BOXED( isrc->data );
def = fma_data_boxed_get_data_def( boxed );
if( def->copyable ){
- FMADataBoxed *tgt_boxed = na_ifactory_object_get_data_boxed( target, def->name );
+ FMADataBoxed *tgt_boxed = fma_ifactory_object_get_data_boxed( target, def->name );
if( !tgt_boxed ){
tgt_boxed = fma_data_boxed_new( def );
attach_boxed_to_object( target, tgt_boxed );
@@ -418,13 +418,13 @@ na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source
/*
* na_factory_object_are_equal:
- * @a: the first (original) #NAIFactoryObject instance.
- * @b: the second (current) #NAIFactoryObject isntance.
+ * @a: the first (original) #FMAIFactoryObject instance.
+ * @b: the second (current) #FMAIFactoryObject isntance.
*
* Returns: %TRUE if @a is equal to @b, %FALSE else.
*/
gboolean
-na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b )
+na_factory_object_are_equal( const FMAIFactoryObject *a, const FMAIFactoryObject *b )
{
static const gchar *thisfn = "na_factory_object_are_equal";
gboolean are_equal;
@@ -432,8 +432,8 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
are_equal = FALSE;
- a_list = g_object_get_data( G_OBJECT( a ), NA_IFACTORY_OBJECT_PROP_DATA );
- b_list = g_object_get_data( G_OBJECT( b ), NA_IFACTORY_OBJECT_PROP_DATA );
+ a_list = g_object_get_data( G_OBJECT( a ), FMA_IFACTORY_OBJECT_PROP_DATA );
+ b_list = g_object_get_data( G_OBJECT( b ), FMA_IFACTORY_OBJECT_PROP_DATA );
g_debug( "%s: a=%p, b=%p", thisfn, ( void * ) a, ( void * ) b );
@@ -444,7 +444,7 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
const FMADataDef *a_def = fma_data_boxed_get_data_def( a_boxed );
if( a_def->comparable ){
- FMADataBoxed *b_boxed = na_ifactory_object_get_data_boxed( b, a_def->name );
+ FMADataBoxed *b_boxed = fma_ifactory_object_get_data_boxed( b, a_def->name );
if( b_boxed ){
are_equal = fma_boxed_are_equal( FMA_BOXED( a_boxed ), FMA_BOXED( b_boxed ));
if( !are_equal ){
@@ -464,7 +464,7 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
const FMADataDef *b_def = fma_data_boxed_get_data_def( b_boxed );
if( b_def->comparable ){
- FMADataBoxed *a_boxed = na_ifactory_object_get_data_boxed( a, b_def->name );
+ FMADataBoxed *a_boxed = fma_ifactory_object_get_data_boxed( a, b_def->name );
if( !a_boxed ){
are_equal = FALSE;
g_debug( "%s: %s not equal as %s was not set", thisfn, G_OBJECT_TYPE_NAME( a
), b_def->name );
@@ -479,29 +479,29 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
/*
* na_factory_object_is_valid:
- * @object: the #NAIFactoryObject instance whose validity is to be checked.
+ * @object: the #FMAIFactoryObject instance whose validity is to be checked.
*
* Returns: %TRUE if @object is valid, %FALSE else.
*/
gboolean
-na_factory_object_is_valid( const NAIFactoryObject *object )
+na_factory_object_is_valid( const FMAIFactoryObject *object )
{
static const gchar *thisfn = "na_factory_object_is_valid";
gboolean is_valid;
FMADataGroup *groups;
GList *list, *iv;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), FALSE );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), FALSE );
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
- list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), FMA_IFACTORY_OBJECT_PROP_DATA );
is_valid = TRUE;
/* mandatory data must be set
*/
NafoValidIter iter_data;
- iter_data.object = ( NAIFactoryObject * ) object;
+ iter_data.object = ( FMAIFactoryObject * ) object;
iter_data.is_valid = TRUE;
groups = v_get_groups( object );
@@ -525,7 +525,7 @@ is_valid_mandatory_iter( const FMADataDef *def, NafoValidIter *data )
FMADataBoxed *boxed;
if( def->mandatory ){
- boxed = na_ifactory_object_get_data_boxed( data->object, def->name );
+ boxed = fma_ifactory_object_get_data_boxed( data->object, def->name );
if( !boxed ){
g_debug( "na_factory_object_is_valid_mandatory_iter: invalid %s: mandatory but not
set", def->name );
data->is_valid = FALSE;
@@ -538,12 +538,12 @@ is_valid_mandatory_iter( const FMADataDef *def, NafoValidIter *data )
/*
* na_factory_object_dump:
- * @object: this #NAIFactoryObject instance.
+ * @object: this #FMAIFactoryObject instance.
*
* Dumps the content of @object.
*/
void
-na_factory_object_dump( const NAIFactoryObject *object )
+na_factory_object_dump( const FMAIFactoryObject *object )
{
static const gchar *thisfn = "na_factory_object_dump";
static const gchar *prefix = "na-factory-data-";
@@ -553,7 +553,7 @@ na_factory_object_dump( const NAIFactoryObject *object )
length = 0;
l_prefix = strlen( prefix );
- list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), FMA_IFACTORY_OBJECT_PROP_DATA );
for( it = list ; it ; it = it->next ){
FMADataBoxed *boxed = FMA_DATA_BOXED( it->data );
@@ -575,19 +575,19 @@ na_factory_object_dump( const NAIFactoryObject *object )
/*
* na_factory_object_finalize:
- * @object: the #NAIFactoryObject being finalized.
+ * @object: the #FMAIFactoryObject being finalized.
*
* Clears all data associated with this @object.
*/
void
-na_factory_object_finalize( NAIFactoryObject *object )
+na_factory_object_finalize( FMAIFactoryObject *object )
{
free_data_boxed_list( object );
}
/*
* na_factory_object_read_item:
- * @object: this #NAIFactoryObject instance.
+ * @object: this #FMAIFactoryObject instance.
* @reader: the #NAIFactoryProvider which is at the origin of this read.
* @reader_data: reader data.
* @messages: a pointer to a #GSList list of strings; the implementation
@@ -596,11 +596,11 @@ na_factory_object_finalize( NAIFactoryObject *object )
* Unserializes the object.
*/
void
-na_factory_object_read_item( NAIFactoryObject *object, const NAIFactoryProvider *reader, void *reader_data,
GSList **messages )
+na_factory_object_read_item( FMAIFactoryObject *object, const NAIFactoryProvider *reader, void *reader_data,
GSList **messages )
{
static const gchar *thisfn = "na_factory_object_read_item";
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
FMADataGroup *groups = v_get_groups( object );
@@ -636,7 +636,7 @@ read_data_iter( FMADataDef *def, NafoReadIter *iter )
FMADataBoxed *boxed = na_factory_provider_read_data( iter->reader, iter->reader_data, iter->object,
def, iter->messages );
if( boxed ){
- FMADataBoxed *exist = na_ifactory_object_get_data_boxed( iter->object, def->name );
+ FMADataBoxed *exist = fma_ifactory_object_get_data_boxed( iter->object, def->name );
if( exist ){
fma_boxed_set_from_boxed( FMA_BOXED( exist ), FMA_BOXED( boxed ));
@@ -652,7 +652,7 @@ read_data_iter( FMADataDef *def, NafoReadIter *iter )
/*
* na_factory_object_write_item:
- * @object: this #NAIFactoryObject instance.
+ * @object: this #FMAIFactoryObject instance.
* @writer: the #NAIFactoryProvider which is at the origin of this write.
* @writer_data: writer data.
* @messages: a pointer to a #GSList list of strings; the implementation
@@ -663,14 +663,14 @@ read_data_iter( FMADataDef *def, NafoReadIter *iter )
* Returns: a NAIIOProvider operation return code.
*/
guint
-na_factory_object_write_item( NAIFactoryObject *object, const NAIFactoryProvider *writer, void *writer_data,
GSList **messages )
+na_factory_object_write_item( FMAIFactoryObject *object, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages )
{
static const gchar *thisfn = "na_factory_object_write_item";
guint code;
FMADataGroup *groups;
gchar *msg;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), 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( NA_IS_IFACTORY_PROVIDER( writer ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
code = NA_IIO_PROVIDER_CODE_PROGRAM_ERROR;
@@ -709,7 +709,7 @@ na_factory_object_write_item( NAIFactoryObject *object, const NAIFactoryProvider
}
static gboolean
-write_data_iter( const NAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteIter *iter )
+write_data_iter( const FMAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteIter *iter )
{
const FMADataDef *def = fma_data_boxed_get_data_def( boxed );
@@ -723,7 +723,7 @@ write_data_iter( const NAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteI
/*
* na_factory_object_get_as_value:
- * @object: this #NAIFactoryObject instance.
+ * @object: this #FMAIFactoryObject instance.
* @name: the elementary data id.
* @value: the #GValue to be set.
*
@@ -733,15 +733,15 @@ write_data_iter( const NAIFactoryObject *object, FMADataBoxed *boxed, NafoWriteI
* This is to be read as "set value from data element".
*/
void
-na_factory_object_get_as_value( const NAIFactoryObject *object, const gchar *name, GValue *value )
+na_factory_object_get_as_value( const FMAIFactoryObject *object, const gchar *name, GValue *value )
{
FMADataBoxed *boxed;
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
g_value_unset( value );
- boxed = na_ifactory_object_get_data_boxed( object, name );
+ boxed = fma_ifactory_object_get_data_boxed( object, name );
if( boxed ){
fma_boxed_get_as_value( FMA_BOXED( boxed ), value );
}
@@ -749,7 +749,7 @@ na_factory_object_get_as_value( const NAIFactoryObject *object, const gchar *nam
/*
* na_factory_object_get_as_void:
- * @object: this #NAIFactoryObject instance.
+ * @object: this #FMAIFactoryObject instance.
* @name: the elementary data whose value is to be got.
*
* Returns: the searched value.
@@ -760,16 +760,16 @@ na_factory_object_get_as_value( const NAIFactoryObject *object, const gchar *nam
* by the caller.
*/
void *
-na_factory_object_get_as_void( const NAIFactoryObject *object, const gchar *name )
+na_factory_object_get_as_void( const FMAIFactoryObject *object, const gchar *name )
{
void *value;
FMADataBoxed *boxed;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
value = NULL;
- boxed = na_ifactory_object_get_data_boxed( object, name );
+ boxed = fma_ifactory_object_get_data_boxed( object, name );
if( boxed ){
value = fma_boxed_get_as_void( FMA_BOXED( boxed ));
}
@@ -779,26 +779,26 @@ na_factory_object_get_as_void( const NAIFactoryObject *object, const gchar *name
/*
* na_factory_object_is_set:
- * @object: this #NAIFactoryObject instance.
+ * @object: this #FMAIFactoryObject instance.
* @name: the elementary data whose value is to be tested.
*
* Returns: %TRUE if the value is set (may be %NULL), %FALSE else.
*/
gboolean
-na_factory_object_is_set( const NAIFactoryObject *object, const gchar *name )
+na_factory_object_is_set( const FMAIFactoryObject *object, const gchar *name )
{
FMADataBoxed *boxed;
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), FALSE );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), FALSE );
- boxed = na_ifactory_object_get_data_boxed( object, name );
+ boxed = fma_ifactory_object_get_data_boxed( object, name );
return( boxed != NULL );
}
/*
* na_factory_object_set_from_value:
- * @object: this #NAIFactoryObject instance.
+ * @object: this #FMAIFactoryObject instance.
* @name: the elementary data id.
* @value: the #GValue whose content is to be got.
*
@@ -806,13 +806,13 @@ na_factory_object_is_set( const NAIFactoryObject *object, const gchar *name )
* attached to @property_id.
*/
void
-na_factory_object_set_from_value( NAIFactoryObject *object, const gchar *name, const GValue *value )
+na_factory_object_set_from_value( FMAIFactoryObject *object, const gchar *name, const GValue *value )
{
static const gchar *thisfn = "na_factory_object_set_from_value";
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
- FMADataBoxed *boxed = na_ifactory_object_get_data_boxed( object, name );
+ FMADataBoxed *boxed = fma_ifactory_object_get_data_boxed( object, name );
if( boxed ){
fma_boxed_set_from_value( FMA_BOXED( boxed ), value );
@@ -831,20 +831,20 @@ na_factory_object_set_from_value( NAIFactoryObject *object, const gchar *name, c
/*
* na_factory_object_set_from_void:
- * @object: this #NAIFactoryObject instance.
+ * @object: this #FMAIFactoryObject instance.
* @name: the elementary data whose value is to be set.
* @data: the value to set.
*
* Set the elementary data with the given value.
*/
void
-na_factory_object_set_from_void( NAIFactoryObject *object, const gchar *name, const void *data )
+na_factory_object_set_from_void( FMAIFactoryObject *object, const gchar *name, const void *data )
{
static const gchar *thisfn = "na_factory_object_set_from_void";
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
- FMADataBoxed *boxed = na_ifactory_object_get_data_boxed( object, name );
+ FMADataBoxed *boxed = fma_ifactory_object_get_data_boxed( object, name );
if( boxed ){
fma_boxed_set_from_void( FMA_BOXED( boxed ), data );
@@ -862,102 +862,102 @@ na_factory_object_set_from_void( NAIFactoryObject *object, const gchar *name, co
}
static FMADataGroup *
-v_get_groups( const NAIFactoryObject *object )
+v_get_groups( const FMAIFactoryObject *object )
{
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups ){
- return( NA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups( object ));
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups ){
+ return( FMA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_groups( object ));
}
return( NULL );
}
static void
-v_copy( NAIFactoryObject *target, const NAIFactoryObject *source )
+v_copy( FMAIFactoryObject *target, const FMAIFactoryObject *source )
{
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( target )->copy ){
- NA_IFACTORY_OBJECT_GET_INTERFACE( target )->copy( target, source );
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( target )->copy ){
+ FMA_IFACTORY_OBJECT_GET_INTERFACE( target )->copy( target, source );
}
}
static gboolean
-v_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b )
+v_are_equal( const FMAIFactoryObject *a, const FMAIFactoryObject *b )
{
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( a )->are_equal ){
- return( NA_IFACTORY_OBJECT_GET_INTERFACE( a )->are_equal( a, b ));
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( a )->are_equal ){
+ return( FMA_IFACTORY_OBJECT_GET_INTERFACE( a )->are_equal( a, b ));
}
return( TRUE );
}
static gboolean
-v_is_valid( const NAIFactoryObject *object )
+v_is_valid( const FMAIFactoryObject *object )
{
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( object )->is_valid ){
- return( NA_IFACTORY_OBJECT_GET_INTERFACE( object )->is_valid( object ));
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( object )->is_valid ){
+ return( FMA_IFACTORY_OBJECT_GET_INTERFACE( object )->is_valid( object ));
}
return( TRUE );
}
static void
-v_read_start( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList
**messages )
+v_read_start( FMAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList
**messages )
{
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_start ){
- NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_start( serializable, reader,
reader_data, messages );
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_start ){
+ FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_start( serializable, reader,
reader_data, messages );
}
}
static void
-v_read_done( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList
**messages )
+v_read_done( FMAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList
**messages )
{
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_done ){
- NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_done( serializable, reader,
reader_data, messages );
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_done ){
+ FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_done( serializable, reader,
reader_data, messages );
}
}
static guint
-v_write_start( NAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList
**messages )
+v_write_start( FMAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList
**messages )
{
guint code = NA_IIO_PROVIDER_CODE_OK;
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_start ){
- code = NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_start( serializable, writer,
writer_data, messages );
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_start ){
+ code = FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_start( serializable, writer,
writer_data, messages );
}
return( code );
}
static guint
-v_write_done( NAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList
**messages )
+v_write_done( FMAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList
**messages )
{
guint code = NA_IIO_PROVIDER_CODE_OK;
- if( NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_done ){
- code = NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_done( serializable, writer,
writer_data, messages );
+ if( FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_done ){
+ code = FMA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_done( serializable, writer,
writer_data, messages );
}
return( code );
}
static void
-attach_boxed_to_object( NAIFactoryObject *object, FMADataBoxed *boxed )
+attach_boxed_to_object( FMAIFactoryObject *object, FMADataBoxed *boxed )
{
- GList *list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
+ GList *list = g_object_get_data( G_OBJECT( object ), FMA_IFACTORY_OBJECT_PROP_DATA );
list = g_list_prepend( list, boxed );
- g_object_set_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA, list );
+ g_object_set_data( G_OBJECT( object ), FMA_IFACTORY_OBJECT_PROP_DATA, list );
}
static void
-free_data_boxed_list( NAIFactoryObject *object )
+free_data_boxed_list( FMAIFactoryObject *object )
{
GList *list;
- list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), FMA_IFACTORY_OBJECT_PROP_DATA );
g_list_foreach( list, ( GFunc ) g_object_unref, NULL );
g_list_free( list );
- g_object_set_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA, NULL );
+ g_object_set_data( G_OBJECT( object ), FMA_IFACTORY_OBJECT_PROP_DATA, NULL );
}
/*
diff --git a/src/core/na-factory-object.h b/src/core/na-factory-object.h
index e3ed2d4..8f1af74 100644
--- a/src/core/na-factory-object.h
+++ b/src/core/na-factory-object.h
@@ -30,8 +30,8 @@
#ifndef __CORE_NA_FACTORY_OBJECT_H__
#define __CORE_NA_FACTORY_OBJECT_H__
-/* @title: NAIFactoryObject
- * @short_description: The #NAIFactoryObject Internal Functions
+/* @title: FMAIFactoryObject
+ * @short_description: The #FMAIFactoryObject Internal Functions
* @include: core/na-factory-object.h
*
* Declare the function only accessed from core library, i.e. not
@@ -42,35 +42,35 @@
G_BEGIN_DECLS
-typedef gboolean ( *NAFactoryObjectIterBoxedFn )( const NAIFactoryObject *object, FMADataBoxed *boxed, void
*data );
+typedef gboolean ( *NAFactoryObjectIterBoxedFn )( const FMAIFactoryObject *object, FMADataBoxed *boxed, void
*data );
-#define NA_IFACTORY_OBJECT_PROP_DATA "na-ifactory-object-prop-data"
+#define FMA_IFACTORY_OBJECT_PROP_DATA "fma-ifactory-object-prop-data"
void na_factory_object_define_properties( GObjectClass *class, const FMADataGroup *groups );
-FMADataDef *na_factory_object_get_data_def ( const NAIFactoryObject *object, const gchar *name );
-FMADataGroup *na_factory_object_get_data_groups ( const NAIFactoryObject *object );
-void na_factory_object_iter_on_boxed ( const NAIFactoryObject *object, NAFactoryObjectIterBoxedFn
pfn, void *user_data );
+FMADataDef *na_factory_object_get_data_def ( const FMAIFactoryObject *object, const gchar *name );
+FMADataGroup *na_factory_object_get_data_groups ( const FMAIFactoryObject *object );
+void na_factory_object_iter_on_boxed ( const FMAIFactoryObject *object,
NAFactoryObjectIterBoxedFn pfn, void *user_data );
-gchar *na_factory_object_get_default ( NAIFactoryObject *object, const gchar *name );
-void na_factory_object_set_defaults ( NAIFactoryObject *object );
+gchar *na_factory_object_get_default ( FMAIFactoryObject *object, const gchar *name );
+void na_factory_object_set_defaults ( FMAIFactoryObject *object );
-void na_factory_object_move_boxed ( NAIFactoryObject *target, const NAIFactoryObject *source,
FMADataBoxed *boxed );
+void na_factory_object_move_boxed ( FMAIFactoryObject *target, const FMAIFactoryObject
*source, FMADataBoxed *boxed );
-void na_factory_object_copy ( NAIFactoryObject *target, const NAIFactoryObject *source );
-gboolean na_factory_object_are_equal ( const NAIFactoryObject *a, const NAIFactoryObject *b );
-gboolean na_factory_object_is_valid ( const NAIFactoryObject *object );
-void na_factory_object_dump ( const NAIFactoryObject *object );
-void na_factory_object_finalize ( NAIFactoryObject *object );
+void na_factory_object_copy ( FMAIFactoryObject *target, const FMAIFactoryObject *source
);
+gboolean na_factory_object_are_equal ( const FMAIFactoryObject *a, const FMAIFactoryObject *b );
+gboolean na_factory_object_is_valid ( const FMAIFactoryObject *object );
+void na_factory_object_dump ( const FMAIFactoryObject *object );
+void na_factory_object_finalize ( FMAIFactoryObject *object );
-void na_factory_object_read_item ( NAIFactoryObject *object, const NAIFactoryProvider
*reader, void *reader_data, GSList **messages );
-guint na_factory_object_write_item ( NAIFactoryObject *object, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
+void na_factory_object_read_item ( FMAIFactoryObject *object, const NAIFactoryProvider
*reader, void *reader_data, GSList **messages );
+guint na_factory_object_write_item ( FMAIFactoryObject *object, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
-void *na_factory_object_get_as_void ( const NAIFactoryObject *object, const gchar *name );
-void na_factory_object_get_as_value ( const NAIFactoryObject *object, const gchar *name, GValue
*value );
-gboolean na_factory_object_is_set ( const NAIFactoryObject *object, const gchar *name );
+void *na_factory_object_get_as_void ( const FMAIFactoryObject *object, const gchar *name );
+void na_factory_object_get_as_value ( const FMAIFactoryObject *object, const gchar *name, GValue
*value );
+gboolean na_factory_object_is_set ( const FMAIFactoryObject *object, const gchar *name );
-void na_factory_object_set_from_value ( NAIFactoryObject *object, const gchar *name, const GValue
*value );
-void na_factory_object_set_from_void ( NAIFactoryObject *object, const gchar *name, const void
*data );
+void na_factory_object_set_from_value ( FMAIFactoryObject *object, const gchar *name, const GValue
*value );
+void na_factory_object_set_from_void ( FMAIFactoryObject *object, const gchar *name, const void
*data );
G_END_DECLS
diff --git a/src/core/na-factory-provider.c b/src/core/na-factory-provider.c
index e7e2392..213874b 100644
--- a/src/core/na-factory-provider.c
+++ b/src/core/na-factory-provider.c
@@ -50,13 +50,13 @@
*/
FMADataBoxed *
na_factory_provider_read_data( const NAIFactoryProvider *reader, void *reader_data,
- const NAIFactoryObject *object, const
FMADataDef *def,
+ const FMAIFactoryObject *object, const
FMADataDef *def,
GSList **messages )
{
FMADataBoxed *boxed;
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( reader ), NULL );
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
boxed = NULL;
@@ -80,13 +80,13 @@ na_factory_provider_read_data( const NAIFactoryProvider *reader, void *reader_da
*/
guint
na_factory_provider_write_data( const NAIFactoryProvider *writer, void *writer_data,
- const NAIFactoryObject *object, const
FMADataBoxed *boxed,
+ const FMAIFactoryObject *object, const
FMADataBoxed *boxed,
GSList **messages )
{
guint code;
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( writer ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
code = NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN;
diff --git a/src/core/na-factory-provider.h b/src/core/na-factory-provider.h
index b02c730..35e5af4 100644
--- a/src/core/na-factory-provider.h
+++ b/src/core/na-factory-provider.h
@@ -43,11 +43,11 @@
G_BEGIN_DECLS
FMADataBoxed *na_factory_provider_read_data ( const NAIFactoryProvider *reader, void *reader_data,
- const NAIFactoryObject *object, const
FMADataDef *def,
+ const FMAIFactoryObject *object,
const FMADataDef *def,
GSList **messages );
guint na_factory_provider_write_data( const NAIFactoryProvider *writer, void *writer_data,
- const NAIFactoryObject *object, const
FMADataBoxed *boxed,
+ const FMAIFactoryObject *object,
const FMADataBoxed *boxed,
GSList **messages );
G_END_DECLS
diff --git a/src/core/na-ifactory-provider.c b/src/core/na-ifactory-provider.c
index d7848ce..c3cb2cd 100644
--- a/src/core/na-ifactory-provider.c
+++ b/src/core/na-ifactory-provider.c
@@ -51,10 +51,10 @@ static void interface_base_finalize( NAIFactoryProviderInterface *klass );
static guint ifactory_provider_get_version( const NAIFactoryProvider *instance );
-static void v_factory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data,
NAIFactoryObject *serializable, GSList **messages );
-static void v_factory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data,
NAIFactoryObject *serializable, GSList **messages );
-static guint v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_data,
NAIFactoryObject *serializable, GSList **messages );
-static guint v_factory_provider_write_done( const NAIFactoryProvider *writer, void *writer_data,
NAIFactoryObject *serializable, GSList **messages );
+static void v_factory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data,
FMAIFactoryObject *serializable, GSList **messages );
+static void v_factory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data,
FMAIFactoryObject *serializable, GSList **messages );
+static guint v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_data,
FMAIFactoryObject *serializable, GSList **messages );
+static guint v_factory_provider_write_done( const NAIFactoryProvider *writer, void *writer_data,
FMAIFactoryObject *serializable, GSList **messages );
/**
* na_ifactory_provider_get_type:
@@ -151,7 +151,7 @@ ifactory_provider_get_version( const NAIFactoryProvider *instance )
* @reader: the instance which implements this #NAIFactoryProvider interface.
* @reader_data: instance data which will be provided back to the interface
* methods
- * @object: the #NAIFactoryObject object to be unserialilzed.
+ * @object: the #FMAIFactoryObject object to be unserialilzed.
* @messages: a pointer to a #GSList list of strings; the implementation
* may append messages to this list, but shouldn't reinitialize it.
*
@@ -177,7 +177,7 @@ ifactory_provider_get_version( const NAIFactoryProvider *instance )
* na_ifactory_provider_read_item(
* NA_IFACTORY_PROVIDER( provider ),
* data,
- * NA_IFACTORY_OBJECT( item ),
+ * FMA_IFACTORY_OBJECT( item ),
* messages );
* </programlisting>
* </example>
@@ -185,10 +185,10 @@ ifactory_provider_get_version( const NAIFactoryProvider *instance )
* Since: 2.30
*/
void
-na_ifactory_provider_read_item( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject
*object, GSList **messages )
+na_ifactory_provider_read_item( const NAIFactoryProvider *reader, void *reader_data, FMAIFactoryObject
*object, GSList **messages )
{
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
v_factory_provider_read_start( reader, reader_data, object, messages );
na_factory_object_read_item( object, reader, reader_data, messages );
@@ -199,7 +199,7 @@ na_ifactory_provider_read_item( const NAIFactoryProvider *reader, void *reader_d
* na_ifactory_provider_write_item:
* @writer: the instance which implements this #NAIFactoryProvider interface.
* @writer_data: instance data.
- * @object: the #NAIFactoryObject derived object to be serialized.
+ * @object: the #FMAIFactoryObject derived object to be serialized.
* @messages: a pointer to a #GSList list of strings; the implementation
* may append messages to this list, but shouldn't reinitialize it.
*
@@ -211,13 +211,13 @@ na_ifactory_provider_read_item( const NAIFactoryProvider *reader, void *reader_d
* Since: 2.30
*/
guint
-na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject
*object, GSList **messages )
+na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_data, FMAIFactoryObject
*object, GSList **messages )
{
static const gchar *thisfn = "na_ifactory_provider_write_item";
guint code;
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( writer ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NA_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 ));
@@ -236,7 +236,7 @@ na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_
}
static void
-v_factory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject
*serializable, GSList **messages )
+v_factory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, FMAIFactoryObject
*serializable, GSList **messages )
{
if( NA_IFACTORY_PROVIDER_GET_INTERFACE( reader )->read_start ){
NA_IFACTORY_PROVIDER_GET_INTERFACE( reader )->read_start( reader, reader_data, serializable,
messages );
@@ -244,7 +244,7 @@ v_factory_provider_read_start( const NAIFactoryProvider *reader, void *reader_da
}
static void
-v_factory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject
*serializable, GSList **messages )
+v_factory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, FMAIFactoryObject
*serializable, GSList **messages )
{
if( NA_IFACTORY_PROVIDER_GET_INTERFACE( reader )->read_done ){
NA_IFACTORY_PROVIDER_GET_INTERFACE( reader )->read_done( reader, reader_data, serializable,
messages );
@@ -252,7 +252,7 @@ v_factory_provider_read_done( const NAIFactoryProvider *reader, void *reader_dat
}
static guint
-v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject
*serializable, GSList **messages )
+v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_data, FMAIFactoryObject
*serializable, GSList **messages )
{
guint code = NA_IIO_PROVIDER_CODE_OK;
@@ -264,7 +264,7 @@ v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_d
}
static guint
-v_factory_provider_write_done( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject
*serializable, GSList **messages )
+v_factory_provider_write_done( const NAIFactoryProvider *writer, void *writer_data, FMAIFactoryObject
*serializable, GSList **messages )
{
guint code = NA_IIO_PROVIDER_CODE_OK;
diff --git a/src/core/na-object-action-factory.c b/src/core/na-object-action-factory.c
index f2b6cb2..64fd6ad 100644
--- a/src/core/na-object-action-factory.c
+++ b/src/core/na-object-action-factory.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-ifactory-object-data.h>
+#include <api/fma-ifactory-object-data.h>
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
diff --git a/src/core/na-object-action.c b/src/core/na-object-action.c
index 24acc06..cd76660 100644
--- a/src/core/na-object-action.c
+++ b/src/core/na-object-action.c
@@ -75,20 +75,20 @@ static void object_dump( const NAObject *object );
static gboolean object_are_equal( const NAObject *a, const NAObject *b );
static gboolean object_is_valid( const NAObject *object );
-static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
-static guint ifactory_object_get_version( const NAIFactoryObject *instance );
-static FMADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
-static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader,
void *reader_data, GSList **messages );
-static guint ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
-static guint ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
+static void ifactory_object_iface_init( FMAIFactoryObjectInterface *iface, void *user_data );
+static guint ifactory_object_get_version( const FMAIFactoryObject *instance );
+static FMADataGroup *ifactory_object_get_groups( const FMAIFactoryObject *instance );
+static void ifactory_object_read_done( FMAIFactoryObject *instance, const NAIFactoryProvider
*reader, void *reader_data, GSList **messages );
+static guint ifactory_object_write_start( FMAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
+static guint ifactory_object_write_done( FMAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
static void icontext_iface_init( FMAIContextInterface *iface, void *user_data );
static gboolean icontext_is_candidate( FMAIContext *object, guint target, GList *selection );
-static NAObjectProfile *read_done_convert_v1_to_v2( NAIFactoryObject *instance );
-static void read_done_deals_with_toolbar_label( NAIFactoryObject *instance );
+static NAObjectProfile *read_done_convert_v1_to_v2( FMAIFactoryObject *instance );
+static void read_done_deals_with_toolbar_label( FMAIFactoryObject *instance );
-static guint write_done_write_profiles( NAIFactoryObject *instance, const NAIFactoryProvider *writer,
void *writer_data, GSList **messages );
+static guint write_done_write_profiles( FMAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
static gboolean is_valid_label( const NAObjectAction *action );
static gboolean is_valid_toolbar_label( const NAObjectAction *action );
@@ -142,7 +142,7 @@ register_type( void )
g_type_add_interface_static( type, FMA_TYPE_ICONTEXT, &icontext_iface_info );
- g_type_add_interface_static( type, NA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
+ g_type_add_interface_static( type, FMA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
return( type );
}
@@ -194,11 +194,11 @@ static void
instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
g_return_if_fail( NA_IS_OBJECT_ACTION( object ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_ACTION( object )->private->dispose_has_run ){
- na_factory_object_get_as_value( NA_IFACTORY_OBJECT( object ), g_quark_to_string( property_id
), value );
+ na_factory_object_get_as_value( FMA_IFACTORY_OBJECT( object ), g_quark_to_string( property_id
), value );
}
}
@@ -206,11 +206,11 @@ static void
instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
{
g_return_if_fail( NA_IS_OBJECT_ACTION( object ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_ACTION( object )->private->dispose_has_run ){
- na_factory_object_set_from_value( NA_IFACTORY_OBJECT( object ), g_quark_to_string(
property_id ), value );
+ na_factory_object_set_from_value( FMA_IFACTORY_OBJECT( object ), g_quark_to_string(
property_id ), value );
}
}
@@ -350,7 +350,7 @@ object_is_valid( const NAObject *object )
}
static void
-ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
+ifactory_object_iface_init( FMAIFactoryObjectInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_action_ifactory_object_iface_init";
@@ -364,13 +364,13 @@ ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
}
static guint
-ifactory_object_get_version( const NAIFactoryObject *instance )
+ifactory_object_get_version( const FMAIFactoryObject *instance )
{
return( 1 );
}
static FMADataGroup *
-ifactory_object_get_groups( const NAIFactoryObject *instance )
+ifactory_object_get_groups( const FMAIFactoryObject *instance )
{
return( action_data_groups );
}
@@ -381,7 +381,7 @@ ifactory_object_get_groups( const NAIFactoryObject *instance )
* action-specific properties (not to check for profiles consistency)
*/
static void
-ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data,
GSList **messages )
+ifactory_object_read_done( FMAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data,
GSList **messages )
{
guint iversion;
NAObjectProfile *profile;
@@ -414,7 +414,7 @@ ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider
}
static guint
-ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages )
+ifactory_object_write_start( FMAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages )
{
na_object_item_rebuild_children_slist( NA_OBJECT_ITEM( instance ));
@@ -422,7 +422,7 @@ ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvide
}
static guint
-ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data,
GSList **messages )
+ifactory_object_write_done( FMAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages )
{
guint code;
@@ -460,7 +460,7 @@ icontext_is_candidate( FMAIContext *object, guint target, GList *selection )
* returns the newly defined profile
*/
static NAObjectProfile *
-read_done_convert_v1_to_v2( NAIFactoryObject *instance )
+read_done_convert_v1_to_v2( FMAIFactoryObject *instance )
{
static const gchar *thisfn = "na_object_action_read_done_read_done_convert_v1_to_last";
GList *to_move;
@@ -476,7 +476,7 @@ read_done_convert_v1_to_v2( NAIFactoryObject *instance )
def = data_def_action_v1;
while( def->name ){
- boxed = na_ifactory_object_get_data_boxed( instance, def->name );
+ boxed = fma_ifactory_object_get_data_boxed( instance, def->name );
if( boxed ){
g_debug( "%s: boxed=%p (%s) marked to be moved from action body to profile",
thisfn, ( void * ) boxed, def->name );
@@ -494,7 +494,7 @@ read_done_convert_v1_to_v2( NAIFactoryObject *instance )
for( ibox = to_move ; ibox ; ibox = ibox->next ){
na_factory_object_move_boxed(
- NA_IFACTORY_OBJECT( profile ), instance, FMA_DATA_BOXED( ibox->data ));
+ FMA_IFACTORY_OBJECT( profile ), instance, FMA_DATA_BOXED( ibox->data ));
}
return( profile );
@@ -504,7 +504,7 @@ read_done_convert_v1_to_v2( NAIFactoryObject *instance )
* if toolbar-same-label is true, then ensure that this is actually true
*/
static void
-read_done_deals_with_toolbar_label( NAIFactoryObject *instance )
+read_done_deals_with_toolbar_label( FMAIFactoryObject *instance )
{
gchar *toolbar_label;
gchar *action_label;
@@ -531,7 +531,7 @@ read_done_deals_with_toolbar_label( NAIFactoryObject *instance )
* note that subitems string list has been rebuilt on write_start
*/
static guint
-write_done_write_profiles( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data,
GSList **messages )
+write_done_write_profiles( FMAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data,
GSList **messages )
{
static const gchar *thisfn = "na_object_action_write_done_write_profiles";
guint code;
@@ -545,7 +545,7 @@ write_done_write_profiles( NAIFactoryObject *instance, const NAIFactoryProvider
profile = NA_OBJECT_PROFILE( na_object_get_item( instance, ic->data ));
if( profile ){
- code = na_ifactory_provider_write_item( writer, writer_data, NA_IFACTORY_OBJECT(
profile ), messages );
+ code = na_ifactory_provider_write_item( writer, writer_data, FMA_IFACTORY_OBJECT(
profile ), messages );
} else {
g_warning( "%s: profile not found: %s", thisfn, ( const gchar * ) ic->data );
@@ -653,7 +653,7 @@ na_object_action_new_with_defaults( void )
na_object_set_new_id( action, NULL );
na_object_set_label( action, gettext( NEW_NAUTILUS_ACTION ));
na_object_set_toolbar_label( action, gettext( NEW_NAUTILUS_ACTION ));
- na_factory_object_set_defaults( NA_IFACTORY_OBJECT( action ));
+ na_factory_object_set_defaults( FMA_IFACTORY_OBJECT( action ));
profile = na_object_profile_new_with_defaults();
na_object_attach_profile( action, profile );
diff --git a/src/core/na-object-id-factory.c b/src/core/na-object-id-factory.c
index 0e9e825..2e2265e 100644
--- a/src/core/na-object-id-factory.c
+++ b/src/core/na-object-id-factory.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <api/na-ifactory-object-data.h>
+#include <api/fma-ifactory-object-data.h>
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
diff --git a/src/core/na-object-item-factory.c b/src/core/na-object-item-factory.c
index 23c999c..d5bbf5a 100644
--- a/src/core/na-object-item-factory.c
+++ b/src/core/na-object-item-factory.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-ifactory-object-data.h>
+#include <api/fma-ifactory-object-data.h>
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
diff --git a/src/core/na-object-item.c b/src/core/na-object-item.c
index caa7f75..c35554d 100644
--- a/src/core/na-object-item.c
+++ b/src/core/na-object-item.c
@@ -274,7 +274,7 @@ object_copy( NAObject *target, const NAObject *source, guint mode )
* @b: the second #NAObjectItem instance.
*
* This function participates to the #fma_iduplicable_check_status() stack,
- * and is triggered after all comparable elementary data (in #NAIFactoryObject
+ * and is triggered after all comparable elementary data (in #FMAIFactoryObject
* sense) have already been successfully compared.
*
* We have to deal here with the subitems: comparing children by their ids
diff --git a/src/core/na-object-menu-factory.c b/src/core/na-object-menu-factory.c
index 8c975fd..ea9fe6f 100644
--- a/src/core/na-object-menu-factory.c
+++ b/src/core/na-object-menu-factory.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <api/na-ifactory-object-data.h>
+#include <api/fma-ifactory-object-data.h>
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
diff --git a/src/core/na-object-menu.c b/src/core/na-object-menu.c
index d609f8a..142abc5 100644
--- a/src/core/na-object-menu.c
+++ b/src/core/na-object-menu.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <api/na-iio-provider.h>
-#include <api/na-ifactory-object.h>
+#include <api/fma-ifactory-object.h>
#include <api/na-object-api.h>
#include "na-factory-provider.h"
@@ -70,12 +70,12 @@ static void instance_finalize( GObject *object );
static void object_dump( const NAObject *object );
-static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
-static guint ifactory_object_get_version( const NAIFactoryObject *instance );
-static FMADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
-static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader,
void *reader_data, GSList **messages );
-static guint ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
-static guint ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
+static void ifactory_object_iface_init( FMAIFactoryObjectInterface *iface, void *user_data );
+static guint ifactory_object_get_version( const FMAIFactoryObject *instance );
+static FMADataGroup *ifactory_object_get_groups( const FMAIFactoryObject *instance );
+static void ifactory_object_read_done( FMAIFactoryObject *instance, const NAIFactoryProvider
*reader, void *reader_data, GSList **messages );
+static guint ifactory_object_write_start( FMAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
+static guint ifactory_object_write_done( FMAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
static void icontext_iface_init( FMAIContextInterface *iface, void *user_data );
static gboolean icontext_is_candidate( FMAIContext *object, guint target, GList *selection );
@@ -129,7 +129,7 @@ register_type( void )
g_type_add_interface_static( type, FMA_TYPE_ICONTEXT, &icontext_iface_info );
- g_type_add_interface_static( type, NA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
+ g_type_add_interface_static( type, FMA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
return( type );
}
@@ -179,11 +179,11 @@ static void
instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
g_return_if_fail( NA_IS_OBJECT_MENU( object ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_MENU( object )->private->dispose_has_run ){
- na_factory_object_get_as_value( NA_IFACTORY_OBJECT( object ), g_quark_to_string( property_id
), value );
+ na_factory_object_get_as_value( FMA_IFACTORY_OBJECT( object ), g_quark_to_string( property_id
), value );
}
}
@@ -191,11 +191,11 @@ static void
instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
{
g_return_if_fail( NA_IS_OBJECT_MENU( object ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_MENU( object )->private->dispose_has_run ){
- na_factory_object_set_from_value( NA_IFACTORY_OBJECT( object ), g_quark_to_string(
property_id ), value );
+ na_factory_object_set_from_value( FMA_IFACTORY_OBJECT( object ), g_quark_to_string(
property_id ), value );
}
}
@@ -266,7 +266,7 @@ object_dump( const NAObject *object )
}
static void
-ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
+ifactory_object_iface_init( FMAIFactoryObjectInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_menu_ifactory_object_iface_init";
@@ -280,19 +280,19 @@ ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
}
static guint
-ifactory_object_get_version( const NAIFactoryObject *instance )
+ifactory_object_get_version( const FMAIFactoryObject *instance )
{
return( 1 );
}
static FMADataGroup *
-ifactory_object_get_groups( const NAIFactoryObject *instance )
+ifactory_object_get_groups( const FMAIFactoryObject *instance )
{
return( menu_data_groups );
}
static void
-ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data,
GSList **messages )
+ifactory_object_read_done( FMAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data,
GSList **messages )
{
g_debug( "na_object_menu_ifactory_object_read_done: instance=%p", ( void * ) instance );
@@ -308,7 +308,7 @@ ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider
}
static guint
-ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages )
+ifactory_object_write_start( FMAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages )
{
na_object_item_rebuild_children_slist( NA_OBJECT_ITEM( instance ));
@@ -316,7 +316,7 @@ ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvide
}
static guint
-ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data,
GSList **messages )
+ifactory_object_write_done( FMAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages )
{
return( NA_IIO_PROVIDER_CODE_OK );
}
@@ -371,7 +371,7 @@ na_object_menu_new_with_defaults( void )
NAObjectMenu *menu = na_object_menu_new();
na_object_set_new_id( menu, NULL );
na_object_set_label( menu, gettext( NEW_NAUTILUS_MENU ));
- na_factory_object_set_defaults( NA_IFACTORY_OBJECT( menu ));
+ na_factory_object_set_defaults( FMA_IFACTORY_OBJECT( menu ));
return( menu );
}
diff --git a/src/core/na-object-profile-factory.c b/src/core/na-object-profile-factory.c
index c1b38e1..1a1e950 100644
--- a/src/core/na-object-profile-factory.c
+++ b/src/core/na-object-profile-factory.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-ifactory-object-data.h>
+#include <api/fma-ifactory-object-data.h>
#include <api/fma-data-def.h>
#include <api/fma-data-types.h>
diff --git a/src/core/na-object-profile.c b/src/core/na-object-profile.c
index 4f62577..4fe95da 100644
--- a/src/core/na-object-profile.c
+++ b/src/core/na-object-profile.c
@@ -38,7 +38,7 @@
#include <api/fma-core-utils.h>
#include <api/na-iio-provider.h>
-#include <api/na-ifactory-object.h>
+#include <api/fma-ifactory-object.h>
#include <api/na-object-api.h>
#include "na-factory-provider.h"
@@ -60,9 +60,9 @@ struct _NAObjectProfilePrivate {
#define PROFILE_NAME_PREFIX "profile-"
-#define na_object_is_file( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ISFILE )))
-#define na_object_is_dir( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_ISDIR )))
-#define na_object_is_multiple( obj ) (( gboolean ) GPOINTER_TO_UINT(
na_ifactory_object_get_as_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_MULTIPLE )))
+#define na_object_is_file( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ISFILE )))
+#define na_object_is_dir( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ISDIR )))
+#define na_object_is_multiple( obj ) (( gboolean ) GPOINTER_TO_UINT(
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MULTIPLE )))
extern FMADataGroup profile_data_groups []; /* defined in na-item-profile-factory.c */
@@ -79,11 +79,11 @@ static void instance_finalize( GObject *object );
static void object_dump( const NAObject *object );
static gboolean object_is_valid( const NAObject *object );
-static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
-static guint ifactory_object_get_version( const NAIFactoryObject *instance );
-static FMADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
-static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader,
void *reader_data, GSList **messages );
-static guint ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
+static void ifactory_object_iface_init( FMAIFactoryObjectInterface *iface, void *user_data );
+static guint ifactory_object_get_version( const FMAIFactoryObject *instance );
+static FMADataGroup *ifactory_object_get_groups( const FMAIFactoryObject *instance );
+static void ifactory_object_read_done( FMAIFactoryObject *instance, const NAIFactoryProvider
*reader, void *reader_data, GSList **messages );
+static guint ifactory_object_write_done( FMAIFactoryObject *instance, const NAIFactoryProvider
*writer, void *writer_data, GSList **messages );
static void icontext_iface_init( FMAIContextInterface *iface, void *user_data );
static gboolean icontext_is_candidate( FMAIContext *object, guint target, GList *selection );
@@ -146,7 +146,7 @@ register_type( void )
g_type_add_interface_static( type, FMA_TYPE_ICONTEXT, &icontext_iface_info );
- g_type_add_interface_static( type, NA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
+ g_type_add_interface_static( type, FMA_TYPE_IFACTORY_OBJECT, &ifactory_object_iface_info );
return( type );
}
@@ -203,11 +203,11 @@ static void
instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
g_return_if_fail( NA_IS_OBJECT_PROFILE( object ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_PROFILE( object )->private->dispose_has_run ){
- na_factory_object_get_as_value( NA_IFACTORY_OBJECT( object ), g_quark_to_string( property_id
), value );
+ na_factory_object_get_as_value( FMA_IFACTORY_OBJECT( object ), g_quark_to_string( property_id
), value );
}
}
@@ -215,11 +215,11 @@ static void
instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
{
g_return_if_fail( NA_IS_OBJECT_PROFILE( object ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_PROFILE( object )->private->dispose_has_run ){
- na_factory_object_set_from_value( NA_IFACTORY_OBJECT( object ), g_quark_to_string(
property_id ), value );
+ na_factory_object_set_from_value( FMA_IFACTORY_OBJECT( object ), g_quark_to_string(
property_id ), value );
}
}
@@ -316,7 +316,7 @@ object_is_valid( const NAObject *object )
}
static void
-ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
+ifactory_object_iface_init( FMAIFactoryObjectInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_profile_ifactory_object_iface_init";
@@ -329,19 +329,19 @@ ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
}
static guint
-ifactory_object_get_version( const NAIFactoryObject *instance )
+ifactory_object_get_version( const FMAIFactoryObject *instance )
{
return( 1 );
}
static FMADataGroup *
-ifactory_object_get_groups( const NAIFactoryObject *instance )
+ifactory_object_get_groups( const FMAIFactoryObject *instance )
{
return( profile_data_groups );
}
static void
-ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data,
GSList **messages )
+ifactory_object_read_done( FMAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data,
GSList **messages )
{
static const gchar *thisfn = "na_object_profile_ifactory_object_read_done";
NAObjectAction *action;
@@ -366,7 +366,7 @@ ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider
}
static guint
-ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data,
GSList **messages )
+ifactory_object_write_done( FMAIFactoryObject *instance, const NAIFactoryProvider *writer, void
*writer_data, GSList **messages )
{
return( NA_IIO_PROVIDER_CODE_OK );
}
@@ -587,7 +587,7 @@ convert_pre_v3_isfiledir( NAObjectProfile *profile )
* value when the data is not set (see #651911)
*/
isfile = TRUE;
- if( na_factory_object_is_set( NA_IFACTORY_OBJECT( profile ), NAFO_DATA_ISFILE )){
+ if( na_factory_object_is_set( FMA_IFACTORY_OBJECT( profile ), NAFO_DATA_ISFILE )){
isfile = na_object_is_file( profile );
}
isdir = na_object_is_dir( profile );
@@ -647,7 +647,7 @@ read_done_ending( NAObjectProfile *profile )
/* last, set profile defaults
*/
- na_factory_object_set_defaults( NA_IFACTORY_OBJECT( profile ));
+ na_factory_object_set_defaults( FMA_IFACTORY_OBJECT( profile ));
}
/*
@@ -766,7 +766,7 @@ na_object_profile_new_with_defaults( void )
na_object_set_id( profile, "profile-zero" );
/* i18n: label for the default profile */
na_object_set_label( profile, _( "Default profile" ));
- na_factory_object_set_defaults( NA_IFACTORY_OBJECT( profile ));
+ na_factory_object_set_defaults( FMA_IFACTORY_OBJECT( profile ));
return( profile );
}
diff --git a/src/core/na-object.c b/src/core/na-object.c
index 3ad5cf8..68b49e5 100644
--- a/src/core/na-object.c
+++ b/src/core/na-object.c
@@ -183,8 +183,8 @@ instance_finalize( GObject *object )
g_free( self->private );
- if( NA_IS_IFACTORY_OBJECT( object )){
- na_factory_object_finalize( NA_IFACTORY_OBJECT( object ));
+ if( FMA_IS_IFACTORY_OBJECT( object )){
+ na_factory_object_finalize( FMA_IFACTORY_OBJECT( object ));
}
/* chain call to parent class */
@@ -200,8 +200,8 @@ object_dump( const NAObject *object )
fma_iduplicable_dump( FMA_IDUPLICABLE( object ));
- if( NA_IS_IFACTORY_OBJECT( object )){
- na_factory_object_dump( NA_IFACTORY_OBJECT( object ));
+ if( FMA_IS_IFACTORY_OBJECT( object )){
+ na_factory_object_dump( FMA_IFACTORY_OBJECT( object ));
}
}
}
@@ -243,8 +243,8 @@ iduplicable_copy( FMAIDuplicable *target, const FMAIDuplicable *source, guint mo
( void * ) src, G_OBJECT_TYPE_NAME( src ),
mode );
- if( NA_IS_IFACTORY_OBJECT( target )){
- na_factory_object_copy( NA_IFACTORY_OBJECT( target ), NA_IFACTORY_OBJECT( source ));
+ if( FMA_IS_IFACTORY_OBJECT( target )){
+ na_factory_object_copy( FMA_IFACTORY_OBJECT( target ), FMA_IFACTORY_OBJECT( source ));
}
if( FMA_IS_ICONTEXT( target )){
@@ -273,8 +273,8 @@ iduplicable_are_equal( const FMAIDuplicable *a, const FMAIDuplicable *b )
are_equal = TRUE;
- if( NA_IS_IFACTORY_OBJECT( a )){
- are_equal &= na_factory_object_are_equal( NA_IFACTORY_OBJECT( a ),
NA_IFACTORY_OBJECT( b ));
+ if( FMA_IS_IFACTORY_OBJECT( a )){
+ are_equal &= na_factory_object_are_equal( FMA_IFACTORY_OBJECT( a ),
FMA_IFACTORY_OBJECT( b ));
}
if( FMA_IS_ICONTEXT( a )){
@@ -302,8 +302,8 @@ iduplicable_is_valid( const FMAIDuplicable *object )
is_valid = TRUE;
- if( NA_IS_IFACTORY_OBJECT( object )){
- is_valid &= na_factory_object_is_valid( NA_IFACTORY_OBJECT( object ));
+ if( FMA_IS_IFACTORY_OBJECT( object )){
+ is_valid &= na_factory_object_is_valid( FMA_IFACTORY_OBJECT( object ));
}
if( FMA_IS_ICONTEXT( object )){
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 3a5de59..453a2c6 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -37,7 +37,7 @@
#include <api/fma-core-utils.h>
#include <api/fma-data-types.h>
-#include <api/na-ifactory-object-data.h>
+#include <api/fma-ifactory-object-data.h>
#include <api/na-ifactory-provider.h>
#include <api/na-object-api.h>
@@ -53,7 +53,7 @@ typedef struct {
}
DesktopPath;
-/* the structure passed as reader data to NAIFactoryObject
+/* the structure passed as reader data to FMAIFactoryObject
*/
typedef struct {
NadpDesktopFile *ndf;
@@ -67,8 +67,8 @@ static GList *get_list_of_desktop_paths( NadpDesktopProvider *provide
static void get_list_of_desktop_files( const NadpDesktopProvider *provider, GList **files,
const gchar *dir, GSList **messages );
static gboolean is_already_loaded( const NadpDesktopProvider *provider, GList *files, const gchar
*desktop_id );
static GList *desktop_path_from_id( const NadpDesktopProvider *provider, GList *files, const
gchar *dir, const gchar *id );
-static NAIFactoryObject *item_from_desktop_path( const NadpDesktopProvider *provider, DesktopPath *dps,
GSList **messages );
-static NAIFactoryObject *item_from_desktop_file( const NadpDesktopProvider *provider, NadpDesktopFile *ndf,
GSList **messages );
+static FMAIFactoryObject *item_from_desktop_path( const NadpDesktopProvider *provider, DesktopPath *dps,
GSList **messages );
+static FMAIFactoryObject *item_from_desktop_file( const NadpDesktopProvider *provider, NadpDesktopFile *ndf,
GSList **messages );
static void desktop_weak_notify( NadpDesktopFile *ndf, GObject *item );
static void free_desktop_paths( GList *paths );
@@ -80,7 +80,7 @@ static void read_done_action_read_profiles( const NAIFactoryProvide
static void read_done_action_load_profile( const NAIFactoryProvider *provider, NadpReaderData
*reader_data, const gchar *profile_id, GSList **messages );
/*
- * Returns an unordered list of NAIFactoryObject-derived objects
+ * Returns an unordered list of FMAIFactoryObject-derived objects
*
* This is implementation of NAIIOProvider::read_items method
*/
@@ -90,7 +90,7 @@ nadp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages )
static const gchar *thisfn = "nadp_iio_provider_read_items";
GList *items;
GList *desktop_paths, *ip;
- NAIFactoryObject *item;
+ FMAIFactoryObject *item;
g_debug( "%s: provider=%p (%s), messages=%p",
thisfn, ( void * ) provider, G_OBJECT_TYPE_NAME( provider ), ( void * ) messages );
@@ -249,10 +249,10 @@ desktop_path_from_id( const NadpDesktopProvider *provider, GList *files, const g
}
/*
- * Returns a newly allocated NAIFactoryObject-derived object, initialized
+ * Returns a newly allocated FMAIFactoryObject-derived object, initialized
* from the .desktop file pointed to by DesktopPath struct
*/
-static NAIFactoryObject *
+static FMAIFactoryObject *
item_from_desktop_path( const NadpDesktopProvider *provider, DesktopPath *dps, GSList **messages )
{
NadpDesktopFile *ndf;
@@ -266,14 +266,14 @@ item_from_desktop_path( const NadpDesktopProvider *provider, DesktopPath *dps, G
}
/*
- * Returns a newly allocated NAIFactoryObject-derived object, initialized
+ * Returns a newly allocated FMAIFactoryObject-derived object, initialized
* from the .desktop file
*/
-static NAIFactoryObject *
+static FMAIFactoryObject *
item_from_desktop_file( const NadpDesktopProvider *provider, NadpDesktopFile *ndf, GSList **messages )
{
/*static const gchar *thisfn = "nadp_reader_item_from_desktop_file";*/
- NAIFactoryObject *item;
+ FMAIFactoryObject *item;
gchar *type;
NadpReaderData *reader_data;
gchar *id;
@@ -282,10 +282,10 @@ item_from_desktop_file( const NadpDesktopProvider *provider, NadpDesktopFile *nd
type = nadp_desktop_file_get_file_type( ndf );
if( !strcmp( type, NADP_VALUE_TYPE_ACTION )){
- item = NA_IFACTORY_OBJECT( na_object_action_new());
+ item = FMA_IFACTORY_OBJECT( na_object_action_new());
} else if( !strcmp( type, NADP_VALUE_TYPE_MENU )){
- item = NA_IFACTORY_OBJECT( na_object_menu_new());
+ item = FMA_IFACTORY_OBJECT( na_object_menu_new());
} else {
/* i18n: 'type' is the nature of the item: Action or Menu */
@@ -419,13 +419,13 @@ nadp_reader_iimporter_import_from_uri( const NAIImporter *instance, void *parms_
* depending of the exact class of the NAObjectItem
*/
void
-nadp_reader_ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, const
NAIFactoryObject *serializable, GSList **messages )
+nadp_reader_ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, const
FMAIFactoryObject *serializable, GSList **messages )
{
static const gchar *thisfn = "nadp_reader_ifactory_provider_read_start";
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
g_return_if_fail( NADP_IS_DESKTOP_PROVIDER( reader ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( serializable ));
if( !NADP_DESKTOP_PROVIDER( reader )->private->dispose_has_run ){
@@ -483,7 +483,7 @@ read_start_profile_attach_profile( const NAIFactoryProvider *provider, NAObjectP
* letting the caller deal with default values
*/
FMADataBoxed *
-nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void *reader_data, const
NAIFactoryObject *object, const FMADataDef *def, GSList **messages )
+nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void *reader_data, const
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages )
{
static const gchar *thisfn = "nadp_reader_ifactory_provider_read_data";
FMADataBoxed *boxed;
@@ -498,7 +498,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( reader ), NULL );
g_return_val_if_fail( NADP_IS_DESKTOP_PROVIDER( reader ), NULL );
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
boxed = NULL;
@@ -578,17 +578,17 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
}
/*
- * called when each NAIFactoryObject object has been read
+ * called when each FMAIFactoryObject object has been read
*/
void
-nadp_reader_ifactory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, const
NAIFactoryObject *serializable, GSList **messages )
+nadp_reader_ifactory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, const
FMAIFactoryObject *serializable, GSList **messages )
{
static const gchar *thisfn = "nadp_reader_ifactory_provider_read_done";
gboolean writable;
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
g_return_if_fail( NADP_IS_DESKTOP_PROVIDER( reader ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( serializable ));
if( !NADP_DESKTOP_PROVIDER( reader )->private->dispose_has_run ){
@@ -680,7 +680,7 @@ read_done_action_load_profile( const NAIFactoryProvider *provider, NadpReaderDat
na_ifactory_provider_read_item(
NA_IFACTORY_PROVIDER( provider ),
reader_data,
- NA_IFACTORY_OBJECT( profile ),
+ FMA_IFACTORY_OBJECT( profile ),
messages );
} else {
diff --git a/src/io-desktop/nadp-reader.h b/src/io-desktop/nadp-reader.h
index 283a359..b969fe9 100644
--- a/src/io-desktop/nadp-reader.h
+++ b/src/io-desktop/nadp-reader.h
@@ -40,9 +40,9 @@ GList *nadp_iio_provider_read_items ( const NAIIOProvider *prov
guint nadp_reader_iimporter_import_from_uri ( const NAIImporter *instance, void *parms_ptr );
-void nadp_reader_ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data,
const NAIFactoryObject *serializable, GSList **messages );
-FMADataBoxed *nadp_reader_ifactory_provider_read_data ( const NAIFactoryProvider *reader, void *reader_data,
const NAIFactoryObject *serializable, const FMADataDef *iddef, GSList **messages );
-void nadp_reader_ifactory_provider_read_done ( const NAIFactoryProvider *reader, void *reader_data,
const NAIFactoryObject *serializable, GSList **messages );
+void nadp_reader_ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data,
const FMAIFactoryObject *serializable, GSList **messages );
+FMADataBoxed *nadp_reader_ifactory_provider_read_data ( const NAIFactoryProvider *reader, void *reader_data,
const FMAIFactoryObject *serializable, const FMADataDef *iddef, GSList **messages );
+void nadp_reader_ifactory_provider_read_done ( const NAIFactoryProvider *reader, void *reader_data,
const FMAIFactoryObject *serializable, GSList **messages );
G_END_DECLS
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 8a86f49..a43ab4e 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -225,7 +225,7 @@ write_item( const NAIIOProvider *provider, const NAObjectItem *item, NadpDesktop
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( provider ), ret );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), ret );
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( item ), ret );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( item ), ret );
g_return_val_if_fail( NADP_IS_DESKTOP_FILE( ndf ), ret );
@@ -237,7 +237,7 @@ write_item( const NAIIOProvider *provider, const NAObjectItem *item, NadpDesktop
ret = NA_IIO_PROVIDER_CODE_OK;
- na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( provider ), ndf, NA_IFACTORY_OBJECT( item ),
messages );
+ na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( provider ), ndf, FMA_IFACTORY_OBJECT( item ),
messages );
if( !nadp_desktop_file_write( ndf )){
ret = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
@@ -386,7 +386,7 @@ nadp_writer_iexporter_export_to_buffer( const FMAIExporter *instance, FMAIExport
} else {
ndf = nadp_desktop_file_new();
- write_code = na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( instance ), ndf,
NA_IFACTORY_OBJECT( parms->exported ), &parms->messages );
+ write_code = na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( instance ), ndf,
FMA_IFACTORY_OBJECT( parms->exported ), &parms->messages );
if( write_code != NA_IIO_PROVIDER_CODE_OK ){
code = FMA_IEXPORTER_CODE_ERROR;
@@ -454,7 +454,7 @@ nadp_writer_iexporter_export_to_file( const FMAIExporter *instance, FMAIExporter
g_free( folder_path );
ndf = nadp_desktop_file_new_for_write( dest_path );
- write_code = na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( instance ), ndf,
NA_IFACTORY_OBJECT( parms->exported ), &parms->messages );
+ write_code = na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( instance ), ndf,
FMA_IFACTORY_OBJECT( parms->exported ), &parms->messages );
if( write_code != NA_IIO_PROVIDER_CODE_OK ){
code = FMA_IEXPORTER_CODE_ERROR;
@@ -474,7 +474,7 @@ nadp_writer_iexporter_export_to_file( const FMAIExporter *instance, FMAIExporter
guint
nadp_writer_ifactory_provider_write_start( const NAIFactoryProvider *provider, void *writer_data,
- const NAIFactoryObject *object, GSList **messages )
+ const FMAIFactoryObject *object, GSList **messages )
{
if( NA_IS_OBJECT_ITEM( object )){
write_start_write_type( NADP_DESKTOP_FILE( writer_data ), NA_OBJECT_ITEM( object ));
@@ -499,7 +499,7 @@ write_start_write_type( NadpDesktopFile *ndp, NAObjectItem *item )
*/
guint
nadp_writer_ifactory_provider_write_data(
- const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject
*object,
+ const NAIFactoryProvider *provider, void *writer_data, const
FMAIFactoryObject *object,
const FMADataBoxed *boxed, GSList **messages )
{
static const gchar *thisfn = "nadp_writer_ifactory_provider_write_data";
@@ -590,7 +590,7 @@ nadp_writer_ifactory_provider_write_data(
guint
nadp_writer_ifactory_provider_write_done( const NAIFactoryProvider *provider, void *writer_data,
- const NAIFactoryObject *object, GSList **messages )
+ const FMAIFactoryObject *object, GSList **messages )
{
if( NA_IS_OBJECT_ITEM( object )){
write_done_write_subitems_list( NADP_DESKTOP_FILE( writer_data ), NA_OBJECT_ITEM( object ));
diff --git a/src/io-desktop/nadp-writer.h b/src/io-desktop/nadp-writer.h
index 714a90e..aa518e2 100644
--- a/src/io-desktop/nadp-writer.h
+++ b/src/io-desktop/nadp-writer.h
@@ -47,15 +47,15 @@ guint nadp_writer_iexporter_export_to_buffer( const FMAIExporter *instance, F
guint nadp_writer_iexporter_export_to_file ( const FMAIExporter *instance, FMAIExporterFileParmsv2
*parms );
guint nadp_writer_ifactory_provider_write_start(
- const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject
*object,
+ const NAIFactoryProvider *provider, void *writer_data, const
FMAIFactoryObject *object,
GSList **messages );
guint nadp_writer_ifactory_provider_write_data(
- const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject
*object,
+ const NAIFactoryProvider *provider, void *writer_data, const
FMAIFactoryObject *object,
const FMADataBoxed *boxed, GSList **messages );
guint nadp_writer_ifactory_provider_write_done(
- const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject
*object,
+ const NAIFactoryProvider *provider, void *writer_data, const
FMAIFactoryObject *object,
GSList **messages );
G_END_DECLS
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index af575aa..df6136f 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -155,7 +155,7 @@ read_item( NagpGConfProvider *provider, const gchar *path, GSList **messages )
na_ifactory_provider_read_item(
NA_IFACTORY_PROVIDER( provider ),
data,
- NA_IFACTORY_OBJECT( item ),
+ FMA_IFACTORY_OBJECT( item ),
messages );
fma_gconf_utils_free_entries( data->entries );
@@ -166,13 +166,13 @@ read_item( NagpGConfProvider *provider, const gchar *path, GSList **messages )
}
void
-nagp_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject
*object, GSList **messages )
+nagp_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject
*object, GSList **messages )
{
static const gchar *thisfn = "nagp_reader_read_start";
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( provider ));
g_return_if_fail( NAGP_IS_GCONF_PROVIDER( provider ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
if( !NAGP_GCONF_PROVIDER( provider )->private->dispose_has_run ){
@@ -196,13 +196,13 @@ read_start_profile_attach_profile( const NAIFactoryProvider *provider, NAObjectP
}
FMADataBoxed *
-nagp_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject
*object, const FMADataDef *def, GSList **messages )
+nagp_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject
*object, const FMADataDef *def, GSList **messages )
{
static const gchar *thisfn = "nagp_reader_read_data";
FMADataBoxed *boxed;
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( provider ), NULL );
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
/*g_debug( "%s: reader_data=%p, object=%p (%s), data=%s",
thisfn,
@@ -222,14 +222,14 @@ nagp_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, co
}
void
-nagp_reader_read_done( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject
*object, GSList **messages )
+nagp_reader_read_done( const NAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject
*object, GSList **messages )
{
static const gchar *thisfn = "nagp_reader_read_done";
gboolean writable;
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( provider ));
g_return_if_fail( NAGP_IS_GCONF_PROVIDER( provider ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
if( !NAGP_GCONF_PROVIDER( provider )->private->dispose_has_run ){
@@ -348,7 +348,7 @@ read_done_action_load_profile( const NAIFactoryProvider *provider, ReaderData *d
na_ifactory_provider_read_item(
NA_IFACTORY_PROVIDER( provider ),
profile_data,
- NA_IFACTORY_OBJECT( profile ),
+ FMA_IFACTORY_OBJECT( profile ),
messages );
fma_gconf_utils_free_entries( profile_data->entries );
diff --git a/src/io-gconf/nagp-reader.h b/src/io-gconf/nagp-reader.h
index 9a9c0b1..c3fb77c 100644
--- a/src/io-gconf/nagp-reader.h
+++ b/src/io-gconf/nagp-reader.h
@@ -37,9 +37,9 @@ G_BEGIN_DECLS
GList *nagp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages );
-void nagp_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const
NAIFactoryObject *object, GSList **messages );
-FMADataBoxed *nagp_reader_read_data ( const NAIFactoryProvider *provider, void *reader_data, const
NAIFactoryObject *object, const FMADataDef *def, GSList **messages );
-void nagp_reader_read_done ( const NAIFactoryProvider *provider, void *reader_data, const
NAIFactoryObject *object, GSList **messages );
+void nagp_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const
FMAIFactoryObject *object, GSList **messages );
+FMADataBoxed *nagp_reader_read_data ( const NAIFactoryProvider *provider, void *reader_data, const
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages );
+void nagp_reader_read_done ( const NAIFactoryProvider *provider, void *reader_data, const
FMAIFactoryObject *object, GSList **messages );
G_END_DECLS
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index a423eb4..7ca5b03 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -153,7 +153,7 @@ nagp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem
ret = nagp_iio_provider_delete_item( provider, item, messages );
if( ret == NA_IIO_PROVIDER_CODE_OK ){
- na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( provider ), NULL, NA_IFACTORY_OBJECT(
item ), messages );
+ na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( provider ), NULL, FMA_IFACTORY_OBJECT(
item ), messages );
}
gconf_client_suggest_sync( self->private->gconf, NULL );
@@ -234,7 +234,7 @@ nagp_iio_provider_delete_item( const NAIIOProvider *provider, const NAObjectItem
guint
nagp_writer_write_start( const NAIFactoryProvider *writer, void *writer_data,
- const NAIFactoryObject *object, GSList **messages )
+ const FMAIFactoryObject *object, GSList **messages )
{
if( NA_IS_OBJECT_ITEM( object )){
write_start_write_type( NAGP_GCONF_PROVIDER( writer ), NA_OBJECT_ITEM( object ));
@@ -280,7 +280,7 @@ write_start_write_version( NagpGConfProvider *provider, NAObjectItem *item )
guint
nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
- const NAIFactoryObject *object, const
FMADataBoxed *boxed,
+ const FMAIFactoryObject *object,
const FMADataBoxed *boxed,
GSList **messages )
{
static const gchar *thisfn = "nagp_writer_write_data";
@@ -388,7 +388,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
guint
nagp_writer_write_done( const NAIFactoryProvider *writer, void *writer_data,
- const NAIFactoryObject *object,
+ const FMAIFactoryObject *object,
GSList **messages )
{
return( NA_IIO_PROVIDER_CODE_OK );
diff --git a/src/io-gconf/nagp-writer.h b/src/io-gconf/nagp-writer.h
index 5e93909..62cf593 100644
--- a/src/io-gconf/nagp-writer.h
+++ b/src/io-gconf/nagp-writer.h
@@ -54,15 +54,15 @@ guint nagp_iio_provider_delete_item ( const NAIIOProvider *provider,
/* NAIFactoryProvider interface
*/
guint nagp_writer_write_start( const NAIFactoryProvider *writer, void *writer_data,
- const NAIFactoryObject *object,
+ const FMAIFactoryObject *object,
GSList **messages );
guint nagp_writer_write_data ( const NAIFactoryProvider *provider, void *writer_data,
- const NAIFactoryObject *object, const
FMADataBoxed *boxed,
+ const FMAIFactoryObject *object,
const FMADataBoxed *boxed,
GSList **messages );
guint nagp_writer_write_done ( const NAIFactoryProvider *writer, void *writer_data,
- const NAIFactoryObject *object,
+ const FMAIFactoryObject *object,
GSList **messages );
#endif /* NA_ENABLE_DEPRECATED */
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index 2f57205..71ec3c8 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -154,7 +154,7 @@ static RootNodeStr st_root_node_str[] = {
#define ERR_NOT_IOXML _( "The XML I/O Provider is not able to handle the URI" )
static void read_start_profile_attach_profile( NAXMLReader *reader, NAObjectProfile *profile );
-static gboolean read_data_is_path_adhoc_for_object( NAXMLReader *reader, const NAIFactoryObject
*object, xmlChar *text );
+static gboolean read_data_is_path_adhoc_for_object( NAXMLReader *reader, const FMAIFactoryObject
*object, xmlChar *text );
static FMADataBoxed *read_data_boxed_from_node( NAXMLReader *reader, xmlChar *text, xmlNode *parent, const
FMADataDef *def );
static void read_done_item_set_localized_icon( NAXMLReader *reader, NAObjectItem *item );
static void read_done_action_read_profiles( NAXMLReader *reader, NAObjectAction *action );
@@ -588,7 +588,7 @@ iter_on_list_children( NAXMLReader *reader, xmlNode *list )
na_ifactory_provider_read_item(
NA_IFACTORY_PROVIDER( reader->private->importer ),
reader,
- NA_IFACTORY_OBJECT( reader->private->parms->imported ),
+ FMA_IFACTORY_OBJECT( reader->private->parms->imported ),
&reader->private->parms->messages );
}
@@ -596,12 +596,12 @@ iter_on_list_children( NAXMLReader *reader, xmlNode *list )
}
void
-naxml_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject
*object, GSList **messages )
+naxml_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject
*object, GSList **messages )
{
static const gchar *thisfn = "naxml_reader_read_start";
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( provider ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
g_debug( "%s: provider=%p, reader_data=%p, object=%p (%s), messages=%p",
thisfn,
@@ -622,7 +622,7 @@ read_start_profile_attach_profile( NAXMLReader *reader, NAObjectProfile *profile
}
/*
- * this callback function is called by NAIFactoryObject once for each
+ * this callback function is called by FMAIFactoryObject once for each
* serializable data for the object
*
* Note that some nodes may be read twice because of multiple definition
@@ -630,14 +630,14 @@ read_start_profile_attach_profile( NAXMLReader *reader, NAObjectProfile *profile
* versions). So do not remove dealt-with nodes here
*/
FMADataBoxed *
-naxml_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject
*object, const FMADataDef *def, GSList **messages )
+naxml_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject
*object, const FMADataDef *def, GSList **messages )
{
static const gchar *thisfn = "naxml_reader_read_data";
xmlNode *parent_node;
GList *ielt;
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( provider ), NULL );
- g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
+ g_return_val_if_fail( FMA_IS_IFACTORY_OBJECT( object ), NULL );
g_debug( "%s: reader_data=%p, object=%p (%s), data=%s",
thisfn, ( void * ) reader_data, ( void * ) object, G_OBJECT_TYPE_NAME( object ),
def->name );
@@ -680,7 +680,7 @@ naxml_reader_read_data( const NAIFactoryProvider *provider, void *reader_data, c
}
static gboolean
-read_data_is_path_adhoc_for_object( NAXMLReader *reader, const NAIFactoryObject *object, xmlChar *text )
+read_data_is_path_adhoc_for_object( NAXMLReader *reader, const FMAIFactoryObject *object, xmlChar *text )
{
gboolean adhoc;
GSList *path_slist;
@@ -757,12 +757,12 @@ read_data_boxed_from_node( NAXMLReader *reader, xmlChar *path, xmlNode *parent,
* all serializable data of the object has been read
*/
void
-naxml_reader_read_done( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject
*object, GSList **messages )
+naxml_reader_read_done( const NAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject
*object, GSList **messages )
{
static const gchar *thisfn = "naxml_reader_read_done";
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( provider ));
- g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
+ g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
g_debug( "%s: provider=%p, reader_data=%p, object=%p (%s), messages=%p",
thisfn,
@@ -912,7 +912,7 @@ read_done_action_load_profile( NAXMLReader *reader, const gchar *profile_id )
na_ifactory_provider_read_item(
NA_IFACTORY_PROVIDER( reader->private->importer ),
reader,
- NA_IFACTORY_OBJECT( profile ),
+ FMA_IFACTORY_OBJECT( profile ),
&reader->private->parms->messages );
}
diff --git a/src/io-xml/naxml-reader.h b/src/io-xml/naxml-reader.h
index 50528d0..4cba835 100644
--- a/src/io-xml/naxml-reader.h
+++ b/src/io-xml/naxml-reader.h
@@ -79,9 +79,9 @@ GType naxml_reader_get_type( void );
guint naxml_reader_import_from_uri( const NAIImporter *instance, void *parms_ptr );
-void naxml_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const
NAIFactoryObject *object, GSList **messages );
-FMADataBoxed *naxml_reader_read_data ( const NAIFactoryProvider *provider, void *reader_data, const
NAIFactoryObject *object, const FMADataDef *def, GSList **messages );
-void naxml_reader_read_done ( const NAIFactoryProvider *provider, void *reader_data, const
NAIFactoryObject *object, GSList **messages );
+void naxml_reader_read_start( const NAIFactoryProvider *provider, void *reader_data, const
FMAIFactoryObject *object, GSList **messages );
+FMADataBoxed *naxml_reader_read_data ( const NAIFactoryProvider *provider, void *reader_data, const
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages );
+void naxml_reader_read_done ( const NAIFactoryProvider *provider, void *reader_data, const
FMAIFactoryObject *object, GSList **messages );
G_END_DECLS
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index b04eb41..2e1d4de 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -402,14 +402,14 @@ build_xml_doc( NAXMLWriter *writer )
na_ifactory_provider_write_item(
NA_IFACTORY_PROVIDER( writer->private->provider ),
writer,
- NA_IFACTORY_OBJECT( writer->private->exported ),
+ FMA_IFACTORY_OBJECT( writer->private->exported ),
writer->private->messages ? & writer->private->messages : NULL );
return( writer->private->doc );
}
guint
-naxml_writer_write_start( const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject
*object, GSList **messages )
+naxml_writer_write_start( const NAIFactoryProvider *provider, void *writer_data, const FMAIFactoryObject
*object, GSList **messages )
{
NAXMLWriter *writer;
FMADataGroup *groups;
@@ -427,7 +427,7 @@ naxml_writer_write_start( const NAIFactoryProvider *provider, void *writer_data,
( *writer->private->fn_str->write_list_attribs_fn )( writer, NA_OBJECT_ITEM( object
));
}
- groups = na_ifactory_object_get_data_groups( object );
+ groups = fma_ifactory_object_get_data_groups( object );
write_start_write_type( writer, NA_OBJECT_ITEM( object ), groups );
write_start_write_version( writer, NA_OBJECT_ITEM( object ), groups );
}
@@ -471,7 +471,7 @@ write_start_write_version( NAXMLWriter *writer, NAObjectItem *object, const FMAD
}
guint
-naxml_writer_write_data( const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject
*object, const FMADataBoxed *boxed, GSList **messages )
+naxml_writer_write_data( const NAIFactoryProvider *provider, void *writer_data, const FMAIFactoryObject
*object, const FMADataBoxed *boxed, GSList **messages )
{
NAXMLWriter *writer;
const FMADataDef *def;
@@ -497,7 +497,7 @@ naxml_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
}
guint
-naxml_writer_write_done( const NAIFactoryProvider *provider, void *writer_data, const NAIFactoryObject
*object, GSList **messages )
+naxml_writer_write_done( const NAIFactoryProvider *provider, void *writer_data, const FMAIFactoryObject
*object, GSList **messages )
{
return( NA_IIO_PROVIDER_CODE_OK );
}
diff --git a/src/io-xml/naxml-writer.h b/src/io-xml/naxml-writer.h
index 652cce2..6de91b2 100644
--- a/src/io-xml/naxml-writer.h
+++ b/src/io-xml/naxml-writer.h
@@ -74,9 +74,9 @@ GType naxml_writer_get_type( void );
guint naxml_writer_export_to_buffer( const FMAIExporter *instance, FMAIExporterBufferParmsv2 *parms );
guint naxml_writer_export_to_file ( const FMAIExporter *instance, FMAIExporterFileParmsv2 *parms );
-guint naxml_writer_write_start( const NAIFactoryProvider *writer, void *writer_data, const NAIFactoryObject
*object, GSList **messages );
-guint naxml_writer_write_data ( const NAIFactoryProvider *writer, void *writer_data, const NAIFactoryObject
*object, const FMADataBoxed *boxed, GSList **messages );
-guint naxml_writer_write_done ( const NAIFactoryProvider *writer, void *writer_data, const NAIFactoryObject
*object, GSList **messages );
+guint naxml_writer_write_start( const NAIFactoryProvider *writer, void *writer_data, const
FMAIFactoryObject *object, GSList **messages );
+guint naxml_writer_write_data ( const NAIFactoryProvider *writer, void *writer_data, const
FMAIFactoryObject *object, const FMADataBoxed *boxed, GSList **messages );
+guint naxml_writer_write_done ( const NAIFactoryProvider *writer, void *writer_data, const
FMAIFactoryObject *object, GSList **messages );
G_END_DECLS
diff --git a/src/nact/nact-tree-ieditable.c b/src/nact/nact-tree-ieditable.c
index e72b50b..52b09d0 100644
--- a/src/nact/nact-tree-ieditable.c
+++ b/src/nact/nact-tree-ieditable.c
@@ -963,7 +963,7 @@ nact_tree_ieditable_set_items( NactTreeIEditable *instance, GList *items )
* data, read-only status - notably children are not impacted by this
* copy
*/
- na_factory_object_copy( NA_IFACTORY_OBJECT( old_item ), NA_IFACTORY_OBJECT( new_item
));
+ na_factory_object_copy( FMA_IFACTORY_OBJECT( old_item ), FMA_IFACTORY_OBJECT(
new_item ));
} else if( NA_IS_OBJECT_ACTION( old_item )){
/* na_factory_object is not a deep copy, which is fine for the menu
diff --git a/src/utils/na-print-schemas.c b/src/utils/na-print-schemas.c
index 4527357..6080d3e 100644
--- a/src/utils/na-print-schemas.c
+++ b/src/utils/na-print-schemas.c
@@ -41,7 +41,7 @@
#include <api/fma-core-utils.h>
#include <api/fma-data-types.h>
-#include <api/na-ifactory-object-data.h>
+#include <api/fma-ifactory-object-data.h>
#include <io-gconf/nagp-keys.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
