GNOME.org
 

[nautilus-actions/file-manager-actions] NagpGConfProvider class is renamed to FMAGConfProvider

commit 9a05642bb375ae31f8e4594f714ee68d915d335a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 16:49:53 2015 +0200

    NagpGConfProvider class is renamed to FMAGConfProvider

 src/io-gconf/Makefile.am                           |    4 +-
 ...{nagp-gconf-provider.c => fma-gconf-provider.c} |   72 ++++++++++----------
 ...{nagp-gconf-provider.h => fma-gconf-provider.h} |   46 ++++++------
 src/io-gconf/nagp-keys.h                           |    6 +-
 src/io-gconf/nagp-module.c                         |    6 +-
 src/io-gconf/nagp-reader.c                         |   38 +++++-----
 src/io-gconf/nagp-writer.c                         |   38 +++++-----
 7 files changed, 105 insertions(+), 105 deletions(-)
---
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index e95ffdd..4743e70 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -37,8 +37,8 @@ AM_CPPFLAGS += \
        $(NULL)
 
 libna_io_gconf_la_SOURCES = \
-       nagp-gconf-provider.c                                                           \
-       nagp-gconf-provider.h                                                           \
+       fma-gconf-provider.c                                                            \
+       fma-gconf-provider.h                                                            \
        nagp-keys.h                                                                                     \
        nagp-module.c                                                                           \
        nagp-reader.c                                                                           \
diff --git a/src/io-gconf/nagp-gconf-provider.c b/src/io-gconf/fma-gconf-provider.c
similarity index 84%
rename from src/io-gconf/nagp-gconf-provider.c
rename to src/io-gconf/fma-gconf-provider.c
index e220537..95d8ff6 100644
--- a/src/io-gconf/nagp-gconf-provider.c
+++ b/src/io-gconf/fma-gconf-provider.c
@@ -38,14 +38,14 @@
 #include <api/fma-iio-provider.h>
 #include <api/fma-gconf-monitor.h>
 
-#include "nagp-gconf-provider.h"
+#include "fma-gconf-provider.h"
 #include "nagp-reader.h"
 #include "nagp-writer.h"
 #include "nagp-keys.h"
 
 /* private class data
  */
-struct _NagpGConfProviderClassPrivate {
+struct _FMAGConfProviderClassPrivate {
        void *empty;                                            /* so that gcc -pedantic is happy */
 };
 
@@ -56,7 +56,7 @@ static GObjectClass *st_parent_class = NULL;
 static gint          st_burst_timeout = 100;           /* burst timeout in msec */
 #endif
 
-static void     class_init( NagpGConfProviderClass *klass );
+static void     class_init( FMAGConfProviderClass *klass );
 static void     instance_init( GTypeInstance *instance, gpointer klass );
 static void     instance_dispose( GObject *object );
 static void     instance_finalize( GObject *object );
@@ -70,31 +70,31 @@ static void     ifactory_provider_iface_init( FMAIFactoryProviderInterface *ifac
 static guint    ifactory_provider_get_version( const FMAIFactoryProvider *provider );
 
 #ifdef NA_ENABLE_DEPRECATED
-static GList   *install_monitors( NagpGConfProvider *provider );
-static void     config_path_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, 
NagpGConfProvider *provider );
-static gboolean config_path_changed_trigger_interface( NagpGConfProvider *provider );
+static GList   *install_monitors( FMAGConfProvider *provider );
+static void     config_path_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, 
FMAGConfProvider *provider );
+static gboolean config_path_changed_trigger_interface( FMAGConfProvider *provider );
 static gulong   time_val_diff( const GTimeVal *recent, const GTimeVal *old );
 #endif
 
 GType
-nagp_gconf_provider_get_type( void )
+fma_gconf_provider_get_type( void )
 {
        return( st_module_type );
 }
 
 void
-nagp_gconf_provider_register_type( GTypeModule *module )
+fma_gconf_provider_register_type( GTypeModule *module )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_register_type";
+       static const gchar *thisfn = "fma_gconf_provider_register_type";
 
        static GTypeInfo info = {
-               sizeof( NagpGConfProviderClass ),
+               sizeof( FMAGConfProviderClass ),
                NULL,
                NULL,
                ( GClassInitFunc ) class_init,
                NULL,
                NULL,
-               sizeof( NagpGConfProvider ),
+               sizeof( FMAGConfProvider ),
                0,
                ( GInstanceInitFunc ) instance_init
        };
