[nautilus-actions] Rename NAIDataFactory interface as NAIFactoryObject
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Rename NAIDataFactory interface as NAIFactoryObject
- Date: Fri, 26 Feb 2010 00:42:52 +0000 (UTC)
commit a211d8b654261e96e7abfdf4d67318fb3c2a6fc2
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Feb 22 05:46:00 2010 +0100
Rename NAIDataFactory interface as NAIFactoryObject
ChangeLog | 36 +++
src/api/Makefile.am | 6 +-
...ta-factory-enum.h => na-ifactory-object-enum.h} | 22 +-
...data-factory-str.h => na-ifactory-object-str.h} | 16 +-
.../{na-idata-factory.h => na-ifactory-object.h} | 82 +++---
src/api/na-ifactory-provider.h | 30 +-
src/api/na-iio-provider.h | 6 +-
src/api/na-object-api.h | 126 +++++-----
src/core/Makefile.am | 10 +-
src/core/na-data-element.c | 2 +-
src/core/na-data-element.h | 4 +-
src/core/na-data-factory.h | 66 -----
.../{na-data-factory.c => na-factory-object.c} | 278 ++++++++++----------
src/core/na-factory-object.h | 66 +++++
.../{na-idata-factory.c => na-ifactory-object.c} | 76 +++---
src/core/na-ifactory-provider-priv.h | 4 +-
src/core/na-ifactory-provider.c | 38 ++--
src/core/na-object-action-enum.c | 12 +-
src/core/na-object-action.c | 72 +++---
src/core/na-object-id-enum.c | 4 +-
src/core/na-object-item-enum.c | 4 +-
src/core/na-object-item.c | 4 +-
src/core/na-object-menu-enum.c | 12 +-
src/core/na-object-menu.c | 72 +++---
src/core/na-object-profile-enum.c | 10 +-
src/core/na-object-profile.c | 62 +++---
src/core/na-object.c | 18 +-
src/io-desktop/nadp-desktop-provider.c | 14 +-
src/io-desktop/nadp-desktop-provider.h | 2 +-
src/io-desktop/nadp-keys.c | 2 +-
src/io-desktop/nadp-keys.h | 2 +-
src/io-desktop/nadp-reader.c | 14 +-
src/io-desktop/nadp-writer.c | 4 +-
src/io-xml/naxml-keys.h | 2 +-
src/io-xml/naxml-reader.c | 4 +-
src/test/test-include.c | 2 +-
36 files changed, 610 insertions(+), 574 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 97c775d..7cb3a82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,42 @@
2009-02-22 Pierre Wieser <pwieser trychlos org>
* src/api/Makefile.am:
+ * src/api/na-ifactory-object-enum.h:
+ * src/api/na-ifactory-object-str.h:
+ * src/api/na-ifactory-object.h:
+ * src/api/na-ifactory-provider.h:
+ * src/api/na-iio-provider.h:
+ * src/api/na-object-api.h:
+ * src/core/Makefile.am:
+ * src/core/na-data-element.c:
+ * src/core/na-data-element.h:
+ * src/core/na-factory-object.c:
+ * src/core/na-factory-object.h:
+ * src/core/na-ifactory-object.c:
+ * src/core/na-ifactory-provider-priv.h:
+ * src/core/na-ifactory-provider.c:
+ * src/core/na-object-action-enum.c:
+ * src/core/na-object-action.c:
+ * src/core/na-object-id-enum.c:
+ * src/core/na-object-item-enum.c:
+ * src/core/na-object-item.c:
+ * src/core/na-object-menu-enum.c:
+ * src/core/na-object-menu.c:
+ * src/core/na-object-profile-enum.c:
+ * src/core/na-object-profile.c:
+ * src/core/na-object.c:
+ * src/io-desktop/nadp-desktop-provider.c:
+ * src/io-desktop/nadp-desktop-provider.h:
+ * src/io-desktop/nadp-keys.c:
+ * src/io-desktop/nadp-keys.h:
+ * src/io-desktop/nadp-reader.c:
+ * src/io-desktop/nadp-writer.c:
+ * src/io-xml/naxml-keys.h:
+ * src/io-xml/naxml-reader.c:
+ * src/test/test-include.c:
+ Rename NAIDataFactory interface as NAIFactoryObject.
+
+ * src/api/Makefile.am:
* src/api/na-idata-factory-str.h:
* src/api/na-idata-factory.h:
* src/api/na-ifactory-provider-provider.h:
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 5003200..5a6773e 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -32,9 +32,6 @@ api_include_HEADERS = \
na-extension.h \
\
na-dbus.h \
- na-idata-factory.h \
- na-idata-factory-enum.h \
- na-idata-factory-str.h \
na-iexporter.h \
na-iimporter.h \
na-ifactory-provider.h \
@@ -45,6 +42,9 @@ api_include_HEADERS = \
na-gconf-monitor.h \
na-gconf-utils.h \
na-iduplicable.h \
+ na-ifactory-object.h \
+ na-ifactory-object-enum.h \
+ na-ifactory-object-str.h \
na-object-api.h \
na-object.h \
na-object-id.h \
diff --git a/src/api/na-idata-factory-enum.h b/src/api/na-ifactory-object-enum.h
similarity index 82%
rename from src/api/na-idata-factory-enum.h
rename to src/api/na-ifactory-object-enum.h
index 06dbc39..2540e9c 100644
--- a/src/api/na-idata-factory-enum.h
+++ b/src/api/na-ifactory-object-enum.h
@@ -28,15 +28,15 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_ENUM_H__
-#define __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_ENUM_H__
+#ifndef __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_ENUM_H__
+#define __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_ENUM_H__
#include <glib.h>
/**
- * SECTION: na_idata_factory
+ * SECTION: na_ifactory_object
* @short_description: Enumeration of all serializable elementary datas.
- * @include: nautilus-actions/na-idata-factory-enum.h
+ * @include: nautilus-actions/na-ifactory-object-enum.h
*/
G_BEGIN_DECLS
@@ -51,12 +51,12 @@ G_BEGIN_DECLS
*/
enum {
- NA_DATA_FACTORY_ID_GROUP = 1,
+ NA_FACTORY_OBJECT_ID_GROUP = 1,
NADF_DATA_ID,
NADF_DATA_LABEL,
NADF_DATA_PARENT,
- NA_DATA_FACTORY_ITEM_GROUP = 20,
+ NA_FACTORY_OBJECT_ITEM_GROUP = 20,
NADF_DATA_TOOLTIP,
NADF_DATA_ICON,
NADF_DATA_DESCRIPTION,
@@ -67,7 +67,7 @@ enum {
NADF_DATA_PROVIDER,
NADF_DATA_PROVIDER_DATA,
- NA_DATA_FACTORY_ACTION_GROUP = 40,
+ NA_FACTORY_OBJECT_ACTION_GROUP = 40,
NADF_DATA_VERSION,
NADF_DATA_TARGET_SELECTION,
NADF_DATA_TARGET_BACKGROUND,
@@ -76,9 +76,9 @@ enum {
NADF_DATA_TOOLBAR_SAME_LABEL,
NADF_DATA_LAST_ALLOCATED,
- NA_DATA_FACTORY_MENU_GROUP = 60,
+ NA_FACTORY_OBJECT_MENU_GROUP = 60,
- NA_DATA_FACTORY_PROFILE_GROUP = 80,
+ NA_FACTORY_OBJECT_PROFILE_GROUP = 80,
NADF_DATA_PATH,
NADF_DATA_PARAMETERS,
NADF_DATA_BASENAMES,
@@ -90,9 +90,9 @@ enum {
NADF_DATA_SCHEMES,
NADF_DATA_FOLDERS,
- NA_DATA_FACTORY_CONDITIONS_GROUP = 100,
+ NA_FACTORY_OBJECT_CONDITIONS_GROUP = 100,
};
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_ENUM_H__ */
+#endif /* __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_ENUM_H__ */
diff --git a/src/api/na-idata-factory-str.h b/src/api/na-ifactory-object-str.h
similarity index 90%
rename from src/api/na-idata-factory-str.h
rename to src/api/na-ifactory-object-str.h
index b4b7844..fdf6147 100644
--- a/src/api/na-idata-factory-str.h
+++ b/src/api/na-ifactory-object-str.h
@@ -28,13 +28,13 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_STR_H__
-#define __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_STR_H__
+#ifndef __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_STR_H__
+#define __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_STR_H__
/**
- * SECTION: na_idata_factory
+ * SECTION: na_ifactory_object
* @short_description: Data Factory Definitions.
- * @include: nautilus-actions/na-data-factory-str.h
+ * @include: nautilus-actions/na-factory-object-str.h
*/
#include <glib-object.h>
@@ -81,7 +81,7 @@ typedef struct {
/**
* The structure which fully describe an elementary data
- * Each #NAIDataFactory item definition may include several groups of
+ * Each #NAIFactoryObject item definition may include several groups of
* this structure
*/
typedef struct {
@@ -134,15 +134,15 @@ typedef struct {
/**
* The structure which fully describe a logical group of data
- * Each #NAIDataFactory item may definition may be built from a list of
+ * Each #NAIFactoryObject item may definition may be built from a list of
* these groups
*/
typedef struct {
- guint idgroup; /* cf. na-idata-factory-enum.h */
+ guint idgroup; /* cf. na-ifactory-object-enum.h */
NadfIdType *iddef;
}
NadfIdGroup;
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_STR_H__ */
+#endif /* __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_STR_H__ */
diff --git a/src/api/na-idata-factory.h b/src/api/na-ifactory-object.h
similarity index 58%
rename from src/api/na-idata-factory.h
rename to src/api/na-ifactory-object.h
index 18cdfd3..ddea8fa 100644
--- a/src/api/na-idata-factory.h
+++ b/src/api/na-ifactory-object.h
@@ -28,56 +28,56 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_H__
-#define __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_H__
+#ifndef __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_H__
+#define __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_H__
/**
- * SECTION: na_idata_factory
- * @short_description: #NAIDataFactory interface definition.
- * @include: nautilus-actions/na-idata_factory.h
+ * SECTION: na_ifactory_object
+ * @short_description: #NAIFactoryObject interface definition.
+ * @include: nautilus-actions/na-ifactory_object.h
*
* This interface must be implemented by #NAObject-derived objects which
* should take advantage of data factory management system.
*
- * A #NAObject which would implement this #NAIDataFactory interface
+ * A #NAObject which would implement this #NAIFactoryObject interface
* must meet following conditions:
* - must accept an empty constructor
*
* Nautilus-Actions v 2.30 - API version: 1
*/
-#include "na-idata-factory-enum.h"
-#include "na-idata-factory-str.h"
+#include "na-ifactory-object-enum.h"
+#include "na-ifactory-object-str.h"
#include "na-ifactory-provider-provider.h"
G_BEGIN_DECLS
-#define NA_IDATA_FACTORY_TYPE ( na_idata_factory_get_type())
-#define NA_IDATA_FACTORY( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_IDATA_FACTORY_TYPE, NAIDataFactory ))
-#define NA_IS_IDATA_FACTORY( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_IDATA_FACTORY_TYPE ))
-#define NA_IDATA_FACTORY_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IDATA_FACTORY_TYPE, NAIDataFactoryInterface ))
+#define NA_IFACTORY_OBJECT_TYPE ( na_ifactory_object_get_type())
+#define NA_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_CAST( instance, NA_IFACTORY_OBJECT_TYPE, NAIFactoryObject ))
+#define NA_IS_IFACTORY_OBJECT( instance ) ( G_TYPE_CHECK_INSTANCE_TYPE( instance, NA_IFACTORY_OBJECT_TYPE ))
+#define NA_IFACTORY_OBJECT_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IFACTORY_OBJECT_TYPE, NAIFactoryObjectInterface ))
-typedef struct NAIDataFactory NAIDataFactory;
+typedef struct NAIFactoryObject NAIFactoryObject;
-typedef struct NAIDataFactoryInterfacePrivate NAIDataFactoryInterfacePrivate;
+typedef struct NAIFactoryObjectInterfacePrivate NAIFactoryObjectInterfacePrivate;
typedef struct {
GTypeInterface parent;
- NAIDataFactoryInterfacePrivate *private;
+ NAIFactoryObjectInterfacePrivate *private;
/**
* get_version:
- * @instance: this #NAIDataFactory instance.
+ * @instance: this #NAIFactoryObject instance.
*
* Returns: the version of this interface supported by @instance implementation.
*
* Defaults to 1.
*/
- guint ( *get_version )( const NAIDataFactory *instance );
+ guint ( *get_version )( const NAIFactoryObject *instance );
/**
* get_default:
- * @instance: this #NAIDataFactory instance.
+ * @instance: this #NAIFactoryObject instance.
* @iddef: the #NadfIdType structure which defines the data whose
* default value is searched for.
*
@@ -88,46 +88,46 @@ typedef struct {
* Returns: a newly allocated string which defines the suitable
* default value, or %NULL.
*/
- gchar * ( *get_default )( const NAIDataFactory *instance, const NadfIdType *iddef );
+ gchar * ( *get_default )( const NAIFactoryObject *instance, const NadfIdType *iddef );
/**
* copy:
- * @instance: the target #NAIDataFactory instance.
- * @source: the source #NAIDataFactory instance.
+ * @instance: the target #NAIFactoryObject instance.
+ * @source: the source #NAIFactoryObject instance.
*
* This function is triggered when copying one instance to another,
* after all copyable elementary dats have been copied themselves.
* The target @instance may take advantage of this call to do some
* particular copy tasks.
*/
- void ( *copy ) ( NAIDataFactory *instance, const NAIDataFactory *source );
+ void ( *copy ) ( NAIFactoryObject *instance, const NAIFactoryObject *source );
/**
* are_equal:
- * @a: the first #NAIDataFactory instance.
- * @b: the second #NAIDataFactory instance.
+ * @a: the first #NAIFactoryObject instance.
+ * @b: the second #NAIFactoryObject instance.
*
* Returns: %TRUE if @a is equal to @b.
*
* This function is triggered after all elementary data comparisons
* have been sucessfully made.
*/
- gboolean ( *are_equal ) ( const NAIDataFactory *a, const NAIDataFactory *b );
+ gboolean ( *are_equal ) ( const NAIFactoryObject *a, const NAIFactoryObject *b );
/**
* is_valid:
- * @object: the #NAIDataFactory instance whose validity is to be checked.
+ * @object: the #NAIFactoryObject instance whose validity is to be checked.
*
* Returns: %TRUE if @object is valid.
*
* This function is triggered after all elementary data comparisons
* have been sucessfully made.
*/
- gboolean ( *is_valid ) ( const NAIDataFactory *object );
+ gboolean ( *is_valid ) ( const NAIFactoryObject *object );
/**
* read_start:
- * @instance: this #NAIDataFactory instance.
+ * @instance: this #NAIFactoryObject 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
@@ -135,11 +135,11 @@ typedef struct {
*
* Called just before the object is unserialized.
*/
- void ( *read_start ) ( NAIDataFactory *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
+ void ( *read_start ) ( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
/**
* read_done:
- * @instance: this #NAIDataFactory instance.
+ * @instance: this #NAIFactoryObject 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
@@ -147,11 +147,11 @@ typedef struct {
*
* Called when the object has been unserialized.
*/
- void ( *read_done ) ( NAIDataFactory *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
+ void ( *read_done ) ( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
/**
* write_start:
- * @instance: this #NAIDataFactory instance.
+ * @instance: this #NAIFactoryObject 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
@@ -159,11 +159,11 @@ typedef struct {
*
* Called just before the object is serialized.
*/
- void ( *write_start )( NAIDataFactory *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
+ void ( *write_start )( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
/**
* write_done:
- * @instance: this #NAIDataFactory instance.
+ * @instance: this #NAIFactoryObject 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
@@ -171,17 +171,17 @@ typedef struct {
*
* Called when the object has been serialized.
*/
- void ( *write_done ) ( NAIDataFactory *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
+ void ( *write_done ) ( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
}
- NAIDataFactoryInterface;
+ NAIFactoryObjectInterface;
-GType na_idata_factory_get_type( void );
+GType na_ifactory_object_get_type( void );
-void *na_idata_factory_get( const NAIDataFactory *object, guint data_id );
+void *na_ifactory_object_get( const NAIFactoryObject *object, guint data_id );
-void na_idata_factory_set_from_string( NAIDataFactory *object, guint data_id, const gchar *data );
-void na_idata_factory_set_from_void ( NAIDataFactory *object, guint data_id, const void *data );
+void na_ifactory_object_set_from_string( NAIFactoryObject *object, guint data_id, const gchar *data );
+void na_ifactory_object_set_from_void ( NAIFactoryObject *object, guint data_id, const void *data );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IDATA_FACTORY_H__ */
+#endif /* __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_H__ */
diff --git a/src/api/na-ifactory-provider.h b/src/api/na-ifactory-provider.h
index aced5e6..87e4374 100644
--- a/src/api/na-ifactory-provider.h
+++ b/src/api/na-ifactory-provider.h
@@ -44,7 +44,7 @@
* Nautilus-Actions v 2.30 - API version: 1
*/
-#include "na-idata-factory.h"
+#include "na-ifactory-object.h"
#include "na-ifactory-provider-provider.h"
G_BEGIN_DECLS
@@ -74,13 +74,13 @@ typedef struct {
* read_start:
* @reader: this #NAIFactoryProvider instance.
* @reader_data: the data associated to this instance.
- * @object: the #NAIDataFactory object which comes to be readen.
+ * @object: the #NAIFactoryObject object which comes to be readen.
* @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 #NAIDataFactory just before starting with reading data.
+ * API called by #NAIFactoryObject just before starting with reading data.
*/
- void ( *read_start ) ( const NAIFactoryProvider *reader, void *reader_data, NAIDataFactory *object, GSList **messages );
+ void ( *read_start ) ( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject *object, GSList **messages );
/**
* read_value:
@@ -106,26 +106,26 @@ typedef struct {
* read_done:
* @reader: this #NAIFactoryProvider instance.
* @reader_data: the data associated to this instance.
- * @object: the #NAIDataFactory object which comes to be readen.
+ * @object: the #NAIFactoryObject object which comes to be readen.
* @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 #NAIDataFactory when all data have been readen.
+ * API called by #NAIFactoryObject when all data have been readen.
* Implementor may take advantage of this to do some cleanup.
*/
- void ( *read_done ) ( const NAIFactoryProvider *reader, void *reader_data, NAIDataFactory *object, GSList **messages );
+ void ( *read_done ) ( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject *object, GSList **messages );
/**
* write_start:
* @writer: this #NAIFactoryProvider instance.
* @writer_data: the data associated to this instance.
- * @object: the #NAIDataFactory object which comes to be written.
+ * @object: the #NAIFactoryObject 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 #NAIDataFactory just before starting with writing data.
+ * API called by #NAIFactoryObject just before starting with writing data.
*/
- void ( *write_start )( const NAIFactoryProvider *writer, void *writer_data, NAIDataFactory *object, GSList **messages );
+ void ( *write_start )( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject *object, GSList **messages );
/**
* write_value:
@@ -146,21 +146,21 @@ typedef struct {
* write_done:
* @writer: this #NAIFactoryProvider instance.
* @writer_data: the data associated to this instance.
- * @object: the #NAIDataFactory object which comes to be written.
+ * @object: the #NAIFactoryObject 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 #NAIDataFactory when all data have been written.
+ * API called by #NAIFactoryObject when all data have been written.
* Implementor may take advantage of this to do some cleanup.
*/
- void ( *write_done ) ( const NAIFactoryProvider *writer, void *writer_data, NAIDataFactory *object, GSList **messages );
+ void ( *write_done ) ( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject *object, GSList **messages );
}
NAIFactoryProviderInterface;
GType na_ifactory_provider_get_type( void );
-NAIDataFactory *na_ifactory_provider_read_item ( const NAIFactoryProvider *reader, void *reader_data, GType type, GSList **messages );
-void na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_data, NAIDataFactory *serializable, GSList **messages );
+NAIFactoryObject *na_ifactory_provider_read_item ( const NAIFactoryProvider *reader, void *reader_data, GType type, GSList **messages );
+void na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject *serializable, GSList **messages );
NadfIdType *na_ifactory_provider_get_idtype_from_gconf_key( const gchar *xml_entry );
diff --git a/src/api/na-iio-provider.h b/src/api/na-iio-provider.h
index ae1cebc..c01d115 100644
--- a/src/api/na-iio-provider.h
+++ b/src/api/na-iio-provider.h
@@ -42,7 +42,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 #NAIDataFactory and #NAIFactoryProvider interfaces).
+ * factory management (see #NAIFactoryObject and #NAIFactoryProvider interfaces).
*
* Nautilus-Actions v 2.30 - API version: 1
*/
@@ -109,7 +109,7 @@ typedef struct {
*
* Reads the whole items list from the specified I/O provider.
*
- * Returns: a unordered flat #GList of #NAIDataFactory-derived objects
+ * Returns: a unordered flat #GList of #NAIFactoryObject-derived objects
* (menus or actions); the actions embed their own profiles.
*/
GList * ( *read_items ) ( const NAIIOProvider *instance, GSList **messages );
@@ -125,7 +125,7 @@ typedef struct {
* It is not supposed to make any assumption on the environment it is
* currently running on.
* This property just says that the developer/maintainer has released
- * the needed code in order to update/create/delete #NAIDataFactory-
+ * the needed code in order to update/create/delete #NAIFactoryObject-
* derived objects.
*
* Note that even if this property is %TRUE, there is yet many
diff --git a/src/api/na-object-api.h b/src/api/na-object-api.h
index 0fd6d63..b0c5a98 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-idata-factory.h"
-#include "na-idata-factory-enum.h"
+#include "na-ifactory-object.h"
+#include "na-ifactory-object-enum.h"
#include "na-iduplicable.h"
#include "na-object-action.h"
#include "na-object-profile.h"
@@ -77,13 +77,13 @@ G_BEGIN_DECLS
/* NAObjectId
*/
-#define na_object_get_id( obj ) (( gchar * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_ID ))
-#define na_object_get_label( obj ) (( gchar * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_LABEL ))
-#define na_object_get_parent( obj ) (( NAObjectItem * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_PARENT ))
+#define na_object_get_id( obj ) (( gchar * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ID ))
+#define na_object_get_label( obj ) (( gchar * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_LABEL ))
+#define na_object_get_parent( obj ) (( NAObjectItem * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_PARENT ))
-#define na_object_set_id( obj, id ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_ID, ( const void * )( id ))
-#define na_object_set_label( obj, label ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_LABEL, ( const void * )( label ))
-#define na_object_set_parent( obj, parent ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_PARENT, ( const void * )( parent ))
+#define na_object_set_id( obj, id ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ID, ( const void * )( id ))
+#define na_object_set_label( obj, label ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_LABEL, ( const void * )( label ))
+#define na_object_set_parent( obj, parent ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_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 ))
@@ -95,23 +95,23 @@ G_BEGIN_DECLS
/* NAObjectItem
*/
-#define na_object_get_tooltip( obj ) (( gchar * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_TOOLTIP ))
-#define na_object_get_icon( obj ) (( gchar * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_ICON ))
-#define na_object_get_items( obj ) (( GList * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_SUBITEMS ))
-#define na_object_get_items_slist( obj ) (( GSList * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_SUBITEMS_SLIST ))
-#define na_object_is_enabled( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_ENABLED )))
-#define na_object_is_readonly( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_READONLY )))
-#define na_object_get_provider( obj ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_PROVIDER )
-#define na_object_get_provider_data( obj ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_PROVIDER_DATA )
-
-#define na_object_set_tooltip( obj, tooltip ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_TOOLTIP, ( const void * )( tooltip ))
-#define na_object_set_icon( obj, icon ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_ICON, ( const void * )( icon ))
-#define na_object_set_items( obj, list ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_SUBITEMS, ( const void * )( list ))
-#define na_object_set_items_slist( obj, slist ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_SUBITEMS_SLIST, ( const void * )( slist ))
-#define na_object_set_enabled( obj, enabled ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_ENABLED, ( const void * ) GUINT_TO_POINTER( enabled ))
-#define na_object_set_readonly( obj, readonly ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_READONLY, ( const void * ) GUINT_TO_POINTER( readonly ))
-#define na_object_set_provider( obj, provider ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_PROVIDER, ( const void * )( provider ))
-#define na_object_set_provider_data( obj, data ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_PROVIDER_DATA, ( const void * )( data ))
+#define na_object_get_tooltip( obj ) (( gchar * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TOOLTIP ))
+#define na_object_get_icon( obj ) (( gchar * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ICON ))
+#define na_object_get_items( obj ) (( GList * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_SUBITEMS ))
+#define na_object_get_items_slist( obj ) (( GSList * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_SUBITEMS_SLIST ))
+#define na_object_is_enabled( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ENABLED )))
+#define na_object_is_readonly( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_READONLY )))
+#define na_object_get_provider( obj ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_PROVIDER )
+#define na_object_get_provider_data( obj ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_PROVIDER_DATA )
+
+#define na_object_set_tooltip( obj, tooltip ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TOOLTIP, ( const void * )( tooltip ))
+#define na_object_set_icon( obj, icon ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ICON, ( const void * )( icon ))
+#define na_object_set_items( obj, list ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_SUBITEMS, ( const void * )( list ))
+#define na_object_set_items_slist( obj, slist ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_SUBITEMS_SLIST, ( const void * )( slist ))
+#define na_object_set_enabled( obj, enabled ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_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 ), NADF_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 ), NADF_DATA_PROVIDER, ( const void * )( provider ))
+#define na_object_set_provider_data( obj, data ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_PROVIDER_DATA, ( const void * )( data ))
#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 ))
@@ -127,48 +127,48 @@ G_BEGIN_DECLS
/* NAObjectAction
*/
-#define na_object_get_version( obj ) (( gchar * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_VERSION ))
-#define na_object_is_target_selection( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_TARGET_SELECTION )))
-#define na_object_is_target_background( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_TARGET_BACKGROUND )))
-#define na_object_is_target_toolbar( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_TARGET_TOOLBAR )))
-#define na_object_get_toolbar_label( obj ) (( gchar * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_TOOLBAR_LABEL ))
-#define na_object_is_toolbar_same_label( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_TOOLBAR_SAME_LABEL )))
-#define na_object_get_last_allocated( obj ) (( guint ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_LAST_ALLOCATED )))
-
-#define na_object_set_version( obj, version ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_VERSION, ( const void * )( version ))
-#define na_object_set_target_selection( obj, target ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_TARGET_SELECTION, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_target_background( obj, target ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_TARGET_BACKGROUND, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_target_toolbar( obj, target ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_TARGET_TOOLBAR, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_toolbar_label( obj, label ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_TOOLBAR_LABEL, ( const void * )( label ))
-#define na_object_set_toolbar_same_label( obj, same ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_TOOLBAR_SAME_LABEL, ( const void * ) GUINT_TO_POINTER( same ))
-#define na_object_set_last_allocated( obj, last ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( last ))
-
-#define na_object_reset_last_allocated( obj ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( 0 ))
+#define na_object_get_version( obj ) (( gchar * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_VERSION ))
+#define na_object_is_target_selection( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TARGET_SELECTION )))
+#define na_object_is_target_background( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TARGET_BACKGROUND )))
+#define na_object_is_target_toolbar( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TARGET_TOOLBAR )))
+#define na_object_get_toolbar_label( obj ) (( gchar * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TOOLBAR_LABEL ))
+#define na_object_is_toolbar_same_label( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TOOLBAR_SAME_LABEL )))
+#define na_object_get_last_allocated( obj ) (( guint ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_LAST_ALLOCATED )))
+
+#define na_object_set_version( obj, version ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_VERSION, ( const void * )( version ))
+#define na_object_set_target_selection( obj, target ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TARGET_SELECTION, ( const void * ) GUINT_TO_POINTER( target ))
+#define na_object_set_target_background( obj, target ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_TARGET_BACKGROUND, ( const void * ) GUINT_TO_POINTER( target ))
+#define na_object_set_target_toolbar( obj, target ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_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 ), NADF_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 ), NADF_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 ), NADF_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( last ))
+
+#define na_object_reset_last_allocated( obj ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_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_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_PATH ))
-#define na_object_get_parameters( obj ) (( gchar * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_PARAMETERS ))
-#define na_object_get_basenames( obj ) (( GSList * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_BASENAMES ))
-#define na_object_is_matchcase( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_MATCHCASE )))
-#define na_object_get_mimetypes( obj ) (( GSList * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_MIMETYPES ))
-#define na_object_is_file( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_ISFILE )))
-#define na_object_is_dir( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_ISDIR )))
-#define na_object_is_multiple( obj ) (( gboolean ) GPOINTER_TO_UINT( na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_MULTIPLE )))
-#define na_object_get_schemes( obj ) (( GSList * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_SCHEMES ))
-#define na_object_get_folders( obj ) (( GSList * ) na_idata_factory_get( NA_IDATA_FACTORY( obj ), NADF_DATA_FOLDERS ))
-
-#define na_object_set_path( obj, path ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_PATH, ( const void * )( path ))
-#define na_object_set_parameters( obj, parms ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_PARAMETERS, ( const void * )( parms ))
-#define na_object_set_basenames( obj, bnames ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_BASENAMES, ( const void * )( bnames ))
-#define na_object_set_matchcase( obj, match ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_MATCHCASE, ( const void * ) GUINT_TO_POINTER( match ))
-#define na_object_set_mimetypes( obj, types ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_MIMETYPES, ( const void * )( types ))
-#define na_object_set_isfile( obj, isfile ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_ISFILE, ( const void * ) GUINT_TO_POINTER( isfile ))
-#define na_object_set_isdir( obj, isdir ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_ISDIR, ( const void * ) GUINT_TO_POINTER( isdir ))
-#define na_object_set_multiple( obj, multiple ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_MULTIPLE, ( const void * ) GUINT_TO_POINTER( multiple ))
-#define na_object_set_schemes( obj, schemes ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_SCHEMES, ( const void * )( schemes ))
-#define na_object_set_folders( obj, folders ) na_idata_factory_set_from_void( NA_IDATA_FACTORY( obj ), NADF_DATA_FOLDERS, ( const void * )( folders ))
+#define na_object_get_path( obj ) (( gchar * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_PATH ))
+#define na_object_get_parameters( obj ) (( gchar * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_PARAMETERS ))
+#define na_object_get_basenames( obj ) (( GSList * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_BASENAMES ))
+#define na_object_is_matchcase( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_MATCHCASE )))
+#define na_object_get_mimetypes( obj ) (( GSList * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_MIMETYPES ))
+#define na_object_is_file( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ISFILE )))
+#define na_object_is_dir( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ISDIR )))
+#define na_object_is_multiple( obj ) (( gboolean ) GPOINTER_TO_UINT( na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_MULTIPLE )))
+#define na_object_get_schemes( obj ) (( GSList * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_SCHEMES ))
+#define na_object_get_folders( obj ) (( GSList * ) na_ifactory_object_get( NA_IFACTORY_OBJECT( obj ), NADF_DATA_FOLDERS ))
+
+#define na_object_set_path( obj, path ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_PATH, ( const void * )( path ))
+#define na_object_set_parameters( obj, parms ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_PARAMETERS, ( const void * )( parms ))
+#define na_object_set_basenames( obj, bnames ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_BASENAMES, ( const void * )( bnames ))
+#define na_object_set_matchcase( obj, match ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_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 ), NADF_DATA_MIMETYPES, ( const void * )( types ))
+#define na_object_set_isfile( obj, isfile ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ISFILE, ( const void * ) GUINT_TO_POINTER( isfile ))
+#define na_object_set_isdir( obj, isdir ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_ISDIR, ( const void * ) GUINT_TO_POINTER( isdir ))
+#define na_object_set_multiple( obj, multiple ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_MULTIPLE, ( const void * ) GUINT_TO_POINTER( multiple ))
+#define na_object_set_schemes( obj, schemes ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_SCHEMES, ( const void * )( schemes ))
+#define na_object_set_folders( obj, folders ) na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NADF_DATA_FOLDERS, ( const void * )( folders ))
#define na_object_set_scheme( obj, scheme, add ) na_object_profile_set_scheme( NA_OBJECT_PROFILE( obj ), ( const gchar * )( scheme ), ( add ))
#define na_object_replace_folder( obj, old, new ) na_object_profile_replace_folder( NA_OBJECT_PROFILE( obj ), ( const gchar * )( old ), ( const gchar * )( new ))
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 685f927..4d3e84f 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -41,13 +41,13 @@ libna_core_la_SOURCES = \
na-core-utils.c \
na-data-element.c \
na-data-element.h \
- na-data-factory.c \
- na-data-factory.h \
na-dbus-tracker.h \
na-exporter.c \
na-exporter.h \
na-export-format.c \
na-export-format.h \
+ na-factory-object.c \
+ na-factory-object.h \
na-factory-provider.c \
na-factory-provider.h \
na-gconf-monitor.c \
@@ -57,12 +57,12 @@ libna_core_la_SOURCES = \
na-iabout.c \
na-iabout.h \
na-iduplicable.c \
- na-idata-factory.c \
na-iexporter.c \
- na-iimporter.c \
- na-iio-provider.c \
+ na-ifactory-object.c \
na-ifactory-provider.c \
na-ifactory-provider-priv.h \
+ na-iimporter.c \
+ na-iio-provider.c \
na-io-provider.c \
na-io-provider.h \
na-importer.c \
diff --git a/src/core/na-data-element.c b/src/core/na-data-element.c
index ed5f246..9ea249a 100644
--- a/src/core/na-data-element.c
+++ b/src/core/na-data-element.c
@@ -36,7 +36,7 @@
#include <string.h>
#include <api/na-core-utils.h>
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-str.h>
#include "na-data-element.h"
diff --git a/src/core/na-data-element.h b/src/core/na-data-element.h
index c29264b..009d2a6 100644
--- a/src/core/na-data-element.h
+++ b/src/core/na-data-element.h
@@ -36,13 +36,13 @@
* @short_description: #NADataElement class definition.
* @include: core/na-data-element.h
*
- * The object which encapsulates an elementary data of #NAIDataFactory.
+ * The object which encapsulates an elementary data of #NAIFactoryObject.
* A #NADataElement object has a type and a value.
*/
#include <glib-object.h>
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-str.h>
G_BEGIN_DECLS
diff --git a/src/core/na-data-factory.c b/src/core/na-factory-object.c
similarity index 60%
rename from src/core/na-data-factory.c
rename to src/core/na-factory-object.c
index 79e8777..12fb852 100644
--- a/src/core/na-data-factory.c
+++ b/src/core/na-factory-object.c
@@ -39,7 +39,7 @@
#include <api/na-ifactory-provider.h>
#include "na-data-element.h"
-#include "na-data-factory.h"
+#include "na-factory-object.h"
#include "na-factory-provider.h"
typedef gboolean ( *IdGroupIterFunc )( NadfIdType *iddef, void *user_data );
@@ -47,7 +47,7 @@ typedef gboolean ( *IdGroupIterFunc )( NadfIdType *iddef, void *user_data );
/* while iterating on read/write item
*/
typedef struct {
- NAIDataFactory *object;
+ NAIFactoryObject *object;
NAIFactoryProvider *reader;
void *reader_data;
GSList **messages;
@@ -57,7 +57,7 @@ typedef struct {
/* while iterating on set defaults
*/
typedef struct {
- NAIDataFactory *object;
+ NAIFactoryObject *object;
gboolean creation;
}
NadfNewIter;
@@ -70,42 +70,42 @@ typedef struct {
}
NadfDataValue;
-#define NA_IDATA_FACTORY_PROP_DATA "na-idata-factory-prop-data"
+#define NA_IFACTORY_OBJECT_PROP_DATA "na-ifactory-object-prop-data"
-extern gboolean idata_factory_initialized; /* defined in na-idata-factory.c */
-extern gboolean idata_factory_finalized; /* defined in na-idata-factory.c */
+extern gboolean ifactory_object_initialized; /* defined in na-ifactory-object.c */
+extern gboolean ifactory_object_finalized; /* defined in na-ifactory-object.c */
static gboolean define_class_properties_iter( const NadfIdType *iddef, GObjectClass *class );
-static gboolean data_factory_init_iter( const NadfIdType *iddef, NAIDataFactory *object );
-static gchar *v_get_default( const NAIDataFactory *object, const NadfIdType *iddef );
-static void v_copy( NAIDataFactory *target, const NAIDataFactory *source );
-static gboolean v_are_equal( const NAIDataFactory *a, const NAIDataFactory *b );
-static gboolean v_is_valid( const NAIDataFactory *object );
-static void data_factory_read_data( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, NadfIdGroup *groups, GSList **messages );
-static gboolean data_factory_read_data_iter( NadfIdType *iddef, NadfRWIter *iter );
-static void v_read_start( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
-static void v_read_done( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
-static void data_factory_write_data( NAIDataFactory *serializable, const NAIFactoryProvider *writer, void *writer_data, NadfIdGroup *groups, GSList **messages );
-static gboolean data_factory_write_data_iter( NadfIdType *iddef, NadfRWIter *iter );
-static void v_write_start( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
-static void v_write_done( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
-static NADataElement *data_element_from_id( const NAIDataFactory *object, guint data_id );
+static gboolean factory_object_init_iter( const NadfIdType *iddef, NAIFactoryObject *object );
+static gchar *v_get_default( const NAIFactoryObject *object, const NadfIdType *iddef );
+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 factory_object_read_data( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, NadfIdGroup *groups, GSList **messages );
+static gboolean factory_object_read_data_iter( NadfIdType *iddef, NadfRWIter *iter );
+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 void factory_object_write_data( NAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, NadfIdGroup *groups, GSList **messages );
+static gboolean factory_object_write_data_iter( NadfIdType *iddef, NadfRWIter *iter );
+static void v_write_start( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
+static void v_write_done( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
+static NADataElement *data_element_from_id( const NAIFactoryObject *object, guint data_id );
static void iter_on_id_groups( const NadfIdGroup *idgroups, gboolean serializable_only, IdGroupIterFunc pfn, void *user_data );
static void free_gvalue( GValue *value, guint type );
/**
- * na_data_factory_properties:
+ * na_factory_object_properties:
* @class: the #GObjectClass.
*
* Initializes the serializable properties.
*/
void
-na_data_factory_properties( GObjectClass *class )
+na_factory_object_properties( GObjectClass *class )
{
- static const gchar *thisfn = "na_data_factory_properties";
+ static const gchar *thisfn = "na_factory_object_properties";
NadfIdGroup *groups;
- if( idata_factory_initialized && !idata_factory_finalized ){
+ if( ifactory_object_initialized && !ifactory_object_finalized ){
g_debug( "%s: class=%p (%s)",
thisfn, ( void * ) class, G_OBJECT_CLASS_NAME( class ));
@@ -128,7 +128,7 @@ na_data_factory_properties( GObjectClass *class )
static gboolean
define_class_properties_iter( const NadfIdType *iddef, GObjectClass *class )
{
- static const gchar *thisfn = "na_data_factory_define_class_properties_iter";
+ static const gchar *thisfn = "na_factory_object_define_class_properties_iter";
gboolean stop;
GParamSpec *spec;
@@ -170,19 +170,19 @@ define_class_properties_iter( const NadfIdType *iddef, GObjectClass *class )
}
/**
- * na_data_factory_new:
+ * na_factory_object_new:
* @type: the GType type of the object we want allocate.
*
* Returns: a newly allocated #NAObject-derived object, or %NULL.
*
* The function checks that @type has been previously registered in the
- * data factory management system (cf. #na_data_factory_init_class()),
+ * data factory management system (cf. #na_factory_object_init_class()),
* and if so invoke an empty constructor with this @type.
*/
-NAIDataFactory *
-na_data_factory_new( GType type )
+NAIFactoryObject *
+na_factory_object_new( GType type )
{
- NAIDataFactory *object;
+ NAIFactoryObject *object;
NadfIdGroup *groups;
object = NULL;
@@ -192,15 +192,15 @@ na_data_factory_new( GType type )
groups = na_factory_provider_get_groups( type );
if( groups ){
- object = NA_IDATA_FACTORY( g_object_new( type, NULL ));
+ object = NA_IFACTORY_OBJECT( g_object_new( type, NULL ));
}
return( object );
}
/**
- * na_data_factory_init:
- * @object: the #NAIDataFactory being initialized.
+ * na_factory_object_init:
+ * @object: the #NAIFactoryObject being initialized.
*
* Initializes properties attached to the @object.
*
@@ -208,23 +208,23 @@ na_data_factory_new( GType type )
* defined elementary data, initializing it to its default value.
*/
void
-na_data_factory_init( NAIDataFactory *object )
+na_factory_object_init( NAIFactoryObject *object )
{
- static const gchar *thisfn = "na_data_factory_init";
+ static const gchar *thisfn = "na_factory_object_init";
NadfIdGroup *groups;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
- g_return_if_fail( NA_IS_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
groups = na_factory_provider_get_groups( G_OBJECT_TYPE( object ));
if( groups ){
- iter_on_id_groups( groups, FALSE, ( IdGroupIterFunc ) &data_factory_init_iter, object );
+ iter_on_id_groups( groups, FALSE, ( IdGroupIterFunc ) &factory_object_init_iter, object );
}
}
static gboolean
-data_factory_init_iter( const NadfIdType *iddef, NAIDataFactory *object )
+factory_object_init_iter( const NadfIdType *iddef, NAIFactoryObject *object )
{
gboolean stop;
GList *list;
@@ -243,28 +243,28 @@ data_factory_init_iter( const NadfIdType *iddef, NAIDataFactory *object )
data->iddef = ( NadfIdType * ) iddef;
data->element = element;
- list = g_object_get_data( G_OBJECT( object ), NA_IDATA_FACTORY_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
list = g_list_prepend( list, data );
- g_object_set_data( G_OBJECT( object ), NA_IDATA_FACTORY_PROP_DATA, list );
+ g_object_set_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA, list );
return( stop );
}
/**
- * na_data_factory_copy:
- * @target: the target #NAIDataFactory instance.
- * @source: the source #NAIDataFactory instance.
+ * na_factory_object_copy:
+ * @target: the target #NAIFactoryObject instance.
+ * @source: the source #NAIFactoryObject instance.
*
* Copies one instance to another.
*/
void
-na_data_factory_copy( NAIDataFactory *target, const NAIDataFactory *source )
+na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source )
{
GList *src_list, *isrc;
NadfDataValue *src_data;
NADataElement *tgt_element;
- src_list = g_object_get_data( G_OBJECT( source ), NA_IDATA_FACTORY_PROP_DATA );
+ src_list = g_object_get_data( G_OBJECT( source ), NA_IFACTORY_OBJECT_PROP_DATA );
for( isrc = src_list ; isrc ; isrc = isrc->next ){
src_data = ( NadfDataValue * ) isrc->data;
@@ -282,36 +282,36 @@ na_data_factory_copy( NAIDataFactory *target, const NAIDataFactory *source )
}
static gchar *
-v_get_default( const NAIDataFactory *object, const NadfIdType *iddef )
+v_get_default( const NAIFactoryObject *object, const NadfIdType *iddef )
{
gchar *default_value;
default_value = NULL;
- if( NA_IDATA_FACTORY_GET_INTERFACE( object )->get_default ){
- default_value = NA_IDATA_FACTORY_GET_INTERFACE( object )->get_default( object, iddef );
+ if( NA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_default ){
+ default_value = NA_IFACTORY_OBJECT_GET_INTERFACE( object )->get_default( object, iddef );
}
return( default_value );
}
static void
-v_copy( NAIDataFactory *target, const NAIDataFactory *source )
+v_copy( NAIFactoryObject *target, const NAIFactoryObject *source )
{
- if( NA_IDATA_FACTORY_GET_INTERFACE( target )->copy ){
- NA_IDATA_FACTORY_GET_INTERFACE( target )->copy( target, source );
+ if( NA_IFACTORY_OBJECT_GET_INTERFACE( target )->copy ){
+ NA_IFACTORY_OBJECT_GET_INTERFACE( target )->copy( target, source );
}
}
/**
- * na_data_factory_are_equal:
- * @a: the first #NAIDataFactory instance.
- * @b: the second #NAIDataFactory isntance.
+ * na_factory_object_are_equal:
+ * @a: the first #NAIFactoryObject instance.
+ * @b: the second #NAIFactoryObject isntance.
*
* Returns: %TRUE if @a is equal to @b, %FALSE else.
*/
gboolean
-na_data_factory_are_equal( const NAIDataFactory *a, const NAIDataFactory *b )
+na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b )
{
gboolean are_equal;
GList *a_list, *b_list, *ia;
@@ -320,8 +320,8 @@ na_data_factory_are_equal( const NAIDataFactory *a, const NAIDataFactory *b )
are_equal = FALSE;
- a_list = g_object_get_data( G_OBJECT( a ), NA_IDATA_FACTORY_PROP_DATA );
- b_list = g_object_get_data( G_OBJECT( b ), NA_IDATA_FACTORY_PROP_DATA );
+ 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 );
if( g_list_length( a_list ) == g_list_length( b_list )){
@@ -350,29 +350,29 @@ na_data_factory_are_equal( const NAIDataFactory *a, const NAIDataFactory *b )
}
static gboolean
-v_are_equal( const NAIDataFactory *a, const NAIDataFactory *b )
+v_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b )
{
gboolean are_equal;
are_equal = TRUE;
- if( NA_IDATA_FACTORY_GET_INTERFACE( a )->are_equal ){
- are_equal = NA_IDATA_FACTORY_GET_INTERFACE( a )->are_equal( a, b );
+ if( NA_IFACTORY_OBJECT_GET_INTERFACE( a )->are_equal ){
+ are_equal = NA_IFACTORY_OBJECT_GET_INTERFACE( a )->are_equal( a, b );
}
return( are_equal );
}
/**
- * na_data_factory_is_valid:
- * @object: the #NAIDataFactory instance whose validity is to be checked.
+ * na_factory_object_is_valid:
+ * @object: the #NAIFactoryObject instance whose validity is to be checked.
*
* Returns: %TRUE if @object is valid, %FALSE else.
*/
gboolean
-na_data_factory_is_valid( const NAIDataFactory *object )
+na_factory_object_is_valid( const NAIFactoryObject *object )
{
- static const gchar *thisfn = "na_data_factory_is_valid";
+ static const gchar *thisfn = "na_factory_object_is_valid";
gboolean is_valid;
GList *list_values, *iv;
NadfDataValue *a_data;
@@ -380,9 +380,9 @@ na_data_factory_is_valid( const NAIDataFactory *object )
g_debug( "%s: object=%p (%s)",
thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
- g_return_val_if_fail( NA_IS_IDATA_FACTORY( object ), FALSE );
+ g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), FALSE );
- list_values = g_object_get_data( G_OBJECT( object ), NA_IDATA_FACTORY_PROP_DATA );
+ list_values = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
is_valid = TRUE;
for( iv = list_values ; iv && is_valid ; iv = iv->next ){
@@ -405,32 +405,32 @@ na_data_factory_is_valid( const NAIDataFactory *object )
}
static gboolean
-v_is_valid( const NAIDataFactory *object )
+v_is_valid( const NAIFactoryObject *object )
{
gboolean is_valid;
is_valid = TRUE;
- if( NA_IDATA_FACTORY_GET_INTERFACE( object )->is_valid ){
- is_valid = NA_IDATA_FACTORY_GET_INTERFACE( object )->is_valid( object );
+ if( NA_IFACTORY_OBJECT_GET_INTERFACE( object )->is_valid ){
+ is_valid = NA_IFACTORY_OBJECT_GET_INTERFACE( object )->is_valid( object );
}
return( is_valid );
}
/**
- * na_data_factory_dump:
- * @object: this #NAIDataFactory instance.
+ * na_factory_object_dump:
+ * @object: this #NAIFactoryObject instance.
*
* Dumps the content of @object.
*/
void
-na_data_factory_dump( const NAIDataFactory *object )
+na_factory_object_dump( const NAIFactoryObject *object )
{
GList *list, *it;
NadfDataValue *str;
- list = g_object_get_data( G_OBJECT( object ), NA_IDATA_FACTORY_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
for( it = list ; it ; it = it->next ){
@@ -440,18 +440,18 @@ na_data_factory_dump( const NAIDataFactory *object )
}
/**
- * na_data_factory_finalize:
- * @object: the #NAIDataFactory being finalized.
+ * na_factory_object_finalize:
+ * @object: the #NAIFactoryObject being finalized.
*
* Clears all data associated with this @object.
*/
void
-na_data_factory_finalize( NAIDataFactory *object )
+na_factory_object_finalize( NAIFactoryObject *object )
{
GList *list, *it;
NadfDataValue *str;
- list = g_object_get_data( G_OBJECT( object ), NA_IDATA_FACTORY_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
for( it = list ; it ; it = it->next ){
@@ -464,8 +464,8 @@ na_data_factory_finalize( NAIDataFactory *object )
}
/**
- * na_data_factory_read:
- * @serializable: this #NAIDataFactory instance.
+ * na_factory_object_read:
+ * @serializable: this #NAIFactoryObject 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
@@ -474,22 +474,22 @@ na_data_factory_finalize( NAIDataFactory *object )
* Unserializes the object.
*/
void
-na_data_factory_read( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
+na_factory_object_read( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
{
- static const gchar *thisfn = "na_data_factory_read";
+ static const gchar *thisfn = "na_factory_object_read";
NadfIdGroup *groups;
gchar *msg;
- if( idata_factory_initialized && !idata_factory_finalized ){
+ if( ifactory_object_initialized && !ifactory_object_finalized ){
- g_return_if_fail( NA_IS_IDATA_FACTORY( serializable ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
groups = na_factory_provider_get_groups( G_OBJECT_TYPE( serializable ));
if( groups ){
v_read_start( serializable, reader, reader_data, messages );
- data_factory_read_data( serializable, reader, reader_data, groups, messages );
+ factory_object_read_data( serializable, reader, reader_data, groups, messages );
v_read_done( serializable, reader, reader_data, messages );
} else {
@@ -502,8 +502,8 @@ na_data_factory_read( NAIDataFactory *serializable, const NAIFactoryProvider *re
}
/*
- * data_factory_read_data:
- * @serializable: this #NAIDataFactory instance.
+ * factory_object_read_data:
+ * @serializable: this #NAIFactoryObject instance.
* @reader: the #NAIFactoryProvider which is at the origin of this read.
* @reader_data: reader data.
* @groups: the list of NadfIdGroup structure which define @serializable.
@@ -513,7 +513,7 @@ na_data_factory_read( NAIDataFactory *serializable, const NAIFactoryProvider *re
* Unserializes the object.
*/
static void
-data_factory_read_data( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, NadfIdGroup *groups, GSList **messages )
+factory_object_read_data( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, NadfIdGroup *groups, GSList **messages )
{
NadfRWIter *iter;
@@ -523,13 +523,13 @@ data_factory_read_data( NAIDataFactory *serializable, const NAIFactoryProvider *
iter->reader_data = reader_data;
iter->messages = messages;
- iter_on_id_groups( groups, TRUE, ( IdGroupIterFunc ) &data_factory_read_data_iter, iter );
+ iter_on_id_groups( groups, TRUE, ( IdGroupIterFunc ) &factory_object_read_data_iter, iter );
g_free( iter );
}
static gboolean
-data_factory_read_data_iter( NadfIdType *iddef, NadfRWIter *iter )
+factory_object_read_data_iter( NadfIdType *iddef, NadfRWIter *iter )
{
gboolean stop;
GValue *value;
@@ -553,24 +553,24 @@ data_factory_read_data_iter( NadfIdType *iddef, NadfRWIter *iter )
}
static void
-v_read_start( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
+v_read_start( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
{
- if( NA_IDATA_FACTORY_GET_INTERFACE( serializable )->read_start ){
- NA_IDATA_FACTORY_GET_INTERFACE( serializable )->read_start( serializable, reader, reader_data, messages );
+ if( NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_start ){
+ NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_start( serializable, reader, reader_data, messages );
}
}
static void
-v_read_done( NAIDataFactory *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
+v_read_done( NAIFactoryObject *serializable, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
{
- if( NA_IDATA_FACTORY_GET_INTERFACE( serializable )->read_done ){
- NA_IDATA_FACTORY_GET_INTERFACE( serializable )->read_done( serializable, reader, reader_data, messages );
+ if( NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_done ){
+ NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->read_done( serializable, reader, reader_data, messages );
}
}
/**
- * na_data_factory_write:
- * @serializable: this #NAIDataFactory instance.
+ * na_factory_object_write:
+ * @serializable: this #NAIFactoryObject 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
@@ -579,20 +579,20 @@ v_read_done( NAIDataFactory *serializable, const NAIFactoryProvider *reader, voi
* Serializes the object down to the @writer.
*/
void
-na_data_factory_write( NAIDataFactory *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
+na_factory_object_write( NAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
{
- static const gchar *thisfn = "na_data_factory_write";
+ static const gchar *thisfn = "na_factory_object_write";
NadfIdGroup *groups;
gchar *msg;
- g_return_if_fail( NA_IS_IDATA_FACTORY( serializable ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( writer ));
groups = na_factory_provider_get_groups( G_OBJECT_TYPE( serializable ));
if( groups ){
v_write_start( serializable, writer, writer_data, messages );
- data_factory_write_data( serializable, writer, writer_data, groups, messages );
+ factory_object_write_data( serializable, writer, writer_data, groups, messages );
v_write_done( serializable, writer, writer_data, messages );
} else {
@@ -604,8 +604,8 @@ na_data_factory_write( NAIDataFactory *serializable, const NAIFactoryProvider *w
}
/*
- * data_factory_write_data:
- * @serializable: this #NAIDataFactory instance.
+ * factory_object_write_data:
+ * @serializable: this #NAIFactoryObject instance.
* @writer: the #NAIFactoryProvider which is at the origin of this writ.
* @writer_data: writer data.
* @groups: the list of NadfIdGroup structure which define @serializable.
@@ -615,7 +615,7 @@ na_data_factory_write( NAIDataFactory *serializable, const NAIFactoryProvider *w
* Serializes the object.
*/
static void
-data_factory_write_data( NAIDataFactory *serializable, const NAIFactoryProvider *writer, void *writer_data, NadfIdGroup *groups, GSList **messages )
+factory_object_write_data( NAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, NadfIdGroup *groups, GSList **messages )
{
NadfRWIter *iter;
@@ -625,13 +625,13 @@ data_factory_write_data( NAIDataFactory *serializable, const NAIFactoryProvider
iter->reader_data = writer_data;
iter->messages = messages;
- iter_on_id_groups( groups, TRUE, ( IdGroupIterFunc ) &data_factory_write_data_iter, iter );
+ iter_on_id_groups( groups, TRUE, ( IdGroupIterFunc ) &factory_object_write_data_iter, iter );
g_free( iter );
}
static gboolean
-data_factory_write_data_iter( NadfIdType *iddef, NadfRWIter *iter )
+factory_object_write_data_iter( NadfIdType *iddef, NadfRWIter *iter )
{
gboolean stop;
@@ -643,36 +643,36 @@ data_factory_write_data_iter( NadfIdType *iddef, NadfRWIter *iter )
}
static void
-v_write_start( NAIDataFactory *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
+v_write_start( NAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
{
- if( NA_IDATA_FACTORY_GET_INTERFACE( serializable )->write_start ){
- NA_IDATA_FACTORY_GET_INTERFACE( serializable )->write_start( serializable, writer, writer_data, messages );
+ if( NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_start ){
+ NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_start( serializable, writer, writer_data, messages );
}
}
static void
-v_write_done( NAIDataFactory *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
+v_write_done( NAIFactoryObject *serializable, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
{
- if( NA_IDATA_FACTORY_GET_INTERFACE( serializable )->write_done ){
- NA_IDATA_FACTORY_GET_INTERFACE( serializable )->write_done( serializable, writer, writer_data, messages );
+ if( NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_done ){
+ NA_IFACTORY_OBJECT_GET_INTERFACE( serializable )->write_done( serializable, writer, writer_data, messages );
}
}
/**
- * na_data_factory_set_from_string:
- * @object: this #NAIDataFactory instance.
+ * na_factory_object_set_from_string:
+ * @object: this #NAIFactoryObject instance.
* @property_id: the elementary data id.
* @string: the string to be set in the element.
*
* Set the @object with the @string.
*/
void
-na_data_factory_set_from_string( NAIDataFactory *object, guint data_id, const gchar *string )
+na_factory_object_set_from_string( NAIFactoryObject *object, guint data_id, const gchar *string )
{
- static const gchar *thisfn = "na_data_factory_set_from_string";
+ static const gchar *thisfn = "na_factory_object_set_from_string";
NADataElement *element;
- g_return_if_fail( NA_IS_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
element = data_element_from_id( object, data_id );
if( element ){
@@ -684,8 +684,8 @@ na_data_factory_set_from_string( NAIDataFactory *object, guint data_id, const gc
}
/**
- * na_data_factory_set_from_value:
- * @object: this #NAIDataFactory instance.
+ * na_factory_object_set_from_value:
+ * @object: this #NAIFactoryObject instance.
* @property_id: the elementary data id.
* @value: the #GValue whose content is to be got.
*
@@ -695,12 +695,12 @@ na_data_factory_set_from_string( NAIDataFactory *object, guint data_id, const gc
* This is to be readen as "set data element from value".
*/
void
-na_data_factory_set_from_value( NAIDataFactory *object, guint data_id, const GValue *value )
+na_factory_object_set_from_value( NAIFactoryObject *object, guint data_id, const GValue *value )
{
- static const gchar *thisfn = "na_data_factory_set_from_value";
+ static const gchar *thisfn = "na_factory_object_set_from_value";
NADataElement *element;
- g_return_if_fail( NA_IS_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
element = data_element_from_id( object, data_id );
if( element ){
@@ -712,23 +712,23 @@ na_data_factory_set_from_value( NAIDataFactory *object, guint data_id, const GVa
}
/**
- * na_data_factory_set_from_void:
- * @object: this #NAIDataFactory instance.
+ * na_factory_object_set_from_void:
+ * @object: this #NAIFactoryObject instance.
* @data_id: the elementary data whose value is to be set.
* @data: the value to set.
*
* Set the elementary data with the given value.
*/
void
-na_data_factory_set_from_void( NAIDataFactory *object, guint data_id, const void *data )
+na_factory_object_set_from_void( NAIFactoryObject *object, guint data_id, const void *data )
{
- static const gchar *thisfn = "na_data_factory_set_from_void";
+ static const gchar *thisfn = "na_factory_object_set_from_void";
NADataElement *element;
/*g_debug( "%s: object=%p (%s), data_id=%d, data=%p",
thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ), data_id, ( void * ) data );*/
- g_return_if_fail( NA_IS_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
element = data_element_from_id( object, data_id );
if( element ){
@@ -740,8 +740,8 @@ na_data_factory_set_from_void( NAIDataFactory *object, guint data_id, const void
}
/**
- * na_data_factory_get:
- * @object: this #NAIDataFactory instance.
+ * na_factory_object_get:
+ * @object: this #NAIFactoryObject instance.
* @data_id: the elementary data whose value is to be got.
*
* Returns: the searched value.
@@ -752,13 +752,13 @@ na_data_factory_set_from_void( NAIDataFactory *object, guint data_id, const void
* caller.
*/
void *
-na_data_factory_get( const NAIDataFactory *object, guint data_id )
+na_factory_object_get( const NAIFactoryObject *object, guint data_id )
{
- static const gchar *thisfn = "na_data_factory_get";
+ static const gchar *thisfn = "na_factory_object_get";
void *value;
NADataElement *element;
- g_return_val_if_fail( NA_IS_IDATA_FACTORY( object ), NULL );
+ g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
value = NULL;
@@ -774,8 +774,8 @@ na_data_factory_get( const NAIDataFactory *object, guint data_id )
}
/**
- * na_data_factory_set_value:
- * @object: this #NAIDataFactory instance.
+ * na_factory_object_set_value:
+ * @object: this #NAIFactoryObject instance.
* @property_id: the elementary data id.
* @value: the #GValue to be set.
* @spec: the #GParamSpec which describes this data.
@@ -786,12 +786,12 @@ na_data_factory_get( const NAIDataFactory *object, guint data_id )
* This is to be readen as "set value from data element".
*/
void
-na_data_factory_set_value( const NAIDataFactory *object, guint property_id, GValue *value, GParamSpec *spec )
+na_factory_object_set_value( const NAIFactoryObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
- static const gchar *thisfn = "na_data_factory_set_value";
+ static const gchar *thisfn = "na_factory_object_set_value";
NADataElement *element;
- g_return_if_fail( NA_IS_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
element = data_element_from_id( object, property_id );
if( element ){
@@ -803,14 +803,14 @@ na_data_factory_set_value( const NAIDataFactory *object, guint property_id, GVal
}
static NADataElement *
-data_element_from_id( const NAIDataFactory *object, guint data_id )
+data_element_from_id( const NAIFactoryObject *object, guint data_id )
{
GList *list, *ip;
NADataElement *element;
element = NULL;
- list = g_object_get_data( G_OBJECT( object ), NA_IDATA_FACTORY_PROP_DATA );
+ list = g_object_get_data( G_OBJECT( object ), NA_IFACTORY_OBJECT_PROP_DATA );
for( ip = list ; ip && !element ; ip = ip->next ){
NadfDataValue *ndv = ( NadfDataValue * ) ip->data;
diff --git a/src/core/na-factory-object.h b/src/core/na-factory-object.h
new file mode 100644
index 0000000..761bb7c
--- /dev/null
+++ b/src/core/na-factory-object.h
@@ -0,0 +1,66 @@
+/*
+ * Nautilus Actions
+ * A Nautilus extension which offers configurable context menu actions.
+ *
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009, 2010 Pierre Wieser and others (see AUTHORS)
+ *
+ * This Program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this Library; see the file COPYING. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * ... and many others (see AUTHORS)
+ */
+
+#ifndef __CORE_NA_FACTORY_OBJECT_H__
+#define __CORE_NA_FACTORY_OBJECT_H__
+
+/**
+ * SECTION: na_ifactory_object
+ * @short_description: #NAIFactoryObject internal functions.
+ * @include: core/na-factory-object.h
+ */
+
+#include <api/na-ifactory-provider.h>
+
+G_BEGIN_DECLS
+
+void na_factory_object_properties( GObjectClass *class );
+NAIFactoryObject *na_factory_object_new ( GType type );
+
+void na_factory_object_init ( NAIFactoryObject *object );
+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_read ( NAIFactoryObject *object, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
+void na_factory_object_write ( NAIFactoryObject *object, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
+
+void na_factory_object_set_from_string( NAIFactoryObject *object, guint data_id, const gchar *data );
+void na_factory_object_set_from_value ( NAIFactoryObject *object, guint data_id, const GValue *value );
+void na_factory_object_set_from_void ( NAIFactoryObject *object, guint data_id, const void *data );
+
+void *na_factory_object_get ( const NAIFactoryObject *object, guint data_id );
+void na_factory_object_set_value ( const NAIFactoryObject *object, guint property_id, GValue *value, GParamSpec *spec );
+
+G_END_DECLS
+
+#endif /* __CORE_NA_FACTORY_OBJECT_H__ */
diff --git a/src/core/na-idata-factory.c b/src/core/na-ifactory-object.c
similarity index 58%
rename from src/core/na-idata-factory.c
rename to src/core/na-ifactory-object.c
index 0ffda7e..30e876c 100644
--- a/src/core/na-idata-factory.c
+++ b/src/core/na-ifactory-object.c
@@ -32,30 +32,30 @@
#include <config.h>
#endif
-#include <api/na-idata-factory.h>
+#include <api/na-ifactory-object.h>
-#include "na-data-factory.h"
+#include "na-factory-object.h"
/* private interface data
*/
-struct NAIDataFactoryInterfacePrivate {
+struct NAIFactoryObjectInterfacePrivate {
void *empty; /* so that gcc -pedantic is happy */
};
-gboolean idata_factory_initialized = FALSE;
-gboolean idata_factory_finalized = FALSE;
+gboolean ifactory_object_initialized = FALSE;
+gboolean ifactory_object_finalized = FALSE;
static GType register_type( void );
-static void interface_base_init( NAIDataFactoryInterface *klass );
-static void interface_base_finalize( NAIDataFactoryInterface *klass );
+static void interface_base_init( NAIFactoryObjectInterface *klass );
+static void interface_base_finalize( NAIFactoryObjectInterface *klass );
-static guint idata_factory_get_version( const NAIDataFactory *instance );
+static guint ifactory_object_get_version( const NAIFactoryObject *instance );
/**
* Registers the GType of this interface.
*/
GType
-na_idata_factory_get_type( void )
+na_ifactory_object_get_type( void )
{
static GType object_type = 0;
@@ -69,11 +69,11 @@ na_idata_factory_get_type( void )
static GType
register_type( void )
{
- static const gchar *thisfn = "na_idata_factory_register_type";
+ static const gchar *thisfn = "na_ifactory_object_register_type";
GType type;
static const GTypeInfo info = {
- sizeof( NAIDataFactoryInterface ),
+ sizeof( NAIFactoryObjectInterface ),
( 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, "NAIDataFactory", &info, 0 );
+ type = g_type_register_static( G_TYPE_INTERFACE, "NAIFactoryObject", &info, 0 );
g_type_interface_add_prerequisite( type, G_TYPE_OBJECT );
@@ -94,17 +94,17 @@ register_type( void )
}
static void
-interface_base_init( NAIDataFactoryInterface *klass )
+interface_base_init( NAIFactoryObjectInterface *klass )
{
- static const gchar *thisfn = "na_idata_factory_interface_base_init";
+ static const gchar *thisfn = "na_ifactory_object_interface_base_init";
- if( !idata_factory_initialized ){
+ if( !ifactory_object_initialized ){
g_debug( "%s: klass=%p (%s)", thisfn, ( void * ) klass, G_OBJECT_CLASS_NAME( klass ));
- klass->private = g_new0( NAIDataFactoryInterfacePrivate, 1 );
+ klass->private = g_new0( NAIFactoryObjectInterfacePrivate, 1 );
- klass->get_version = idata_factory_get_version;
+ klass->get_version = ifactory_object_get_version;
klass->get_default = NULL;
klass->copy = NULL;
klass->are_equal = NULL;
@@ -114,34 +114,34 @@ interface_base_init( NAIDataFactoryInterface *klass )
klass->write_start = NULL;
klass->write_done = NULL;
- idata_factory_initialized = TRUE;
+ ifactory_object_initialized = TRUE;
}
}
static void
-interface_base_finalize( NAIDataFactoryInterface *klass )
+interface_base_finalize( NAIFactoryObjectInterface *klass )
{
- static const gchar *thisfn = "na_idata_factory_interface_base_finalize";
+ static const gchar *thisfn = "na_ifactory_object_interface_base_finalize";
- if( idata_factory_initialized && !idata_factory_finalized ){
+ if( ifactory_object_initialized && !ifactory_object_finalized ){
g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
- idata_factory_finalized = TRUE;
+ ifactory_object_finalized = TRUE;
g_free( klass->private );
}
}
static guint
-idata_factory_get_version( const NAIDataFactory *instance )
+ifactory_object_get_version( const NAIFactoryObject *instance )
{
return( 1 );
}
/**
- * na_idata_factory_get:
- * @object: this #NAIDataFactory instance.
+ * na_ifactory_object_get:
+ * @object: this #NAIFactoryObject instance.
* @data_id: the elementary data whose value is to be got.
*
* Returns: the searched value.
@@ -152,41 +152,41 @@ idata_factory_get_version( const NAIDataFactory *instance )
* caller.
*/
void *
-na_idata_factory_get( const NAIDataFactory *object, guint data_id )
+na_ifactory_object_get( const NAIFactoryObject *object, guint data_id )
{
- g_return_val_if_fail( NA_IS_IDATA_FACTORY( object ), NULL );
+ g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NULL );
- return( na_data_factory_get( object, data_id ));
+ return( na_factory_object_get( object, data_id ));
}
/**
- * na_idata_factory_set_from_string:
- * @object: this #NAIDataFactory instance.
+ * na_ifactory_object_set_from_string:
+ * @object: this #NAIFactoryObject instance.
* @data_id: the elementary data whose value is to be set.
* @data: the value to set.
*
* Set the elementary data with the given value.
*/
void
-na_idata_factory_set_from_string( NAIDataFactory *object, guint data_id, const gchar *data )
+na_ifactory_object_set_from_string( NAIFactoryObject *object, guint data_id, const gchar *data )
{
- g_return_if_fail( NA_IS_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
- na_data_factory_set_from_string( object, data_id, data );
+ na_factory_object_set_from_string( object, data_id, data );
}
/**
- * na_idata_factory_set_from_void:
- * @object: this #NAIDataFactory instance.
+ * na_ifactory_object_set_from_void:
+ * @object: this #NAIFactoryObject instance.
* @data_id: the elementary data whose value is to be set.
* @data: the value to set.
*
* Set the elementary data with the given value.
*/
void
-na_idata_factory_set_from_void( NAIDataFactory *object, guint data_id, const void *data )
+na_ifactory_object_set_from_void( NAIFactoryObject *object, guint data_id, const void *data )
{
- g_return_if_fail( NA_IS_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
- na_data_factory_set_from_void( object, data_id, data );
+ na_factory_object_set_from_void( object, data_id, data );
}
diff --git a/src/core/na-ifactory-provider-priv.h b/src/core/na-ifactory-provider-priv.h
index 5f0f866..3567784 100644
--- a/src/core/na-ifactory-provider-priv.h
+++ b/src/core/na-ifactory-provider-priv.h
@@ -37,12 +37,12 @@
* @include: core/na-ifactory-priv.h
*/
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-str.h>
G_BEGIN_DECLS
/* the structure of registered types
- * a list of this structure is stored in #NAIDataFactory interface
+ * a list of this structure is stored in #NAIFactoryObject interface
*/
typedef struct {
GType type;
diff --git a/src/core/na-ifactory-provider.c b/src/core/na-ifactory-provider.c
index 9244400..e219be8 100644
--- a/src/core/na-ifactory-provider.c
+++ b/src/core/na-ifactory-provider.c
@@ -34,7 +34,7 @@
#include <api/na-ifactory-provider.h>
-#include "na-data-factory.h"
+#include "na-factory-object.h"
#include "na-ifactory-provider-priv.h"
#include "na-factory-provider.h"
@@ -48,10 +48,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, NAIDataFactory *serializable, GSList **messages );
-static void v_factory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, NAIDataFactory *serializable, GSList **messages );
-static void v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_data, NAIDataFactory *serializable, GSList **messages );
-static void v_factory_provider_write_done( const NAIFactoryProvider *writer, void *writer_data, NAIDataFactory *serializable, GSList **messages );
+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 void v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject *serializable, GSList **messages );
+static void v_factory_provider_write_done( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject *serializable, GSList **messages );
/**
* Registers the GType of this interface.
@@ -150,17 +150,17 @@ ifactory_provider_get_version( const NAIFactoryProvider *instance )
* na_ifactory_provider_read_item:
* @reader: the instance which implements this #NAIFactoryProvider interface.
* @reader_data: instance data.
- * @type: the #GType which identifies the #NAIDataFactory type.
+ * @type: the #GType which identifies the #NAIFactoryObject type.
* @messages: a pointer to a #GSList list of strings; the implementation
* may append messages to this list, but shouldn't reinitialize it.
*
- * Returns: a newly instantiated #NAIDataFactory object just readen from @reader.
+ * Returns: a newly instantiated #NAIFactoryObject object just readen from @reader.
*/
-NAIDataFactory *
+NAIFactoryObject *
na_ifactory_provider_read_item( const NAIFactoryProvider *reader, void *reader_data, GType type, GSList **messages )
{
static const gchar *thisfn = "na_ifactory_provider_read_item";
- NAIDataFactory *serializable;
+ NAIFactoryObject *serializable;
gchar *msg;
serializable = NULL;
@@ -169,11 +169,11 @@ na_ifactory_provider_read_item( const NAIFactoryProvider *reader, void *reader_d
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( reader ), NULL );
- serializable = na_data_factory_new( type );
+ serializable = na_factory_object_new( type );
if( serializable ){
v_factory_provider_read_start( reader, reader_data, serializable, messages );
- na_data_factory_read( serializable, reader, reader_data, messages );
+ na_factory_object_read( serializable, reader, reader_data, messages );
v_factory_provider_read_done( reader, reader_data, serializable, messages );
} else {
@@ -190,22 +190,22 @@ 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.
- * @serializable: the #NAIDataFactory-derived object to be serialized.
+ * @serializable: the #NAIFactoryObject-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.
*
* Writes the data down to the FactoryProvider.
*/
void
-na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_data, NAIDataFactory *serializable, GSList **messages )
+na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject *serializable, GSList **messages )
{
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( writer ));
- g_return_if_fail( NA_IS_IDATA_FACTORY( serializable ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
if( ifactory_provider_initialized && !ifactory_provider_finalized ){
v_factory_provider_write_start( writer, writer_data, serializable, messages );
- na_data_factory_write( serializable, writer, writer_data, messages );
+ na_factory_object_write( serializable, writer, writer_data, messages );
v_factory_provider_write_done( writer, writer_data, serializable, messages );
}
}
@@ -224,7 +224,7 @@ na_ifactory_provider_get_idtype_from_gconf_key( const gchar *entry )
}
static void
-v_factory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, NAIDataFactory *serializable, GSList **messages )
+v_factory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject *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 );
@@ -232,7 +232,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, NAIDataFactory *serializable, GSList **messages )
+v_factory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject *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 );
@@ -240,7 +240,7 @@ v_factory_provider_read_done( const NAIFactoryProvider *reader, void *reader_dat
}
static void
-v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_data, NAIDataFactory *serializable, GSList **messages )
+v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject *serializable, GSList **messages )
{
if( NA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_start ){
NA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_start( writer, writer_data, serializable, messages );
@@ -248,7 +248,7 @@ v_factory_provider_write_start( const NAIFactoryProvider *writer, void *writer_d
}
static void
-v_factory_provider_write_done( const NAIFactoryProvider *writer, void *writer_data, NAIDataFactory *serializable, GSList **messages )
+v_factory_provider_write_done( const NAIFactoryProvider *writer, void *writer_data, NAIFactoryObject *serializable, GSList **messages )
{
if( NA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_done ){
NA_IFACTORY_PROVIDER_GET_INTERFACE( writer )->write_done( writer, writer_data, serializable, messages );
diff --git a/src/core/na-object-action-enum.c b/src/core/na-object-action-enum.c
index 097af2d..baee665 100644
--- a/src/core/na-object-action-enum.c
+++ b/src/core/na-object-action-enum.c
@@ -32,8 +32,8 @@
#include <config.h>
#endif
-#include <api/na-idata-factory-enum.h>
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-enum.h>
+#include <api/na-ifactory-object-str.h>
extern NadfIdType id_iddef []; /* defined in na-object-id-enum.c */
extern NadfIdType item_iddef []; /* defined in na-object-item-enum.c */
@@ -146,9 +146,9 @@ static NadfIdType action_iddef [] = {
};
NadfIdGroup action_id_groups [] = {
- { NA_DATA_FACTORY_ID_GROUP, id_iddef },
- { NA_DATA_FACTORY_ITEM_GROUP, item_iddef },
- { NA_DATA_FACTORY_ACTION_GROUP, action_iddef },
- { NA_DATA_FACTORY_CONDITIONS_GROUP, NULL },
+ { NA_FACTORY_OBJECT_ID_GROUP, id_iddef },
+ { NA_FACTORY_OBJECT_ITEM_GROUP, item_iddef },
+ { NA_FACTORY_OBJECT_ACTION_GROUP, action_iddef },
+ { NA_FACTORY_OBJECT_CONDITIONS_GROUP, NULL },
{ 0 }
};
diff --git a/src/core/na-object-action.c b/src/core/na-object-action.c
index 837cfb8..5f85419 100644
--- a/src/core/na-object-action.c
+++ b/src/core/na-object-action.c
@@ -37,7 +37,7 @@
#include <api/na-object-api.h>
#include "na-factory-provider.h"
-#include "na-data-factory.h"
+#include "na-factory-object.h"
/* private class data
*/
@@ -68,14 +68,14 @@ static void instance_finalize( GObject *object );
static gboolean object_is_valid( const NAObject *object );
-static void idata_factory_iface_init( NAIDataFactoryInterface *iface );
-static guint idata_factory_get_version( const NAIDataFactory *instance );
-static gchar *idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *iddef );
-static void idata_factory_copy( NAIDataFactory *target, const NAIDataFactory *source );
-static gboolean idata_factory_are_equal( const NAIDataFactory *a, const NAIDataFactory *b );
-static gboolean idata_factory_is_valid( const NAIDataFactory *object );
-static void idata_factory_read_done( NAIDataFactory *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
-static void idata_factory_write_done( NAIDataFactory *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
+static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface );
+static guint ifactory_object_get_version( const NAIFactoryObject *instance );
+static gchar *ifactory_object_get_default( const NAIFactoryObject *instance, const NadfIdType *iddef );
+static void ifactory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source );
+static gboolean ifactory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b );
+static gboolean ifactory_object_is_valid( const NAIFactoryObject *object );
+static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
+static void ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
static gboolean object_object_is_valid( const NAObjectAction *action );
static gboolean is_valid_label( const NAObjectAction *action );
@@ -112,8 +112,8 @@ register_type( void )
( GInstanceInitFunc ) instance_init
};
- static const GInterfaceInfo idata_factory_iface_info = {
- ( GInterfaceInitFunc ) idata_factory_iface_init,
+ static const GInterfaceInfo ifactory_object_iface_info = {
+ ( GInterfaceInitFunc ) ifactory_object_iface_init,
NULL,
NULL
};
@@ -122,7 +122,7 @@ register_type( void )
type = g_type_register_static( NA_OBJECT_ITEM_TYPE, "NAObjectAction", &info, 0 );
- g_type_add_interface_static( type, NA_IDATA_FACTORY_TYPE, &idata_factory_iface_info );
+ g_type_add_interface_static( type, NA_IFACTORY_OBJECT_TYPE, &ifactory_object_iface_info );
na_factory_provider_register( type, action_id_groups );
@@ -154,7 +154,7 @@ class_init( NAObjectActionClass *klass )
klass->private = g_new0( NAObjectActionClassPrivate, 1 );
- na_data_factory_properties( object_class );
+ na_factory_object_properties( object_class );
}
static void
@@ -172,18 +172,18 @@ instance_init( GTypeInstance *instance, gpointer klass )
self->private = g_new0( NAObjectActionPrivate, 1 );
- na_data_factory_init( NA_IDATA_FACTORY( instance ));
+ na_factory_object_init( NA_IFACTORY_OBJECT( instance ));
}
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_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_ACTION( object )->private->dispose_has_run ){
- na_data_factory_set_value( NA_IDATA_FACTORY( object ), property_id, value, spec );
+ na_factory_object_set_value( NA_IFACTORY_OBJECT( object ), property_id, value, spec );
}
}
@@ -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_ACTION( object ));
- g_return_if_fail( NA_IS_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_ACTION( object )->private->dispose_has_run ){
- na_data_factory_set_from_value( NA_IDATA_FACTORY( object ), property_id, value );
+ na_factory_object_set_from_value( NA_IFACTORY_OBJECT( object ), property_id, value );
}
}
@@ -236,7 +236,7 @@ instance_finalize( GObject *object )
g_free( self->private );
- na_data_factory_finalize( NA_IDATA_FACTORY( object ));
+ na_factory_object_finalize( NA_IFACTORY_OBJECT( object ));
/* chain call to parent class */
if( G_OBJECT_CLASS( st_parent_class )->finalize ){
@@ -253,31 +253,31 @@ object_is_valid( const NAObject *object )
}
static void
-idata_factory_iface_init( NAIDataFactoryInterface *iface )
+ifactory_object_iface_init( NAIFactoryObjectInterface *iface )
{
- static const gchar *thisfn = "na_object_action_idata_factory_iface_init";
+ static const gchar *thisfn = "na_object_action_ifactory_object_iface_init";
g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
- iface->get_version = idata_factory_get_version;
- iface->get_default = idata_factory_get_default;
- iface->copy = idata_factory_copy;
- iface->are_equal = idata_factory_are_equal;
- iface->is_valid = idata_factory_is_valid;
+ iface->get_version = ifactory_object_get_version;
+ iface->get_default = ifactory_object_get_default;
+ iface->copy = ifactory_object_copy;
+ iface->are_equal = ifactory_object_are_equal;
+ iface->is_valid = ifactory_object_is_valid;
iface->read_start = NULL;
- iface->read_done = idata_factory_read_done;
+ iface->read_done = ifactory_object_read_done;
iface->write_start = NULL;
- iface->write_done = idata_factory_write_done;
+ iface->write_done = ifactory_object_write_done;
}
static guint
-idata_factory_get_version( const NAIDataFactory *instance )
+ifactory_object_get_version( const NAIFactoryObject *instance )
{
return( 1 );
}
static gchar *
-idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *iddef )
+ifactory_object_get_default( const NAIFactoryObject *instance, const NadfIdType *iddef )
{
gchar *value;
@@ -295,19 +295,19 @@ idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *idd
}
static void
-idata_factory_copy( NAIDataFactory *target, const NAIDataFactory *source )
+ifactory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source )
{
na_object_item_copy( NA_OBJECT_ITEM( target ), NA_OBJECT_ITEM( source ));
}
static gboolean
-idata_factory_are_equal( const NAIDataFactory *a, const NAIDataFactory *b )
+ifactory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b )
{
return( na_object_item_are_equal( NA_OBJECT_ITEM( a ), NA_OBJECT_ITEM( b )));
}
static gboolean
-idata_factory_is_valid( const NAIDataFactory *object )
+ifactory_object_is_valid( const NAIFactoryObject *object )
{
g_return_val_if_fail( NA_IS_OBJECT_ACTION( object ), FALSE );
@@ -315,15 +315,15 @@ idata_factory_is_valid( const NAIDataFactory *object )
}
static void
-idata_factory_read_done( NAIDataFactory *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
+ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
{
- g_debug( "na_object_action_idata_factory_read_done: instance=%p", ( void * ) instance );
+ g_debug( "na_object_action_ifactory_object_read_done: instance=%p", ( void * ) instance );
na_object_dump( instance );
}
static void
-idata_factory_write_done( NAIDataFactory *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
+ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
{
}
diff --git a/src/core/na-object-id-enum.c b/src/core/na-object-id-enum.c
index 70f7ce7..1554fdb 100644
--- a/src/core/na-object-id-enum.c
+++ b/src/core/na-object-id-enum.c
@@ -32,8 +32,8 @@
#include <config.h>
#endif
-#include <api/na-idata-factory-enum.h>
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-enum.h>
+#include <api/na-ifactory-object-str.h>
NadfIdType id_iddef [] = {
diff --git a/src/core/na-object-item-enum.c b/src/core/na-object-item-enum.c
index c455091..8bf56c4 100644
--- a/src/core/na-object-item-enum.c
+++ b/src/core/na-object-item-enum.c
@@ -32,8 +32,8 @@
#include <config.h>
#endif
-#include <api/na-idata-factory-enum.h>
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-enum.h>
+#include <api/na-ifactory-object-str.h>
static void free_items_list( void * list );
diff --git a/src/core/na-object-item.c b/src/core/na-object-item.c
index 0d20604..465e488 100644
--- a/src/core/na-object-item.c
+++ b/src/core/na-object-item.c
@@ -238,7 +238,7 @@ object_id_new_id( const NAObjectId *item, const NAObjectId *new_parent )
* Copies data from @source to @item.
*
* This function participates to the #na_iduplicable_duplicate() stack,
- * and is triggered after all copyable elementary data (in #NAIDataFactory
+ * and is triggered after all copyable elementary data (in #NAIFactoryObject
* sense) have already been copied themselves.
*
* We have to deal here with the subitems: duplicating childs from @source
@@ -280,7 +280,7 @@ na_object_item_copy( NAObjectItem *item, const NAObjectItem *source )
* Returns: %TRUE if @a is equal to @b.
*
* This function participates to the #na_iduplicable_check_status() stack,
- * and is triggered after all comparable elementary data (in #NAIDataFactory
+ * and is triggered after all comparable elementary data (in #NAIFactoryObject
* sense) have already been successfully compared.
*
* We have to deal here with the subitems: comparing childs by their ids
diff --git a/src/core/na-object-menu-enum.c b/src/core/na-object-menu-enum.c
index 8c9cdfe..b71addb 100644
--- a/src/core/na-object-menu-enum.c
+++ b/src/core/na-object-menu-enum.c
@@ -32,8 +32,8 @@
#include <config.h>
#endif
-#include <api/na-idata-factory-enum.h>
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-enum.h>
+#include <api/na-ifactory-object-str.h>
extern NadfIdType id_iddef []; /* defined in na-object-id-enum.c */
extern NadfIdType item_iddef []; /* defined in na-object-item-enum.c */
@@ -43,9 +43,9 @@ static NadfIdType menu_iddef [] = {
};
NadfIdGroup menu_id_groups [] = {
- { NA_DATA_FACTORY_ID_GROUP, id_iddef },
- { NA_DATA_FACTORY_ITEM_GROUP, item_iddef },
- { NA_DATA_FACTORY_MENU_GROUP, menu_iddef },
- { NA_DATA_FACTORY_CONDITIONS_GROUP, NULL },
+ { NA_FACTORY_OBJECT_ID_GROUP, id_iddef },
+ { NA_FACTORY_OBJECT_ITEM_GROUP, item_iddef },
+ { NA_FACTORY_OBJECT_MENU_GROUP, menu_iddef },
+ { NA_FACTORY_OBJECT_CONDITIONS_GROUP, NULL },
{ 0 }
};
diff --git a/src/core/na-object-menu.c b/src/core/na-object-menu.c
index 13eaa65..de7f76e 100644
--- a/src/core/na-object-menu.c
+++ b/src/core/na-object-menu.c
@@ -34,11 +34,11 @@
#include <glib/gi18n.h>
-#include <api/na-idata-factory.h>
+#include <api/na-ifactory-object.h>
#include <api/na-object-api.h>
#include "na-factory-provider.h"
-#include "na-data-factory.h"
+#include "na-factory-object.h"
/* private class data
*/
@@ -69,14 +69,14 @@ static void instance_finalize( GObject *object );
static gboolean object_is_valid( const NAObject *object );
-static void idata_factory_iface_init( NAIDataFactoryInterface *iface );
-static guint idata_factory_get_version( const NAIDataFactory *instance );
-static gchar *idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *iddef );
-static void idata_factory_copy( NAIDataFactory *target, const NAIDataFactory *source );
-static gboolean idata_factory_are_equal( const NAIDataFactory *a, const NAIDataFactory *b );
-static gboolean idata_factory_is_valid( const NAIDataFactory *object );
-static void idata_factory_read_done( NAIDataFactory *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
-static void idata_factory_write_done( NAIDataFactory *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
+static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface );
+static guint ifactory_object_get_version( const NAIFactoryObject *instance );
+static gchar *ifactory_object_get_default( const NAIFactoryObject *instance, const NadfIdType *iddef );
+static void ifactory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source );
+static gboolean ifactory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b );
+static gboolean ifactory_object_is_valid( const NAIFactoryObject *object );
+static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
+static void ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
static gboolean menu_is_valid( const NAObjectMenu *menu );
static gboolean is_valid_label( const NAObjectMenu *menu );
@@ -112,8 +112,8 @@ register_type( void )
( GInstanceInitFunc ) instance_init
};
- static const GInterfaceInfo idata_factory_iface_info = {
- ( GInterfaceInitFunc ) idata_factory_iface_init,
+ static const GInterfaceInfo ifactory_object_iface_info = {
+ ( GInterfaceInitFunc ) ifactory_object_iface_init,
NULL,
NULL
};
@@ -122,7 +122,7 @@ register_type( void )
type = g_type_register_static( NA_OBJECT_ITEM_TYPE, "NAObjectMenu", &info, 0 );
- g_type_add_interface_static( type, NA_IDATA_FACTORY_TYPE, &idata_factory_iface_info );
+ g_type_add_interface_static( type, NA_IFACTORY_OBJECT_TYPE, &ifactory_object_iface_info );
na_factory_provider_register( type, menu_id_groups );
@@ -154,7 +154,7 @@ class_init( NAObjectMenuClass *klass )
klass->private = g_new0( NAObjectMenuClassPrivate, 1 );
- na_data_factory_properties( object_class );
+ na_factory_object_properties( object_class );
}
static void
@@ -172,18 +172,18 @@ instance_init( GTypeInstance *instance, gpointer klass )
self->private = g_new0( NAObjectMenuPrivate, 1 );
- na_data_factory_init( NA_IDATA_FACTORY( instance ));
+ na_factory_object_init( NA_IFACTORY_OBJECT( instance ));
}
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_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_MENU( object )->private->dispose_has_run ){
- na_data_factory_set_value( NA_IDATA_FACTORY( object ), property_id, value, spec );
+ na_factory_object_set_value( NA_IFACTORY_OBJECT( object ), property_id, value, spec );
}
}
@@ -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_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_MENU( object )->private->dispose_has_run ){
- na_data_factory_set_from_value( NA_IDATA_FACTORY( object ), property_id, value );
+ na_factory_object_set_from_value( NA_IFACTORY_OBJECT( object ), property_id, value );
}
}
@@ -236,7 +236,7 @@ instance_finalize( GObject *object )
g_free( self->private );
- na_data_factory_finalize( NA_IDATA_FACTORY( object ));
+ na_factory_object_finalize( NA_IFACTORY_OBJECT( object ));
/* chain call to parent class */
if( G_OBJECT_CLASS( st_parent_class )->finalize ){
@@ -253,31 +253,31 @@ object_is_valid( const NAObject *object )
}
static void
-idata_factory_iface_init( NAIDataFactoryInterface *iface )
+ifactory_object_iface_init( NAIFactoryObjectInterface *iface )
{
- static const gchar *thisfn = "na_object_menu_idata_factory_iface_init";
+ static const gchar *thisfn = "na_object_menu_ifactory_object_iface_init";
g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
- iface->get_version = idata_factory_get_version;
- iface->get_default = idata_factory_get_default;
- iface->copy = idata_factory_copy;
- iface->are_equal = idata_factory_are_equal;
- iface->is_valid = idata_factory_is_valid;
+ iface->get_version = ifactory_object_get_version;
+ iface->get_default = ifactory_object_get_default;
+ iface->copy = ifactory_object_copy;
+ iface->are_equal = ifactory_object_are_equal;
+ iface->is_valid = ifactory_object_is_valid;
iface->read_start = NULL;
- iface->read_done = idata_factory_read_done;
+ iface->read_done = ifactory_object_read_done;
iface->write_start = NULL;
- iface->write_done = idata_factory_write_done;
+ iface->write_done = ifactory_object_write_done;
}
static guint
-idata_factory_get_version( const NAIDataFactory *instance )
+ifactory_object_get_version( const NAIFactoryObject *instance )
{
return( 1 );
}
static gchar *
-idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *iddef )
+ifactory_object_get_default( const NAIFactoryObject *instance, const NadfIdType *iddef )
{
gchar *value;
@@ -294,19 +294,19 @@ idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *idd
}
static void
-idata_factory_copy( NAIDataFactory *target, const NAIDataFactory *source )
+ifactory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source )
{
na_object_item_copy( NA_OBJECT_ITEM( target ), NA_OBJECT_ITEM( source ));
}
static gboolean
-idata_factory_are_equal( const NAIDataFactory *a, const NAIDataFactory *b )
+ifactory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *b )
{
return( na_object_item_are_equal( NA_OBJECT_ITEM( a ), NA_OBJECT_ITEM( b )));
}
static gboolean
-idata_factory_is_valid( const NAIDataFactory *object )
+ifactory_object_is_valid( const NAIFactoryObject *object )
{
g_return_val_if_fail( NA_IS_OBJECT_MENU( object ), FALSE );
@@ -314,13 +314,13 @@ idata_factory_is_valid( const NAIDataFactory *object )
}
static void
-idata_factory_read_done( NAIDataFactory *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
+ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
{
}
static void
-idata_factory_write_done( NAIDataFactory *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
+ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
{
}
diff --git a/src/core/na-object-profile-enum.c b/src/core/na-object-profile-enum.c
index 0eba135..dbfe967 100644
--- a/src/core/na-object-profile-enum.c
+++ b/src/core/na-object-profile-enum.c
@@ -32,8 +32,8 @@
#include <config.h>
#endif
-#include <api/na-idata-factory-enum.h>
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-enum.h>
+#include <api/na-ifactory-object-str.h>
extern NadfIdType id_iddef []; /* defined in na-object-id-enum.c */
@@ -191,8 +191,8 @@ static NadfIdType profile_iddef [] = {
};
NadfIdGroup profile_id_groups [] = {
- { NA_DATA_FACTORY_ID_GROUP, id_iddef },
- { NA_DATA_FACTORY_PROFILE_GROUP, profile_iddef },
- { NA_DATA_FACTORY_CONDITIONS_GROUP, NULL },
+ { NA_FACTORY_OBJECT_ID_GROUP, id_iddef },
+ { NA_FACTORY_OBJECT_PROFILE_GROUP, profile_iddef },
+ { NA_FACTORY_OBJECT_CONDITIONS_GROUP, NULL },
{ 0 }
};
diff --git a/src/core/na-object-profile.c b/src/core/na-object-profile.c
index 522ac93..4dbb9b7 100644
--- a/src/core/na-object-profile.c
+++ b/src/core/na-object-profile.c
@@ -39,11 +39,11 @@
#include <libnautilus-extension/nautilus-file-info.h>
#include <api/na-core-utils.h>
-#include <api/na-idata-factory.h>
+#include <api/na-ifactory-object.h>
#include <api/na-object-api.h>
#include "na-factory-provider.h"
-#include "na-data-factory.h"
+#include "na-factory-object.h"
#include "na-dbus-tracker.h"
#include "na-gnome-vfs-uri.h"
@@ -78,12 +78,12 @@ static void instance_finalize( GObject *object );
static gboolean object_is_valid( const NAObject *object );
-static void idata_factory_iface_init( NAIDataFactoryInterface *iface );
-static guint idata_factory_get_version( const NAIDataFactory *instance );
-static gchar *idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *iddef );
-static gboolean idata_factory_is_valid( const NAIDataFactory *object );
-static void idata_factory_read_done( NAIDataFactory *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
-static void idata_factory_write_done( NAIDataFactory *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
+static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface );
+static guint ifactory_object_get_version( const NAIFactoryObject *instance );
+static gchar *ifactory_object_get_default( const NAIFactoryObject *instance, const NadfIdType *iddef );
+static gboolean ifactory_object_is_valid( const NAIFactoryObject *object );
+static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
+static void ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
static gboolean profile_is_valid( const NAObjectProfile *profile );
static gboolean is_valid_path_parameters( const NAObjectProfile *profile );
@@ -139,8 +139,8 @@ register_type( void )
( GInstanceInitFunc ) instance_init
};
- static const GInterfaceInfo idata_factory_iface_info = {
- ( GInterfaceInitFunc ) idata_factory_iface_init,
+ static const GInterfaceInfo ifactory_object_iface_info = {
+ ( GInterfaceInitFunc ) ifactory_object_iface_init,
NULL,
NULL
};
@@ -149,7 +149,7 @@ register_type( void )
type = g_type_register_static( NA_OBJECT_ID_TYPE, "NAObjectProfile", &info, 0 );
- g_type_add_interface_static( type, NA_IDATA_FACTORY_TYPE, &idata_factory_iface_info );
+ g_type_add_interface_static( type, NA_IFACTORY_OBJECT_TYPE, &ifactory_object_iface_info );
na_factory_provider_register( type, profile_id_groups );
@@ -185,7 +185,7 @@ class_init( NAObjectProfileClass *klass )
klass->private = g_new0( NAObjectProfileClassPrivate, 1 );
- na_data_factory_properties( object_class );
+ na_factory_object_properties( object_class );
}
static void
@@ -205,18 +205,18 @@ instance_init( GTypeInstance *instance, gpointer klass )
self->private->dispose_has_run = FALSE;
- na_data_factory_init( NA_IDATA_FACTORY( instance ));
+ na_factory_object_init( NA_IFACTORY_OBJECT( instance ));
}
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_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_PROFILE( object )->private->dispose_has_run ){
- na_data_factory_set_value( NA_IDATA_FACTORY( object ), property_id, value, spec );
+ na_factory_object_set_value( NA_IFACTORY_OBJECT( object ), property_id, value, spec );
}
}
@@ -224,11 +224,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_IDATA_FACTORY( object ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
if( !NA_OBJECT_PROFILE( object )->private->dispose_has_run ){
- na_data_factory_set_from_value( NA_IDATA_FACTORY( object ), property_id, value );
+ na_factory_object_set_from_value( NA_IFACTORY_OBJECT( object ), property_id, value );
}
}
@@ -269,7 +269,7 @@ instance_finalize( GObject *object )
g_free( self->private );
- na_data_factory_finalize( NA_IDATA_FACTORY( object ));
+ na_factory_object_finalize( NA_IFACTORY_OBJECT( object ));
/* chain call to parent class */
if( G_OBJECT_CLASS( st_parent_class )->finalize ){
@@ -286,31 +286,31 @@ object_is_valid( const NAObject *object )
}
static void
-idata_factory_iface_init( NAIDataFactoryInterface *iface )
+ifactory_object_iface_init( NAIFactoryObjectInterface *iface )
{
- static const gchar *thisfn = "na_object_menu_idata_factory_iface_init";
+ static const gchar *thisfn = "na_object_menu_ifactory_object_iface_init";
g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
- iface->get_version = idata_factory_get_version;
- iface->get_default = idata_factory_get_default;
+ iface->get_version = ifactory_object_get_version;
+ iface->get_default = ifactory_object_get_default;
iface->copy = NULL;
iface->are_equal = NULL;
- iface->is_valid = idata_factory_is_valid;
+ iface->is_valid = ifactory_object_is_valid;
iface->read_start = NULL;
- iface->read_done = idata_factory_read_done;
+ iface->read_done = ifactory_object_read_done;
iface->write_start = NULL;
- iface->write_done = idata_factory_write_done;
+ iface->write_done = ifactory_object_write_done;
}
static guint
-idata_factory_get_version( const NAIDataFactory *instance )
+ifactory_object_get_version( const NAIFactoryObject *instance )
{
return( 1 );
}
static gchar *
-idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *iddef )
+ifactory_object_get_default( const NAIFactoryObject *instance, const NadfIdType *iddef )
{
gchar *value;
@@ -331,9 +331,9 @@ idata_factory_get_default( const NAIDataFactory *instance, const NadfIdType *idd
}
static gboolean
-idata_factory_is_valid( const NAIDataFactory *object )
+ifactory_object_is_valid( const NAIFactoryObject *object )
{
- static const gchar *thisfn = "na_object_profile_idata_factory_is_valid: object";
+ static const gchar *thisfn = "na_object_profile_ifactory_object_is_valid: object";
g_debug( "%s: object=%p (%s)",
thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
@@ -344,13 +344,13 @@ idata_factory_is_valid( const NAIDataFactory *object )
}
static void
-idata_factory_read_done( NAIDataFactory *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
+ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages )
{
}
static void
-idata_factory_write_done( NAIDataFactory *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
+ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages )
{
}
diff --git a/src/core/na-object.c b/src/core/na-object.c
index 659f635..75cb5e8 100644
--- a/src/core/na-object.c
+++ b/src/core/na-object.c
@@ -34,7 +34,7 @@
#include <api/na-object-api.h>
-#include "na-data-factory.h"
+#include "na-factory-object.h"
/* private class data
*/
@@ -213,8 +213,8 @@ object_dump( const NAObject *object )
na_iduplicable_dump( NA_IDUPLICABLE( object ));
- if( NA_IS_IDATA_FACTORY( object )){
- na_data_factory_dump( NA_IDATA_FACTORY( object ));
+ if( NA_IS_IFACTORY_OBJECT( object )){
+ na_factory_object_dump( NA_IFACTORY_OBJECT( object ));
}
}
@@ -239,8 +239,8 @@ iduplicable_copy( NAIDuplicable *target, const NAIDuplicable *source )
if( !NA_OBJECT( source )->private->dispose_has_run &&
!NA_OBJECT( target )->private->dispose_has_run ){
- if( NA_IS_IDATA_FACTORY( source )){
- na_data_factory_copy( NA_IDATA_FACTORY( target ), NA_IDATA_FACTORY( source ));
+ if( NA_IS_IFACTORY_OBJECT( source )){
+ na_factory_object_copy( NA_IFACTORY_OBJECT( target ), NA_IFACTORY_OBJECT( source ));
} else {
iter_on_class_hierarchy( NA_OBJECT( source ),
@@ -275,8 +275,8 @@ iduplicable_are_equal( const NAIDuplicable *a, const NAIDuplicable *b )
if( !NA_OBJECT( a )->private->dispose_has_run &&
!NA_OBJECT( b )->private->dispose_has_run ){
- if( NA_IS_IDATA_FACTORY( a )){
- are_equal = na_data_factory_are_equal( NA_IDATA_FACTORY( a ), NA_IDATA_FACTORY( b ));
+ if( NA_IS_IFACTORY_OBJECT( a )){
+ are_equal = na_factory_object_are_equal( NA_IFACTORY_OBJECT( a ), NA_IFACTORY_OBJECT( b ));
} else {
str = g_new0( HierarchyIter, 1 );
@@ -323,8 +323,8 @@ iduplicable_is_valid( const NAIDuplicable *object )
if( !NA_OBJECT( object )->private->dispose_has_run ){
- if( NA_IS_IDATA_FACTORY( object )){
- is_valid = na_data_factory_is_valid( NA_IDATA_FACTORY( object ));
+ if( NA_IS_IFACTORY_OBJECT( object )){
+ is_valid = na_factory_object_is_valid( NA_IFACTORY_OBJECT( object ));
} else {
g_debug( "%s: object=%p (%s): iterating on class hierarchy",
diff --git a/src/io-desktop/nadp-desktop-provider.c b/src/io-desktop/nadp-desktop-provider.c
index c701725..8b6f2be 100644
--- a/src/io-desktop/nadp-desktop-provider.c
+++ b/src/io-desktop/nadp-desktop-provider.c
@@ -65,9 +65,9 @@ static guint iio_provider_get_version( const NAIIOProvider *provider );
static void ifactory_provider_iface_init( NAIFactoryProviderInterface *iface );
static guint ifactory_provider_get_version( const NAIFactoryProvider *reader );
-static void ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, NAIDataFactory *serializable, GSList **messages );
+static void ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject *serializable, GSList **messages );
static GValue *ifactory_provider_read_value( const NAIFactoryProvider *reader, void *reader_data, const NadfIdType *iddef, GSList **messages );
-static void ifactory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, NAIDataFactory *serializable, GSList **messages );
+static void ifactory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject *serializable, GSList **messages );
GType
nadp_desktop_provider_get_type( void )
@@ -244,7 +244,7 @@ ifactory_provider_get_version( const NAIFactoryProvider *reader )
* called before starting with reading an object
*/
static void
-ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, NAIDataFactory *serializable, GSList **messages )
+ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject *serializable, GSList **messages )
{
static const gchar *thisfn = "nadp_desktop_provider_ifactory_provider_read_start";
@@ -257,7 +257,7 @@ ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_dat
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
g_return_if_fail( NADP_IS_DESKTOP_PROVIDER( reader ));
- g_return_if_fail( NA_IS_IDATA_FACTORY( serializable ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
if( !NADP_DESKTOP_PROVIDER( reader )->private->dispose_has_run ){
@@ -352,11 +352,11 @@ ifactory_provider_read_value( const NAIFactoryProvider *reader, void *reader_dat
}
/*
- * called when each NAIDataFactory object has been readen
+ * called when each NAIFactoryObject object has been readen
* nothing to do here
*/
static void
-ifactory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, NAIDataFactory *serializable, GSList **messages )
+ifactory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, NAIFactoryObject *serializable, GSList **messages )
{
static const gchar *thisfn = "nadp_desktop_provider_ifactory_provider_read_done";
/*NAObjectProfile *profile;*/
@@ -370,7 +370,7 @@ ifactory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
g_return_if_fail( NADP_IS_DESKTOP_PROVIDER( reader ));
- g_return_if_fail( NA_IS_IDATA_FACTORY( serializable ));
+ g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
if( !NADP_DESKTOP_PROVIDER( reader )->private->dispose_has_run ){
diff --git a/src/io-desktop/nadp-desktop-provider.h b/src/io-desktop/nadp-desktop-provider.h
index 62defd8..b5a2b55 100644
--- a/src/io-desktop/nadp-desktop-provider.h
+++ b/src/io-desktop/nadp-desktop-provider.h
@@ -76,7 +76,7 @@ typedef struct {
}
NadpDesktopProviderClass;
-/* the structure passed as reader data to NAIDataFactory
+/* the structure passed as reader data to NAIFactoryObject
*/
typedef struct {
NadpDesktopFile *ndf;
diff --git a/src/io-desktop/nadp-keys.c b/src/io-desktop/nadp-keys.c
index 1c79697..fb80810 100644
--- a/src/io-desktop/nadp-keys.c
+++ b/src/io-desktop/nadp-keys.c
@@ -32,7 +32,7 @@
#include <config.h>
#endif
-#include <api/na-idata-factory-enum.h>
+#include <api/na-ifactory-object-enum.h>
#include "nadp-keys.h"
diff --git a/src/io-desktop/nadp-keys.h b/src/io-desktop/nadp-keys.h
index 7a32682..5924297 100644
--- a/src/io-desktop/nadp-keys.h
+++ b/src/io-desktop/nadp-keys.h
@@ -31,7 +31,7 @@
#ifndef __NADP_KEYS_H__
#define __NADP_KEYS_H__
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-str.h>
G_BEGIN_DECLS
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 5e16a57..35741fb 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <api/na-core-utils.h>
-#include <api/na-idata-factory-enum.h>
+#include <api/na-ifactory-object-enum.h>
#include <api/na-ifactory-provider.h>
#include <api/na-object-api.h>
@@ -54,7 +54,7 @@ static GList *get_list_of_desktop_paths( const NadpDesktopProvider *pro
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 NAIDataFactory *item_from_desktop_path( const NadpDesktopProvider *provider, DesktopPath *dps, GSList **messages );
+static NAIFactoryObject *item_from_desktop_path( const NadpDesktopProvider *provider, DesktopPath *dps, GSList **messages );
#if 0
static void read_menu_from_desktop_file( const NadpDesktopProvider *provider, NAObjectMenu *menu, NadpDesktopFile *ndf, GSList **messages );
static void read_action_from_desktop_file( const NadpDesktopProvider *provider, NAObjectAction *action, NadpDesktopFile *ndf, GSList **messages );
@@ -65,7 +65,7 @@ static void exec_to_path_parameters( const gchar *command, gchar **pa
static void free_desktop_paths( GList *paths );
/*
- * Returns an unordered list of NAIDataFactory-derived objects
+ * Returns an unordered list of NAIFactoryObject-derived objects
*
* This is implementation of NAIIOProvider::read_items method
*/
@@ -75,7 +75,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;
- NAIDataFactory *item;
+ NAIFactoryObject *item;
g_debug( "%s: provider=%p (%s), messages=%p",
thisfn, ( void * ) provider, G_OBJECT_TYPE_NAME( provider ), ( void * ) messages );
@@ -231,14 +231,14 @@ desktop_path_from_id( const NadpDesktopProvider *provider, GList *files, const g
}
/*
- * Returns a newly allocated NAIDataFactory-derived object, initialized
+ * Returns a newly allocated NAIFactoryObject-derived object, initialized
* from the .desktop file pointed to by DesktopPath struct
*/
-static NAIDataFactory *
+static NAIFactoryObject *
item_from_desktop_path( const NadpDesktopProvider *provider, DesktopPath *dps, GSList **messages )
{
static const gchar *thisfn = "nadp_reader_item_from_desktop_path";
- NAIDataFactory *item;
+ NAIFactoryObject *item;
NadpDesktopFile *ndf;
gchar *type;
GType reader_type;
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 2f205fa..033a823 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -229,7 +229,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_IDATA_FACTORY( item ), ret );
+ g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( item ), ret );
g_return_val_if_fail( NADP_IS_DESKTOP_FILE( ndf ), ret );
@@ -241,7 +241,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_IDATA_FACTORY( item ), messages );
+ na_ifactory_provider_write_item( NA_IFACTORY_PROVIDER( provider ), ndf, NA_IFACTORY_OBJECT( item ), messages );
if( !nadp_desktop_file_write( ndf )){
ret = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
diff --git a/src/io-xml/naxml-keys.h b/src/io-xml/naxml-keys.h
index cd5f6a9..f00000d 100644
--- a/src/io-xml/naxml-keys.h
+++ b/src/io-xml/naxml-keys.h
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-idata-factory-str.h>
+#include <api/na-ifactory-object-str.h>
G_BEGIN_DECLS
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index 0bb893e..36b0298 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -782,7 +782,7 @@ iter_on_elements_list( NAXMLReader *reader )
/* this is for the action or menu body
*/
if( path_length == 2+PATH_ID_IDX ){
- na_idata_factory_set_from_string( NA_IDATA_FACTORY( reader->private->item ), str->iddef->id, str->key_value );
+ na_ifactory_object_set_from_string( NA_IFACTORY_OBJECT( reader->private->item ), str->iddef->id, str->key_value );
/* this is for a profile
*/
@@ -803,7 +803,7 @@ iter_on_elements_list( NAXMLReader *reader )
na_object_set_id( profile, profile_name );
na_object_action_attach_profile( NA_OBJECT_ACTION( reader->private->item ), profile );
}
- na_idata_factory_set_from_string( NA_IDATA_FACTORY( profile ), str->iddef->id, str->key_value );
+ na_ifactory_object_set_from_string( NA_IFACTORY_OBJECT( profile ), str->iddef->id, str->key_value );
g_free( profile_name );
}
}
diff --git a/src/test/test-include.c b/src/test/test-include.c
index 826834d..9c62f2a 100644
--- a/src/test/test-include.c
+++ b/src/test/test-include.c
@@ -1,6 +1,6 @@
#include <stdio.h>
-#include <api/na-idata-factory.h>
+#include <api/na-ifactory-object.h>
int
main()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
