[nautilus-actions/file-manager-actions] na_factory_provider renamed to fma_factory_provider
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] na_factory_provider renamed to fma_factory_provider
- Date: Mon, 7 Sep 2015 22:10:18 +0000 (UTC)
commit 5158f0fff4626028020da7abad2eac8ce509333b
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Sep 7 23:36:21 2015 +0200
na_factory_provider renamed to fma_factory_provider
src/core/Makefile.am | 4 ++--
src/core/fma-factory-object.c | 6 +++---
...a-factory-provider.c => fma-factory-provider.c} | 10 +++++-----
...a-factory-provider.h => fma-factory-provider.h} | 8 ++++----
src/core/fma-ifactory-provider.c | 2 +-
src/core/fma-object-action.c | 2 +-
src/core/fma-object-menu.c | 2 +-
src/core/fma-object-profile.c | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 4bd070c..5d0b7b3 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -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 \
diff --git a/src/core/fma-factory-object.c b/src/core/fma-factory-object.c
index 600d32c..df25185 100644
--- a/src/core/fma-factory-object.c
+++ b/src/core/fma-factory-object.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 */
diff --git a/src/core/na-factory-provider.c b/src/core/fma-factory-provider.c
similarity index 92%
rename from src/core/na-factory-provider.c
rename to src/core/fma-factory-provider.c
index f58e9d6..2e241e7 100644
--- a/src/core/na-factory-provider.c
+++ b/src/core/fma-factory-provider.c
@@ -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 )
{
diff --git a/src/core/na-factory-provider.h b/src/core/fma-factory-provider.h
similarity index 85%
rename from src/core/na-factory-provider.h
rename to src/core/fma-factory-provider.h
index c4ec536..be9d828 100644
--- a/src/core/na-factory-provider.h
+++ b/src/core/fma-factory-provider.h
@@ -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__ */
diff --git a/src/core/fma-ifactory-provider.c b/src/core/fma-ifactory-provider.c
index 2bff157..abf3556 100644
--- a/src/core/fma-ifactory-provider.c
+++ b/src/core/fma-ifactory-provider.c
@@ -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
*/
diff --git a/src/core/fma-object-action.c b/src/core/fma-object-action.c
index 74c2ad5..95aae66 100644
--- a/src/core/fma-object-action.c
+++ b/src/core/fma-object-action.c
@@ -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
diff --git a/src/core/fma-object-menu.c b/src/core/fma-object-menu.c
index 2b33e53..2c804db 100644
--- a/src/core/fma-object-menu.c
+++ b/src/core/fma-object-menu.c
@@ -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
diff --git a/src/core/fma-object-profile.c b/src/core/fma-object-profile.c
index 48b8f0b..4037289 100644
--- a/src/core/fma-object-profile.c
+++ b/src/core/fma-object-profile.c
@@ -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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]