@@ -113,7 +113,7 @@ nagp_gconf_provider_register_type( GTypeModule *module )
 
        g_debug( "%s", thisfn );
 
-       st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "NagpGConfProvider", &info, 0 );
+       st_module_type = g_type_module_register_type( module, G_TYPE_OBJECT, "FMAGConfProvider", &info, 0 );
 
        g_type_module_add_interface( module, st_module_type, FMA_TYPE_IIO_PROVIDER, &iio_provider_iface_info 
);
 
@@ -121,9 +121,9 @@ nagp_gconf_provider_register_type( GTypeModule *module )
 }
 
 static void
-class_init( NagpGConfProviderClass *klass )
+class_init( FMAGConfProviderClass *klass )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_class_init";
+       static const gchar *thisfn = "fma_gconf_provider_class_init";
        GObjectClass *object_class;
 
        g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -134,23 +134,23 @@ class_init( NagpGConfProviderClass *klass )
        object_class->dispose = instance_dispose;
        object_class->finalize = instance_finalize;
 
-       klass->private = g_new0( NagpGConfProviderClassPrivate, 1 );
+       klass->private = g_new0( FMAGConfProviderClassPrivate, 1 );
 }
 
 static void
 instance_init( GTypeInstance *instance, gpointer klass )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_instance_init";
-       NagpGConfProvider *self;
+       static const gchar *thisfn = "fma_gconf_provider_instance_init";
+       FMAGConfProvider *self;
 
-       g_return_if_fail( NAGP_IS_GCONF_PROVIDER( instance ));
+       g_return_if_fail( FMA_IS_GCONF_PROVIDER( instance ));
 
        g_debug( "%s: instance=%p (%s), klass=%p",
                        thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
 
-       self = NAGP_GCONF_PROVIDER( instance );
+       self = FMA_GCONF_PROVIDER( instance );
 
-       self->private = g_new0( NagpGConfProviderPrivate, 1 );
+       self->private = g_new0( FMAGConfProviderPrivate, 1 );
 
        self->private->dispose_has_run = FALSE;
 
@@ -164,12 +164,12 @@ instance_init( GTypeInstance *instance, gpointer klass )
 static void
 instance_dispose( GObject *object )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_instance_dispose";
-       NagpGConfProvider *self;
+       static const gchar *thisfn = "fma_gconf_provider_instance_dispose";
+       FMAGConfProvider *self;
 
-       g_return_if_fail( NAGP_IS_GCONF_PROVIDER( object ));
+       g_return_if_fail( FMA_IS_GCONF_PROVIDER( object ));
 
-       self = NAGP_GCONF_PROVIDER( object );
+       self = FMA_GCONF_PROVIDER( object );
 
        if( !self->private->dispose_has_run ){
 
@@ -195,14 +195,14 @@ instance_dispose( GObject *object )
 static void
 instance_finalize( GObject *object )
 {
-       static const gchar *thisfn =" nagp_gconf_provider_instance_finalize";
-       NagpGConfProvider *self;
+       static const gchar *thisfn =" fma_gconf_provider_instance_finalize";
+       FMAGConfProvider *self;
 
-       g_return_if_fail( NAGP_IS_GCONF_PROVIDER( object ));
+       g_return_if_fail( FMA_IS_GCONF_PROVIDER( object ));
 
        g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
 
-       self = NAGP_GCONF_PROVIDER( object );
+       self = FMA_GCONF_PROVIDER( object );
 
        g_free( self->private );
 
@@ -215,7 +215,7 @@ instance_finalize( GObject *object )
 static void
 iio_provider_iface_init( FMAIIOProviderInterface *iface )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_iio_provider_iface_init";
+       static const gchar *thisfn = "fma_gconf_provider_iio_provider_iface_init";
 
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
@@ -256,7 +256,7 @@ iio_provider_get_version( const FMAIIOProvider *provider )
 static void
 ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_ifactory_provider_iface_init";
+       static const gchar *thisfn = "fma_gconf_provider_ifactory_provider_iface_init";
 
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
@@ -283,11 +283,11 @@ ifactory_provider_get_version( const FMAIFactoryProvider *provider )
 
 #ifdef NA_ENABLE_DEPRECATED
 static GList *
-install_monitors( NagpGConfProvider *provider )
+install_monitors( FMAGConfProvider *provider )
 {
        GList *list = NULL;
 
-       g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), NULL );
+       g_return_val_if_fail( FMA_IS_GCONF_PROVIDER( provider ), NULL );
        g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), NULL );
        g_return_val_if_fail( !provider->private->dispose_has_run, NULL );
 
@@ -350,9 +350,9 @@ install_monitors( NagpGConfProvider *provider )
  * individual notifications themselves grouped by object.
  */
 static void
-config_path_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, NagpGConfProvider *provider )
+config_path_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, FMAGConfProvider *provider )
 {
-       g_return_if_fail( NAGP_IS_GCONF_PROVIDER( provider ));
+       g_return_if_fail( FMA_IS_GCONF_PROVIDER( provider ));
        g_return_if_fail( FMA_IS_IIO_PROVIDER( provider ));
 
        if( !provider->private->dispose_has_run ){
@@ -377,9 +377,9 @@ config_path_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, N
  * or .. is there ?
  */
 static gboolean
-config_path_changed_trigger_interface( NagpGConfProvider *provider )
+config_path_changed_trigger_interface( FMAGConfProvider *provider )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_config_path_changed_trigger_interface";
+       static const gchar *thisfn = "fma_gconf_provider_config_path_changed_trigger_interface";
        GTimeVal now;
        gulong diff;
        gulong timeout_usec = 1000*st_burst_timeout;
diff --git a/src/io-gconf/nagp-gconf-provider.h b/src/io-gconf/fma-gconf-provider.h
similarity index 55%
rename from src/io-gconf/nagp-gconf-provider.h
rename to src/io-gconf/fma-gconf-provider.h
index 3cd567d..961d817 100644
--- a/src/io-gconf/nagp-gconf-provider.h
+++ b/src/io-gconf/fma-gconf-provider.h
@@ -27,19 +27,19 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAGP_GCONF_PROVIDER_H__
-#define __NAGP_GCONF_PROVIDER_H__
+#ifndef __IO_GCONF_FMA_GCONF_PROVIDER_H__
+#define __IO_GCONF_FMA_GCONF_PROVIDER_H__
 
 /**
- * SECTION: nagp_gconf_provider
- * @short_description: #NagpGConfProvider class definition.
+ * SECTION: fma_gconf_provider
+ * @short_description: #FMAGConfProvider class definition.
  * @include: fma-gconf-provider.h
  *
  * This class manages the GConf I/O storage subsystem, or, in other words,
  * the GConf subsystem as an #FMAIIOProvider. As this, it should only be
  * used through the #FMAIIOProvider interface.
  *
- * #NagpGConfProvider uses #FMAGConfMonitor to watch at the configuration
+ * #FMAGConfProvider uses #FMAGConfMonitor to watch at the configuration
  * tree. Modifications are notified to the #FMAIIOProvider interface.
  */
 
@@ -48,16 +48,16 @@
 
 G_BEGIN_DECLS
 
-#define NAGP_GCONF_PROVIDER_TYPE                               ( nagp_gconf_provider_get_type())
-#define NAGP_GCONF_PROVIDER( object )                  ( G_TYPE_CHECK_INSTANCE_CAST( object, 
NAGP_GCONF_PROVIDER_TYPE, NagpGConfProvider ))
-#define NAGP_GCONF_PROVIDER_CLASS( klass )             ( G_TYPE_CHECK_CLASS_CAST( klass, 
NAGP_GCONF_PROVIDER_TYPE, NagpGConfProviderClass ))
-#define NAGP_IS_GCONF_PROVIDER( object )               ( G_TYPE_CHECK_INSTANCE_TYPE( object, 
NAGP_GCONF_PROVIDER_TYPE ))
-#define NAGP_IS_GCONF_PROVIDER_CLASS( klass )  ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NAGP_GCONF_PROVIDER_TYPE 
))
-#define NAGP_GCONF_PROVIDER_GET_CLASS( object )        ( G_TYPE_INSTANCE_GET_CLASS(( object ), 
NAGP_GCONF_PROVIDER_TYPE, NagpGConfProviderClass ))
+#define FMA_GCONF_PROVIDER_TYPE                ( fma_gconf_provider_get_type())
+#define FMA_GCONF_PROVIDER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, 
FMA_GCONF_PROVIDER_TYPE, FMAGConfProvider ))
+#define FMA_GCONF_PROVIDER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, FMA_GCONF_PROVIDER_TYPE, 
FMAGConfProviderClass ))
+#define FMA_IS_GCONF_PROVIDER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, FMA_GCONF_PROVIDER_TYPE 
))
+#define FMA_IS_GCONF_PROVIDER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), FMA_GCONF_PROVIDER_TYPE 
))
+#define FMA_GCONF_PROVIDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), 
FMA_GCONF_PROVIDER_TYPE, FMAGConfProviderClass ))
 
 /* private instance data
  */
