GNOME.org
 

[nautilus-actions/file-manager-actions] NagpWriter is renamed to FMAGConfWriter

commit 5bb709a952430aa548b00f59be80bb4dc6e4907d
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 17:05:52 2015 +0200

    NagpWriter is renamed to FMAGConfWriter

 src/io-gconf/Makefile.am                           |    4 +-
 src/io-gconf/fma-gconf-provider.c                  |   16 ++++----
 src/io-gconf/fma-gconf-reader.h                    |    6 +-
 src/io-gconf/{nagp-writer.c => fma-gconf-writer.c} |   24 ++++++------
 src/io-gconf/{nagp-writer.h => fma-gconf-writer.h} |   42 +++++++++++--------
 5 files changed, 49 insertions(+), 43 deletions(-)
---
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index ce2c63f..71e94d2 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -44,8 +44,8 @@ libna_io_gconf_la_SOURCES = \
        fma-gconf-module.c                                                                      \
        fma-gconf-reader.c                                                                      \
        fma-gconf-reader.h                                                                      \
-       nagp-writer.c                                                                           \
-       nagp-writer.h                                                                           \
+       fma-gconf-writer.c                                                                      \
+       fma-gconf-writer.h                                                                      \
        $(NULL)
 
 libna_io_gconf_la_LIBADD = \
diff --git a/src/io-gconf/fma-gconf-provider.c b/src/io-gconf/fma-gconf-provider.c
index 03df27a..0eedc45 100644
--- a/src/io-gconf/fma-gconf-provider.c
+++ b/src/io-gconf/fma-gconf-provider.c
@@ -40,7 +40,7 @@
 
 #include "fma-gconf-provider.h"
 #include "fma-gconf-reader.h"
-#include "nagp-writer.h"
+#include "fma-gconf-writer.h"
 #include "fma-gconf-keys.h"
 
 /* private class data
@@ -223,11 +223,11 @@ iio_provider_iface_init( FMAIIOProviderInterface *iface )
        iface->get_name = iio_provider_get_name;
        iface->get_version = iio_provider_get_version;
        iface->read_items = fma_gconf_reader_iio_provider_read_items;
-       iface->is_willing_to_write = nagp_iio_provider_is_willing_to_write;
-       iface->is_able_to_write = nagp_iio_provider_is_able_to_write;
+       iface->is_willing_to_write = fma_gconf_writer_iio_provider_is_willing_to_write;
+       iface->is_able_to_write = fma_gconf_writer_iio_provider_is_able_to_write;
 #ifdef NA_ENABLE_DEPRECATED
-       iface->write_item = nagp_iio_provider_write_item;
-       iface->delete_item = nagp_iio_provider_delete_item;
+       iface->write_item = fma_gconf_writer_iio_provider_write_item;
+       iface->delete_item = fma_gconf_writer_iio_provider_delete_item;
 #else
        iface->write_item = NULL;
        iface->delete_item = NULL;
@@ -265,9 +265,9 @@ ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface )
        iface->read_data = fma_gconf_reader_read_data;
        iface->read_done = fma_gconf_reader_read_done;
 #ifdef NA_ENABLE_DEPRECATED
-       iface->write_start = nagp_writer_write_start;
-       iface->write_data = nagp_writer_write_data;
-       iface->write_done = nagp_writer_write_done;
+       iface->write_start = fma_gconf_writer_write_start;
+       iface->write_data = fma_gconf_writer_write_data;
+       iface->write_done = fma_gconf_writer_write_done;
 #else
        iface->write_start = NULL;
        iface->write_data = NULL;
diff --git a/src/io-gconf/fma-gconf-reader.h b/src/io-gconf/fma-gconf-reader.h
index fde27fc..c28c9cb 100644
--- a/src/io-gconf/fma-gconf-reader.h
+++ b/src/io-gconf/fma-gconf-reader.h
@@ -27,8 +27,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __FMA_GCONF_READER_H__
-#define __FMA_GCONF_READER_H__
+#ifndef __IO_GCONF_FMA_GCONF_READER_H__
+#define __IO_GCONF_FMA_GCONF_READER_H__
 
 #include <api/fma-iio-provider.h>
 #include <api/fma-ifactory-provider.h>
@@ -43,4 +43,4 @@ void          fma_gconf_reader_read_done ( const FMAIFactoryProvider *provider,
 
 G_END_DECLS
 
-#endif /* __FMA_GCONF_READER_H__ */
+#endif /* __IO_GCONF_FMA_GCONF_READER_H__ */
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/fma-gconf-writer.c
similarity index 91%
rename from src/io-gconf/nagp-writer.c
rename to src/io-gconf/fma-gconf-writer.c
index b8f9033..b7e806d 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/fma-gconf-writer.c
@@ -42,7 +42,7 @@
 #include <api/fma-gconf-utils.h>
 
 #include "fma-gconf-provider.h"
