GNOME.org
 

[nautilus-actions/file-manager-actions] NagpReader is renamed to FMAGConfReader

commit 0e87e5a2dffd82f2fd026ecfb82350509715d74e
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 17:01:01 2015 +0200

    NagpReader is renamed to FMAGConfReader

 src/io-gconf/Makefile.am                           |    6 +-
 src/io-gconf/fma-gconf-module.c                    |   16 +++---
 src/io-gconf/fma-gconf-provider.c                  |   10 ++--
 src/io-gconf/{nagp-reader.c => fma-gconf-reader.c} |   46 ++++++++++----------
 src/io-gconf/{nagp-reader.h => fma-gconf-reader.h} |   14 +++---
 5 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index a3c3430..ce2c63f 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -41,9 +41,9 @@ libna_io_gconf_la_SOURCES = \
        fma-gconf-provider.h                                                            \
        fma-gconf-keys.c                                                                        \
        fma-gconf-keys.h                                                                        \
-       nagp-module.c                                                                           \
-       nagp-reader.c                                                                           \
-       nagp-reader.h                                                                           \
+       fma-gconf-module.c                                                                      \
+       fma-gconf-reader.c                                                                      \
+       fma-gconf-reader.h                                                                      \
        nagp-writer.c                                                                           \
        nagp-writer.h                                                                           \
        $(NULL)
diff --git a/src/io-gconf/fma-gconf-module.c b/src/io-gconf/fma-gconf-module.c
index a374f01..26744f4 100644
--- a/src/io-gconf/fma-gconf-module.c
+++ b/src/io-gconf/fma-gconf-module.c
@@ -40,7 +40,7 @@
  * - be registered in fma_extension_startup()
  * - be addressed in fma_extension_list_types().
  */
-#define NAGP_TYPES_COUNT       1
+#define FMA_TYPES_COUNT        1
 
 /*
  * fma_extension_startup:
@@ -50,7 +50,7 @@
 gboolean
 fma_extension_startup( GTypeModule *module )
 {
-       static const gchar *thisfn = "nagp_module_fma_extension_startup";
+       static const gchar *thisfn = "fma_gconf_module_fma_extension_startup";
 
        g_debug( "%s: module=%p", thisfn, ( void * ) module );
 
@@ -67,7 +67,7 @@ fma_extension_startup( GTypeModule *module )
 guint
 fma_extension_get_version( void )
 {
-       static const gchar *thisfn = "nagp_module_fma_extension_get_version";
+       static const gchar *thisfn = "fma_gconf_module_fma_extension_get_version";
        guint version;
 
        version = 1;
@@ -85,17 +85,17 @@ fma_extension_get_version( void )
 guint
 fma_extension_list_types( const GType **types )
 {
-       static const gchar *thisfn = "nagp_module_fma_extension_list_types";
-       static GType types_list [1+NAGP_TYPES_COUNT];
+       static const gchar *thisfn = "fma_gconf_module_fma_extension_list_types";
+       static GType types_list [1+FMA_TYPES_COUNT];
 
        g_debug( "%s: types=%p", thisfn, ( void * ) types );
 
        types_list[0] = FMA_GCONF_PROVIDER_TYPE;
 
-       types_list[NAGP_TYPES_COUNT] = 0;
+       types_list[FMA_TYPES_COUNT] = 0;
        *types = types_list;
 
-       return( NAGP_TYPES_COUNT );
+       return( FMA_TYPES_COUNT );
 }
 
 /*
@@ -106,7 +106,7 @@ fma_extension_list_types( const GType **types )
 void
 fma_extension_shutdown( void )
 {
-       static const gchar *thisfn = "nagp_module_fma_extension_shutdown";
+       static const gchar *thisfn = "fma_gconf_module_fma_extension_shutdown";
 
        g_debug( "%s", thisfn );
 }
diff --git a/src/io-gconf/fma-gconf-provider.c b/src/io-gconf/fma-gconf-provider.c
index 65dfa33..03df27a 100644
--- a/src/io-gconf/fma-gconf-provider.c
+++ b/src/io-gconf/fma-gconf-provider.c
@@ -39,7 +39,7 @@
 #include <api/fma-gconf-monitor.h>
 
 #include "fma-gconf-provider.h"
-#include "nagp-reader.h"
+#include "fma-gconf-reader.h"
 #include "nagp-writer.h"
 #include "fma-gconf-keys.h"
 
@@ -222,7 +222,7 @@ iio_provider_iface_init( FMAIIOProviderInterface *iface )
        iface->get_id = iio_provider_get_id;
        iface->get_name = iio_provider_get_name;
        iface->get_version = iio_provider_get_version;
-       iface->read_items = nagp_iio_provider_read_items;
+       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;
 #ifdef NA_ENABLE_DEPRECATED
@@ -261,9 +261,9 @@ ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface )
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
        iface->get_version = ifactory_provider_get_version;
-       iface->read_start = nagp_reader_read_start;
-       iface->read_data = nagp_reader_read_data;
-       iface->read_done = nagp_reader_read_done;
+       iface->read_start = fma_gconf_reader_read_start;
+       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;
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/fma-gconf-reader.c
similarity index 85%
rename from src/io-gconf/nagp-reader.c
rename to src/io-gconf/fma-gconf-reader.c
index 36fc348..07b52dc 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/fma-gconf-reader.c
@@ -43,37 +43,37 @@
 
 #include "fma-gconf-provider.h"
 #include "fma-gconf-keys.h"
-#include "nagp-reader.h"
+#include "fma-gconf-reader.h"
 
 typedef struct {
-       gchar        *path;
-       GSList       *entries;
+       gchar         *path;
+       GSList        *entries;
        FMAObjectItem *parent;
 }
        ReaderData;
 
 static FMAObjectItem *read_item( FMAGConfProvider *provider, const gchar *path, GSList **messages );
 
-static void          read_start_profile_attach_profile( const FMAIFactoryProvider *provider, 
FMAObjectProfile *profile, ReaderData *data, GSList **messages );
+static void           read_start_profile_attach_profile( const FMAIFactoryProvider *provider, 
FMAObjectProfile *profile, ReaderData *data, GSList **messages );
 
-static gboolean      read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem *item, 
ReaderData *data, GSList **messages );
-static void          read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAction 
*action, ReaderData *data, GSList **messages );
-static void          read_done_action_load_profile( const FMAIFactoryProvider *provider, ReaderData *data, 
const gchar *path, GSList **messages );
+static gboolean       read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem *item, 
ReaderData *data, GSList **messages );
+static void           read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAction 
*action, ReaderData *data, GSList **messages );
+static void           read_done_action_load_profile( const FMAIFactoryProvider *provider, ReaderData *data, 
const gchar *path, GSList **messages );
 
 static FMADataBoxed  *get_boxed_from_path( const FMAGConfProvider *provider, const gchar *path, ReaderData 
*reader_data, const FMADataDef *def );
-static gboolean      is_key_writable( FMAGConfProvider *gconf, const gchar *key );
+static gboolean       is_key_writable( FMAGConfProvider *gconf, const gchar *key );
 
 /*
- * nagp_iio_provider_read_items:
+ * fma_gconf_reader_iio_provider_read_items:
  *
  * Note that whatever be the version of the read action, it will be
  * stored as a #FMAObjectAction and its set of #FMAObjectProfile of the same,
  * latest, version of these classes.
  */
 GList *
-nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages )
+fma_gconf_reader_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages )
 {
-       static const gchar *thisfn = "nagp_reader_nagp_iio_provider_read_items";
+       static const gchar *thisfn = "fma_gconf_reader_iio_provider_read_items";
        FMAGConfProvider *self;
        GList *items_list = NULL;
        GSList *listpath, *ip;
@@ -111,7 +111,7 @@ nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages
 static FMAObjectItem *
 read_item( FMAGConfProvider *provider, const gchar *path, GSList **messages )
 {
-       static const gchar *thisfn = "nagp_reader_read_item";
+       static const gchar *thisfn = "fma_gconf_reader_read_item";
        FMAObjectItem *item;
        gchar *full_path;
        gchar *type;
@@ -166,9 +166,9 @@ read_item( FMAGConfProvider *provider, const gchar *path, GSList **messages )
 }
 
 void
-nagp_reader_read_start( const FMAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject 
*object, GSList **messages  )
+fma_gconf_reader_read_start( const FMAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject 
*object, GSList **messages  )
 {
-       static const gchar *thisfn = "nagp_reader_read_start";
+       static const gchar *thisfn = "fma_gconf_reader_read_start";
 
        g_return_if_fail( FMA_IS_IFACTORY_PROVIDER( provider ));
        g_return_if_fail( FMA_IS_GCONF_PROVIDER( provider ));
@@ -196,9 +196,9 @@ read_start_profile_attach_profile( const FMAIFactoryProvider *provider, FMAObjec
 }
 
 FMADataBoxed *
-nagp_reader_read_data( const FMAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject 
*object, const FMADataDef *def, GSList **messages )
+fma_gconf_reader_read_data( const FMAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject 
*object, const FMADataDef *def, GSList **messages )
 {
-       static const gchar *thisfn = "nagp_reader_read_data";
+       static const gchar *thisfn = "fma_gconf_reader_read_data";
        FMADataBoxed *boxed;
 
        g_return_val_if_fail( FMA_IS_IFACTORY_PROVIDER( provider ), NULL );
@@ -222,9 +222,9 @@ nagp_reader_read_data( const FMAIFactoryProvider *provider, void *reader_data, c
 }
 
 void
-nagp_reader_read_done( const FMAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject 
*object, GSList **messages  )
+fma_gconf_reader_read_done( const FMAIFactoryProvider *provider, void *reader_data, const FMAIFactoryObject 
*object, GSList **messages  )
 {
-       static const gchar *thisfn = "nagp_reader_read_done";
+       static const gchar *thisfn = "fma_gconf_reader_read_done";
        gboolean writable;
 
        g_return_if_fail( FMA_IS_IFACTORY_PROVIDER( provider ));
@@ -271,14 +271,14 @@ read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem *
                writable = is_key_writable( FMA_GCONF_PROVIDER( provider ), key );
        }
 
-       g_debug( "nagp_reader_read_done_item: writable=%s", writable ? "True":"False" );
+       g_debug( "fma_gconf_reader_read_done_item: writable=%s", writable ? "True":"False" );
        return( writable );
 }
 
 static void
 read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAction *action, ReaderData 
*data, GSList **messages )
 {
-       static const gchar *thisfn = "nagp_reader_read_done_action_read_profiles";
+       static const gchar *thisfn = "fma_gconf_reader_read_done_action_read_profiles";
        GSList *order;
        GSList *list_profiles;
        GSList *ip;
@@ -299,7 +299,7 @@ read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAc
                profile_id = ( gchar * ) ip->data;
                found = fma_object_get_item( action, profile_id );
                if( !found ){
-                       g_debug( "nagp_reader_read_done_action: loading profile=%s", profile_id );
+                       g_debug( "fma_gconf_reader_read_done_action: loading profile=%s", profile_id );
                        profile_path = gconf_concat_dir_and_key( data->path, profile_id );
                        read_done_action_load_profile( provider, data, profile_path, messages );
                        g_free( profile_path );
@@ -313,7 +313,7 @@ read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAc
                profile_id = g_path_get_basename(( const gchar * ) ip->data );
                found = fma_object_get_item( action, profile_id );
                if( !found ){
-                       g_debug( "nagp_reader_read_done_action: loading profile=%s", profile_id );
+                       g_debug( "fma_gconf_reader_read_done_action: loading profile=%s", profile_id );
                        read_done_action_load_profile( provider, data, ( const gchar * ) ip->data, messages );
                }
                g_free( profile_id );
@@ -358,7 +358,7 @@ read_done_action_load_profile( const FMAIFactoryProvider *provider, ReaderData *
 static FMADataBoxed *
 get_boxed_from_path( const FMAGConfProvider *provider, const gchar *path, ReaderData *reader_data, const 
FMADataDef *def )
 {
-       static const gchar *thisfn = "nagp_reader_get_boxed_from_path";
+       static const gchar *thisfn = "fma_gconf_reader_get_boxed_from_path";
        FMADataBoxed *boxed;
        gboolean have_entry;
        gchar *str_value;
diff --git a/src/io-gconf/nagp-reader.h b/src/io-gconf/fma-gconf-reader.h
similarity index 64%
rename from src/io-gconf/nagp-reader.h
rename to src/io-gconf/fma-gconf-reader.h
index adc64bd..fde27fc 100644
--- a/src/io-gconf/nagp-reader.h
+++ b/src/io-gconf/fma-gconf-reader.h
@@ -27,20 +27,20 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAGP_READER_H__
-#define __NAGP_READER_H__
+#ifndef __FMA_GCONF_READER_H__
+#define __FMA_GCONF_READER_H__
 
 #include <api/fma-iio-provider.h>
 #include <api/fma-ifactory-provider.h>
 
 G_BEGIN_DECLS
 
-GList       *nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages );
+GList        *fma_gconf_reader_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages );
 
-void         nagp_reader_read_start( const FMAIFactoryProvider *provider, void *reader_data, const 
FMAIFactoryObject *object, GSList **messages  );
-FMADataBoxed *nagp_reader_read_data ( const FMAIFactoryProvider *provider, void *reader_data, const 
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages );
-void         nagp_reader_read_done ( const FMAIFactoryProvider *provider, void *reader_data, const 
FMAIFactoryObject *object, GSList **messages  );
+void          fma_gconf_reader_read_start( const FMAIFactoryProvider *provider, void *reader_data, const 
FMAIFactoryObject *object, GSList **messages  );
+FMADataBoxed *fma_gconf_reader_read_data ( const FMAIFactoryProvider *provider, void *reader_data, const 
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages );
+void          fma_gconf_reader_read_done ( const FMAIFactoryProvider *provider, void *reader_data, const 
FMAIFactoryObject *object, GSList **messages  );
 
 G_END_DECLS
 
-#endif /* __NAGP_READER_H__ */
+#endif /* __FMA_GCONF_READER_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]