-typedef struct _NagpGConfProviderPrivate {
+typedef struct _FMAGConfProviderPrivate {
        /*< private >*/
        gboolean     dispose_has_run;
        GConfClient *gconf;
@@ -65,27 +65,27 @@ typedef struct _NagpGConfProviderPrivate {
        guint        event_source_id;
        GTimeVal     last_event;
 }
-       NagpGConfProviderPrivate;
+       FMAGConfProviderPrivate;
 
 typedef struct {
        /*< private >*/
-       GObject                   parent;
-       NagpGConfProviderPrivate *private;
+       GObject                  parent;
+       FMAGConfProviderPrivate *private;
 }
-       NagpGConfProvider;
+       FMAGConfProvider;
 
-typedef struct _NagpGConfProviderClassPrivate   NagpGConfProviderClassPrivate;
+typedef struct _FMAGConfProviderClassPrivate   FMAGConfProviderClassPrivate;
 
 typedef struct {
        /*< private >*/
-       GObjectClass                   parent;
-       NagpGConfProviderClassPrivate *private;
+       GObjectClass                  parent;
+       FMAGConfProviderClassPrivate *private;
 }
-       NagpGConfProviderClass;
+       FMAGConfProviderClass;
 
-GType nagp_gconf_provider_get_type     ( void );
-void  nagp_gconf_provider_register_type( GTypeModule *module );
+GType fma_gconf_provider_get_type     ( void );
+void  fma_gconf_provider_register_type( GTypeModule *module );
 
 G_END_DECLS
 
-#endif /* __NAGP_GCONF_PROVIDER_H__ */
+#endif /* __IO_GCONF_FMA_GCONF_PROVIDER_H__ */
diff --git a/src/io-gconf/nagp-keys.h b/src/io-gconf/nagp-keys.h
index 81f79ce..3181b1a 100644
--- a/src/io-gconf/nagp-keys.h
+++ b/src/io-gconf/nagp-keys.h
@@ -27,8 +27,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAGP_GCONF_PROVIDER_KEYS_H__
-#define __NAGP_GCONF_PROVIDER_KEYS_H__
+#ifndef __FMA_GCONF_PROVIDER_KEYS_H__
+#define __FMA_GCONF_PROVIDER_KEYS_H__
 
 #define NAGP_CONFIGURATIONS_PATH               "/apps/filemanager-actions/configurations"
 #define NAGP_SCHEMAS_PATH                              "/schemas/apps/filemanager-actions/configurations"
@@ -39,4 +39,4 @@
 
 #define NAGP_ENTRY_IVERSION                            "iversion"
 
-#endif /* __NAGP_GCONF_PROVIDER_KEYS_H__ */
+#endif /* __FMA_GCONF_PROVIDER_KEYS_H__ */
diff --git a/src/io-gconf/nagp-module.c b/src/io-gconf/nagp-module.c
index fbe7e11..a374f01 100644
--- a/src/io-gconf/nagp-module.c
+++ b/src/io-gconf/nagp-module.c
@@ -33,7 +33,7 @@
 
 #include <api/fma-extension.h>
 
-#include "nagp-gconf-provider.h"
+#include "fma-gconf-provider.h"
 
 /* the count of GType types provided by this extension
  * each new GType type must
@@ -54,7 +54,7 @@ fma_extension_startup( GTypeModule *module )
 
        g_debug( "%s: module=%p", thisfn, ( void * ) module );
 
-       nagp_gconf_provider_register_type( module );
+       fma_gconf_provider_register_type( module );
 
        return( TRUE );
 }
@@ -90,7 +90,7 @@ fma_extension_list_types( const GType **types )
 
        g_debug( "%s: types=%p", thisfn, ( void * ) types );
 
-       types_list[0] = NAGP_GCONF_PROVIDER_TYPE;
+       types_list[0] = FMA_GCONF_PROVIDER_TYPE;
 
        types_list[NAGP_TYPES_COUNT] = 0;
        *types = types_list;
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index c5d72b4..9aadf7c 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -41,7 +41,7 @@
 #include <api/fma-core-utils.h>
 #include <api/fma-gconf-utils.h>
 
-#include "nagp-gconf-provider.h"
+#include "fma-gconf-provider.h"
 #include "nagp-keys.h"
 #include "nagp-reader.h"
 
@@ -52,7 +52,7 @@ typedef struct {
 }
        ReaderData;
 
-static FMAObjectItem *read_item( NagpGConfProvider *provider, const gchar *path, GSList **messages );
+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 );
 
@@ -60,8 +60,8 @@ static gboolean      read_done_item_is_writable( const FMAIFactoryProvider *prov
 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 NagpGConfProvider *provider, const gchar *path, ReaderData 
*reader_data, const FMADataDef *def );
-static gboolean      is_key_writable( NagpGConfProvider *gconf, const gchar *key );
+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 );
 
 /*
  * nagp_iio_provider_read_items:
@@ -74,7 +74,7 @@ GList *
 nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages )
 {
        static const gchar *thisfn = "nagp_reader_nagp_iio_provider_read_items";
-       NagpGConfProvider *self;
+       FMAGConfProvider *self;
        GList *items_list = NULL;
        GSList *listpath, *ip;
        FMAObjectItem *item;
@@ -82,8 +82,8 @@ nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages
        g_debug( "%s: provider=%p, messages=%p", thisfn, ( void * ) provider, ( void * ) messages );
 
        g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), NULL );
-       g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), NULL );
-       self = NAGP_GCONF_PROVIDER( provider );
+       g_return_val_if_fail( FMA_IS_GCONF_PROVIDER( provider ), NULL );
+       self = FMA_GCONF_PROVIDER( provider );
 
        if( !self->private->dispose_has_run ){
 
@@ -109,7 +109,7 @@ nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages
  * path is here the full path to an item
  */
 static FMAObjectItem *
-read_item( NagpGConfProvider *provider, const gchar *path, GSList **messages )
+read_item( FMAGConfProvider *provider, const gchar *path, GSList **messages )
 {
        static const gchar *thisfn = "nagp_reader_read_item";
        FMAObjectItem *item;
@@ -119,7 +119,7 @@ read_item( NagpGConfProvider *provider, const gchar *path, GSList **messages )
        ReaderData *data;
 
        g_debug( "%s: provider=%p, path=%s", thisfn, ( void * ) provider, path );
-       g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), NULL );
+       g_return_val_if_fail( FMA_IS_GCONF_PROVIDER( provider ), NULL );
        g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), NULL );
        g_return_val_if_fail( !provider->private->dispose_has_run, NULL );
 
@@ -171,10 +171,10 @@ nagp_reader_read_start( const FMAIFactoryProvider *provider, void *reader_data,
        static const gchar *thisfn = "nagp_reader_read_start";
 
        g_return_if_fail( FMA_IS_IFACTORY_PROVIDER( provider ));
-       g_return_if_fail( NAGP_IS_GCONF_PROVIDER( provider ));
+       g_return_if_fail( FMA_IS_GCONF_PROVIDER( provider ));
        g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
 
-       if( !NAGP_GCONF_PROVIDER( provider )->private->dispose_has_run ){
+       if( !FMA_GCONF_PROVIDER( provider )->private->dispose_has_run ){
 
                g_debug( "%s: provider=%p (%s), reader_data=%p, object=%p (%s), messages=%p",
                                thisfn,
@@ -216,7 +216,7 @@ nagp_reader_read_data( const FMAIFactoryProvider *provider, void *reader_data, c
        }
 
        boxed = get_boxed_from_path(
-                       NAGP_GCONF_PROVIDER( provider ), (( ReaderData * ) reader_data )->path, reader_data, 
def );
+                       FMA_GCONF_PROVIDER( provider ), (( ReaderData * ) reader_data )->path, reader_data, 
def );
 
        return( boxed );
 }
@@ -228,10 +228,10 @@ nagp_reader_read_done( const FMAIFactoryProvider *provider, void *reader_data, c
        gboolean writable;
 
        g_return_if_fail( FMA_IS_IFACTORY_PROVIDER( provider ));
-       g_return_if_fail( NAGP_IS_GCONF_PROVIDER( provider ));
+       g_return_if_fail( FMA_IS_GCONF_PROVIDER( provider ));
        g_return_if_fail( FMA_IS_IFACTORY_OBJECT( object ));
 
-       if( !NAGP_GCONF_PROVIDER( provider )->private->dispose_has_run ){
+       if( !FMA_GCONF_PROVIDER( provider )->private->dispose_has_run ){
 
                g_debug( "%s: provider=%p (%s), reader_data=%p, object=%p (%s), messages=%p",
                                thisfn,
@@ -268,7 +268,7 @@ read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem *
        for( ie = data->entries ; ie && writable ; ie = ie->next ){
                gconf_entry = ( GConfEntry * ) ie->data;
                key = gconf_entry_get_key( gconf_entry );
-               writable = is_key_writable( NAGP_GCONF_PROVIDER( provider ), key );
+               writable = is_key_writable( FMA_GCONF_PROVIDER( provider ), key );
        }
 
        g_debug( "nagp_reader_read_done_item: writable=%s", writable ? "True":"False" );
@@ -289,7 +289,7 @@ read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAc
 
        data->parent = FMA_OBJECT_ITEM( action );
        order = fma_object_get_items_slist( action );
-       list_profiles = fma_gconf_utils_get_subdirs( NAGP_GCONF_PROVIDER( provider )->private->gconf, 
data->path );
+       list_profiles = fma_gconf_utils_get_subdirs( FMA_GCONF_PROVIDER( provider )->private->gconf, 
data->path );
 
        /* read profiles in the specified order
         * as a protection against bugs in NACT, we check that profile has not
@@ -343,7 +343,7 @@ read_done_action_load_profile( const FMAIFactoryProvider *provider, ReaderData *
        profile_data = g_new0( ReaderData, 1 );
        profile_data->parent = data->parent;
        profile_data->path = ( gchar * ) path;
-       profile_data->entries = fma_gconf_utils_get_entries( NAGP_GCONF_PROVIDER( provider )->private->gconf, 
path );
+       profile_data->entries = fma_gconf_utils_get_entries( FMA_GCONF_PROVIDER( provider )->private->gconf, 
path );
 
        fma_ifactory_provider_read_item(
                        FMA_IFACTORY_PROVIDER( provider ),
@@ -356,7 +356,7 @@ read_done_action_load_profile( const FMAIFactoryProvider *provider, ReaderData *
 }
 
 static FMADataBoxed *
-get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, ReaderData *reader_data, const 
FMADataDef *def )
+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";
        FMADataBoxed *boxed;
@@ -416,7 +416,7 @@ get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, Reade
  * value ; else we get FALSE
  */
 static gboolean
-is_key_writable( NagpGConfProvider *gconf, const gchar *key )
+is_key_writable( FMAGConfProvider *gconf, const gchar *key )
 {
        static const gchar *thisfn = "nagp_read_is_key_writable";
        GError *error = NULL;
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index e02550d..d62a916 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -41,13 +41,13 @@
 #include <api/fma-core-utils.h>
 #include <api/fma-gconf-utils.h>
 
-#include "nagp-gconf-provider.h"
+#include "fma-gconf-provider.h"
 #include "nagp-writer.h"
 #include "nagp-keys.h"
 
 #ifdef NA_ENABLE_DEPRECATED
-static void write_start_write_type( NagpGConfProvider *provider, FMAObjectItem *item );
-static void write_start_write_version( NagpGConfProvider *provider, FMAObjectItem *item );
+static void write_start_write_type( FMAGConfProvider *provider, FMAObjectItem *item );
+static void write_start_write_version( FMAGConfProvider *provider, FMAObjectItem *item );
 #endif
 
 /*
@@ -80,14 +80,14 @@ nagp_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";
-       NagpGConfProvider *self;
+       FMAGConfProvider *self;
        gboolean able_to = FALSE;
 
        /*g_debug( "%s: provider=%p", thisfn, ( void * ) provider );*/
-       g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), FALSE );
+       g_return_val_if_fail( FMA_IS_GCONF_PROVIDER( provider ), FALSE );
        g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), FALSE );
 
-       self = NAGP_GCONF_PROVIDER( provider );
+       self = FMA_GCONF_PROVIDER( provider );
 
        if( !self->private->dispose_has_run ){
 
@@ -128,8 +128,8 @@ nagp_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
 guint
 nagp_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectItem *item, GSList **messages )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_iio_provider_write_item";
-       NagpGConfProvider *self;
+       static const gchar *thisfn = "fma_gconf_provider_iio_provider_write_item";
+       FMAGConfProvider *self;
        guint ret;
 
        g_debug( "%s: provider=%p (%s), item=%p (%s), messages=%p",
@@ -140,11 +140,11 @@ nagp_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectIte
 
        ret = IIO_PROVIDER_CODE_PROGRAM_ERROR;
 
-       g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), ret );
+       g_return_val_if_fail( FMA_IS_GCONF_PROVIDER( provider ), ret );
        g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), ret );
        g_return_val_if_fail( FMA_IS_OBJECT_ITEM( item ), ret );
 
-       self = NAGP_GCONF_PROVIDER( provider );
+       self = FMA_GCONF_PROVIDER( provider );
 
        if( self->private->dispose_has_run ){
                return( IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
@@ -168,8 +168,8 @@ nagp_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectIte
 guint
 nagp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectItem *item, GSList **messages )
 {
-       static const gchar *thisfn = "nagp_gconf_provider_iio_provider_delete_item";
-       NagpGConfProvider *self;
+       static const gchar *thisfn = "fma_gconf_provider_iio_provider_delete_item";
+       FMAGConfProvider *self;
        guint ret;
        gchar *uuid, *path;
        GError *error = NULL;
@@ -183,10 +183,10 @@ nagp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectIt
        ret = IIO_PROVIDER_CODE_PROGRAM_ERROR;
 
        g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), ret );
-       g_return_val_if_fail( NAGP_IS_GCONF_PROVIDER( provider ), ret );
+       g_return_val_if_fail( FMA_IS_GCONF_PROVIDER( provider ), ret );
        g_return_val_if_fail( FMA_IS_OBJECT_ITEM( item ), ret );
 
-       self = NAGP_GCONF_PROVIDER( provider );
+       self = FMA_GCONF_PROVIDER( provider );
 
        if( self->private->dispose_has_run ){
                return( IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN );
@@ -237,15 +237,15 @@ nagp_writer_write_start( const FMAIFactoryProvider *writer, void *writer_data,
                                                        const FMAIFactoryObject *object, GSList **messages  )
 {
        if( FMA_IS_OBJECT_ITEM( object )){
-               write_start_write_type( NAGP_GCONF_PROVIDER( writer ), FMA_OBJECT_ITEM( object ));
-               write_start_write_version( NAGP_GCONF_PROVIDER( writer ), FMA_OBJECT_ITEM( object ));
+               write_start_write_type( FMA_GCONF_PROVIDER( writer ), FMA_OBJECT_ITEM( object ));
+               write_start_write_version( FMA_GCONF_PROVIDER( writer ), FMA_OBJECT_ITEM( object ));
        }
 
        return( IIO_PROVIDER_CODE_OK );
 }
 
 static void
-write_start_write_type( NagpGConfProvider *provider, FMAObjectItem *item )
+write_start_write_type( FMAGConfProvider *provider, FMAObjectItem *item )
 {
        gchar *id, *path;
 
@@ -263,7 +263,7 @@ write_start_write_type( NagpGConfProvider *provider, FMAObjectItem *item )
 }
 
 static void
-write_start_write_version( NagpGConfProvider *provider, FMAObjectItem *item )
+write_start_write_version( FMAGConfProvider *provider, FMAObjectItem *item )
 {
        gchar *id, *path;
        guint iversion;
@@ -318,7 +318,7 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
                this_path = gconf_concat_dir_and_key( NAGP_CONFIGURATIONS_PATH, this_id );
                path = gconf_concat_dir_and_key( this_path, def->gconf_entry );
 
-               gconf = NAGP_GCONF_PROVIDER( provider )->private->gconf;
+               gconf = FMA_GCONF_PROVIDER( provider )->private->gconf;
 
                switch( def->type ){
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]