-#include "nagp-writer.h"
+#include "fma-gconf-writer.h"
 #include "fma-gconf-keys.h"
 
 #ifdef NA_ENABLE_DEPRECATED
@@ -54,7 +54,7 @@ static void write_start_write_version( FMAGConfProvider *provider, FMAObjectItem
  * API function: should only be called through FMAIIOProvider interface
  */
 gboolean
-nagp_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
+fma_gconf_writer_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
 {
 #ifdef NA_ENABLE_DEPRECATED
        return( TRUE );
@@ -75,11 +75,11 @@ nagp_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
  * API function: should only be called through FMAIIOProvider interface
  */
 gboolean
-nagp_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
+fma_gconf_writer_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
 {
 #ifdef NA_ENABLE_DEPRECATED
-       static const gchar *thisfn = "nagp_iio_provider_is_able_to_write";
-       static const gchar *path = "/apps/filemanager-actions/foo";
+       static const gchar *thisfn = "fma_gconf_writer_iio_provider_is_able_to_write";
+       static const gchar *path = "/apps/nautilus-actions/foo";
        FMAGConfProvider *self;
        gboolean able_to = FALSE;
 
@@ -126,7 +126,7 @@ nagp_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
  * before trying to write the new ones
  */
 guint
-nagp_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectItem *item, GSList **messages )
+fma_gconf_writer_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectItem *item, GSList 
**messages )
 {
        static const gchar *thisfn = "fma_gconf_provider_iio_provider_write_item";
        FMAGConfProvider *self;
@@ -150,7 +150,7 @@ nagp_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectIte
                return( IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
        }
 
-       ret = nagp_iio_provider_delete_item( provider, item, messages );
+       ret = fma_gconf_writer_iio_provider_delete_item( provider, item, messages );
 
        if( ret == IIO_PROVIDER_CODE_OK ){
                fma_ifactory_provider_write_item( FMA_IFACTORY_PROVIDER( provider ), NULL, 
FMA_IFACTORY_OBJECT( item ), messages );
@@ -166,7 +166,7 @@ nagp_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectIte
  * cf. http://bugzilla.gnome.org/show_bug.cgi?id=325585
  */
 guint
-nagp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectItem *item, GSList **messages )
+fma_gconf_writer_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectItem *item, GSList 
**messages )
 {
        static const gchar *thisfn = "fma_gconf_provider_iio_provider_delete_item";
        FMAGConfProvider *self;
@@ -233,7 +233,7 @@ nagp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectIt
 }
 
 guint
-nagp_writer_write_start( const FMAIFactoryProvider *writer, void *writer_data,
+fma_gconf_writer_write_start( const FMAIFactoryProvider *writer, void *writer_data,
                                                        const FMAIFactoryObject *object, GSList **messages  )
 {
        if( FMA_IS_OBJECT_ITEM( object )){
@@ -279,11 +279,11 @@ write_start_write_version( FMAGConfProvider *provider, FMAObjectItem *item )
 }
 
 guint
-nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
+fma_gconf_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
                                                                        const FMAIFactoryObject *object, 
const FMADataBoxed *boxed,
                                                                        GSList **messages )
 {
-       static const gchar *thisfn = "nagp_writer_write_data";
+       static const gchar *thisfn = "fma_gconf_writer_write_data";
        guint code;
        const FMADataDef *def;
        gchar *this_id;
@@ -387,7 +387,7 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
 }
 
 guint
-nagp_writer_write_done( const FMAIFactoryProvider *writer, void *writer_data,
+fma_gconf_writer_write_done( const FMAIFactoryProvider *writer, void *writer_data,
                                                                        const FMAIFactoryObject *object,
                                                                        GSList **messages  )
 {
diff --git a/src/io-gconf/nagp-writer.h b/src/io-gconf/fma-gconf-writer.h
similarity index 52%
rename from src/io-gconf/nagp-writer.h
rename to src/io-gconf/fma-gconf-writer.h
index a4b2c5b..c3fc9bd 100644
--- a/src/io-gconf/nagp-writer.h
+++ b/src/io-gconf/fma-gconf-writer.h
@@ -27,8 +27,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAGP_WRITE_H__
-#define __NAGP_WRITE_H__
+#ifndef __IO_GCONF_FMA_GCONF_WRITER_H__
+#define __IO_GCONF_FMA_GCONF_WRITER_H__
 
 #include <api/fma-data-boxed.h>
 #include <api/fma-iio-provider.h>
@@ -38,34 +38,40 @@ G_BEGIN_DECLS
 
 /* FMAIIOProvider interface
  */
-gboolean nagp_iio_provider_is_willing_to_write( const FMAIIOProvider *provider );
+gboolean fma_gconf_writer_iio_provider_is_willing_to_write( const FMAIIOProvider *provider );
 
-gboolean nagp_iio_provider_is_able_to_write   ( const FMAIIOProvider *provider );
+gboolean fma_gconf_writer_iio_provider_is_able_to_write   ( const FMAIIOProvider *provider );
 
 /* Writing into GConf is deprecated since 3.1.0
  */
 #ifdef NA_ENABLE_DEPRECATED
-guint    nagp_iio_provider_write_item         ( const FMAIIOProvider *provider,
-                                                                                                       const 
FMAObjectItem *item, GSList **message );
+guint    fma_gconf_writer_iio_provider_write_item         ( const FMAIIOProvider *provider,
+                                                                                                             
                  const FMAObjectItem *item,
+                                                                                                             
                  GSList **message );
 
-guint    nagp_iio_provider_delete_item        ( const FMAIIOProvider *provider,
-                                                                                                       const 
FMAObjectItem *item, GSList **message );
+guint    fma_gconf_writer_iio_provider_delete_item        ( const FMAIIOProvider *provider,
+                                                                                                             
                  const FMAObjectItem *item,
+                                                                                                             
                  GSList **message );
 
 /* FMAIFactoryProvider interface
  */
-guint    nagp_writer_write_start( const FMAIFactoryProvider *writer, void *writer_data,
-                                                                       const FMAIFactoryObject *object,
-                                                                       GSList **messages  );
+guint    fma_gconf_writer_write_start                     ( const FMAIFactoryProvider *writer,
+                                                                                                             
                  void *writer_data,
+                                                                                                             
                  const FMAIFactoryObject *object,
+                                                                                                             
                  GSList **messages  );
 
-guint    nagp_writer_write_data ( const FMAIFactoryProvider *provider, void *writer_data,
-                                                                       const FMAIFactoryObject *object, 
const FMADataBoxed *boxed,
-                                                                       GSList **messages );
+guint    fma_gconf_writer_write_data                      ( const FMAIFactoryProvider *provider,
+                                                                                                             
                  void *writer_data,
+                                                                                                             
                  const FMAIFactoryObject *object,
+                                                                                                             
                  const FMADataBoxed *boxed,
+                                                                                                             
                  GSList **messages );
 
-guint    nagp_writer_write_done ( const FMAIFactoryProvider *writer, void *writer_data,
-                                                                       const FMAIFactoryObject *object,
-                                                                       GSList **messages  );
+guint    fma_gconf_writer_write_done                      ( const FMAIFactoryProvider *writer,
+                                                                                                             
                  void *writer_data,
+                                                                                                             
                  const FMAIFactoryObject *object,
+                                                                                                             
                  GSList **messages  );
 #endif /* NA_ENABLE_DEPRECATED */
 
 G_END_DECLS
 
-#endif /* __NAGP_WRITE_H__ */
+#endif /* __IO_GCONF_FMA_GCONF_WRITER_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]