Commit 60e30b91 authored by Pierre Wieser's avatar Pierre Wieser

na_factory_provider renamed to fma_factory_provider

parent e8017dd4
......@@ -66,8 +66,8 @@ libna_core_la_SOURCES = \
fma-export-format.h \
fma-factory-object.c \
fma-factory-object.h \
na-factory-provider.c \
na-factory-provider.h \
fma-factory-provider.c \
fma-factory-provider.h \
na-gconf-migration.c \
na-gconf-migration.h \
fma-gconf-monitor.c \
......
......@@ -43,7 +43,7 @@
#include <api/fma-object-api.h>
#include "fma-factory-object.h"
#include "na-factory-provider.h"
#include "fma-factory-provider.h"
typedef gboolean ( *FMADataDefIterFunc )( FMADataDef *def, void *user_data );
......@@ -633,7 +633,7 @@ read_data_iter( FMADataDef *def, NafoReadIter *iter )
stop = FALSE;
FMADataBoxed *boxed = na_factory_provider_read_data( iter->reader, iter->reader_data, iter->object, def, iter->messages );
FMADataBoxed *boxed = fma_factory_provider_read_data( iter->reader, iter->reader_data, iter->object, def, iter->messages );
if( boxed ){
FMADataBoxed *exist = fma_ifactory_object_get_data_boxed( iter->object, def->name );
......@@ -714,7 +714,7 @@ write_data_iter( const FMAIFactoryObject *object, FMADataBoxed *boxed, NafoWrite
const FMADataDef *def = fma_data_boxed_get_data_def( boxed );
if( def->writable ){
iter->code = na_factory_provider_write_data( iter->writer, iter->writer_data, object, boxed, iter->messages );
iter->code = fma_factory_provider_write_data( iter->writer, iter->writer_data, object, boxed, iter->messages );
}
/* iter while code is ok */
......
......@@ -33,10 +33,10 @@
#include <api/fma-iio-provider.h>
#include "na-factory-provider.h"
#include "fma-factory-provider.h"
/*
* na_factory_provider_read_data:
* fma_factory_provider_read_data:
* @reader: the instance which implements this #FMAIFactoryProvider interface.
* @reader_data: instance data.
* @object: the #NAIFactoryobject being unserialized.
......@@ -49,7 +49,7 @@
* Returns: a new #FMADataBoxed object which contains the data.
*/
FMADataBoxed *
na_factory_provider_read_data( const FMAIFactoryProvider *reader, void *reader_data,
fma_factory_provider_read_data( const FMAIFactoryProvider *reader, void *reader_data,
const FMAIFactoryObject *object, const FMADataDef *def,
GSList **messages )
{
......@@ -68,7 +68,7 @@ na_factory_provider_read_data( const FMAIFactoryProvider *reader, void *reader_d
}
/*
* na_factory_provider_write_data:
* fma_factory_provider_write_data:
* @writer: the instance which implements this #FMAIFactoryProvider interface.
* @writer_data: instance data.
* @object: the #NAIFactoryobject being serialized.
......@@ -79,7 +79,7 @@ na_factory_provider_read_data( const FMAIFactoryProvider *reader, void *reader_d
* Returns: a FMAIIOProvider operation return code.
*/
guint
na_factory_provider_write_data( const FMAIFactoryProvider *writer, void *writer_data,
fma_factory_provider_write_data( const FMAIFactoryProvider *writer, void *writer_data,
const FMAIFactoryObject *object, const FMADataBoxed *boxed,
GSList **messages )
{
......
......@@ -32,7 +32,7 @@
/* @title: FMAIFactoryProvider
* @short_description: The #FMAIFactoryProvider Internal Functions
* @include: core/na-factory-provider.h
* @include: core/fma-factory-provider.h
*
* Declare the function only accessed from core library (not published as API).
*/
......@@ -42,14 +42,14 @@
G_BEGIN_DECLS
FMADataBoxed *na_factory_provider_read_data ( const FMAIFactoryProvider *reader, void *reader_data,
FMADataBoxed *fma_factory_provider_read_data ( const FMAIFactoryProvider *reader, void *reader_data,
const FMAIFactoryObject *object, const FMADataDef *def,
GSList **messages );
guint na_factory_provider_write_data( const FMAIFactoryProvider *writer, void *writer_data,
guint fma_factory_provider_write_data( const FMAIFactoryProvider *writer, void *writer_data,
const FMAIFactoryObject *object, const FMADataBoxed *boxed,
GSList **messages );
G_END_DECLS
#endif /* __NAUTILUS_ACTIONS_API_FMA_FACTORY_PROVIDER_H__ */
#endif /* __CORE_FMA_FACTORY_PROVIDER_H__ */
......@@ -35,7 +35,7 @@
#include <api/fma-ifactory-provider.h>
#include "fma-factory-object.h"
#include "na-factory-provider.h"
#include "fma-factory-provider.h"
/* private interface data
*/
......
......@@ -40,7 +40,7 @@
#include <api/fma-iio-provider.h>
#include <api/fma-object-api.h>
#include "na-factory-provider.h"
#include "fma-factory-provider.h"
#include "fma-factory-object.h"
/* private class data
......
......@@ -38,7 +38,7 @@
#include <api/fma-ifactory-object.h>
#include <api/fma-object-api.h>
#include "na-factory-provider.h"
#include "fma-factory-provider.h"
#include "fma-factory-object.h"
/* private class data
......
......@@ -41,7 +41,7 @@
#include <api/fma-ifactory-object.h>
#include <api/fma-object-api.h>
#include "na-factory-provider.h"
#include "fma-factory-provider.h"
#include "fma-factory-object.h"
#include "na-selected-info.h"
#include "na-gnome-vfs-uri.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment