[nautilus-actions/file-manager-actions] nagp-keys is renamed to fma-gconf-keys

[Pierre Wieser <pwieser src gnome org>]

commit bb2bab91c9f6bd61d43bb6f94bc71dc7cc76194c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 16:55:52 2015 +0200

    nagp-keys is renamed to fma-gconf-keys

 src/io-gconf/Makefile.am                       |    3 ++-
 src/io-gconf/{nagp-keys.c => fma-gconf-keys.c} |    2 +-
 src/io-gconf/{nagp-keys.h => fma-gconf-keys.h} |   18 +++++++++---------
 src/io-gconf/fma-gconf-provider.c              |    6 +++---
 src/io-gconf/nagp-reader.c                     |   12 ++++++------
 src/io-gconf/nagp-writer.c                     |   14 +++++++-------
 6 files changed, 28 insertions(+), 27 deletions(-)
---
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index 4743e70..a3c3430 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -39,7 +39,8 @@ AM_CPPFLAGS += \
 libna_io_gconf_la_SOURCES = \
        fma-gconf-provider.c                                                            \
        fma-gconf-provider.h                                                            \
-       nagp-keys.h                                                                                     \
+       fma-gconf-keys.c                                                                        \
+       fma-gconf-keys.h                                                                        \
        nagp-module.c                                                                           \
        nagp-reader.c                                                                           \
        nagp-reader.h                                                                           \
diff --git a/src/io-gconf/nagp-keys.c b/src/io-gconf/fma-gconf-keys.c
similarity index 97%
rename from src/io-gconf/nagp-keys.c
rename to src/io-gconf/fma-gconf-keys.c
index 70f4e7b..b01cac0 100644
--- a/src/io-gconf/nagp-keys.c
+++ b/src/io-gconf/fma-gconf-keys.c
@@ -31,4 +31,4 @@
 #include <config.h>
 #endif
 
-#include "nagp-keys.h"
+#include "fma-gconf-keys.h"
diff --git a/src/io-gconf/nagp-keys.h b/src/io-gconf/fma-gconf-keys.h
similarity index 71%
rename from src/io-gconf/nagp-keys.h
rename to src/io-gconf/fma-gconf-keys.h
index 3181b1a..fe07de8 100644
--- a/src/io-gconf/nagp-keys.h
+++ b/src/io-gconf/fma-gconf-keys.h
@@ -27,16 +27,16 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __FMA_GCONF_PROVIDER_KEYS_H__
-#define __FMA_GCONF_PROVIDER_KEYS_H__
+#ifndef __IO_GCONF_FMA_GCONF_KEYS_H__
+#define __IO_GCONF_FMA_GCONF_KEYS_H__
 
-#define NAGP_CONFIGURATIONS_PATH               "/apps/filemanager-actions/configurations"
-#define NAGP_SCHEMAS_PATH                              "/schemas/apps/filemanager-actions/configurations"
+#define FMA_GCONF_CONFIGURATIONS_PATH          "/apps/nautilus-actions/configurations"
+#define FMA_GCONF_SCHEMAS_PATH                         "/schemas/apps/nautilus-actions/configurations"
 
-#define NAGP_ENTRY_TYPE                                        "type"
-#define NAGP_VALUE_TYPE_MENU                   "Menu"
-#define NAGP_VALUE_TYPE_ACTION                 "Action"
+#define FMA_GCONF_ENTRY_TYPE                           "type"
+#define FMA_GCONF_VALUE_TYPE_MENU                      "Menu"
+#define FMA_GCONF_VALUE_TYPE_ACTION                    "Action"
 
-#define NAGP_ENTRY_IVERSION                            "iversion"
+#define FMA_GCONF_ENTRY_IVERSION                       "iversion"
 
-#endif /* __FMA_GCONF_PROVIDER_KEYS_H__ */
+#endif /* __IO_GCONF_FMA_GCONF_KEYS_H__ */
diff --git a/src/io-gconf/fma-gconf-provider.c b/src/io-gconf/fma-gconf-provider.c
index 95d8ff6..65dfa33 100644
--- a/src/io-gconf/fma-gconf-provider.c
+++ b/src/io-gconf/fma-gconf-provider.c
@@ -41,7 +41,7 @@
 #include "fma-gconf-provider.h"
 #include "nagp-reader.h"
 #include "nagp-writer.h"
-#include "nagp-keys.h"
+#include "fma-gconf-keys.h"
 
 /* private class data
  */
@@ -296,13 +296,13 @@ install_monitors( FMAGConfProvider *provider )
         */
        list = g_list_prepend( list,
                        fma_gconf_monitor_new(
-                                       NAGP_CONFIGURATIONS_PATH,
+                                       FMA_GCONF_CONFIGURATIONS_PATH,
                                        ( GConfClientNotifyFunc ) config_path_changed_cb,
                                        provider ));
 
        list = g_list_prepend( list,
                        fma_gconf_monitor_new(
-                                       NAGP_SCHEMAS_PATH,
+                                       FMA_GCONF_SCHEMAS_PATH,
                                        ( GConfClientNotifyFunc ) config_path_changed_cb,
                                        provider ));
 
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index 9aadf7c..36fc348 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -42,7 +42,7 @@
 #include <api/fma-gconf-utils.h>
 
 #include "fma-gconf-provider.h"
-#include "nagp-keys.h"
+#include "fma-gconf-keys.h"
 #include "nagp-reader.h"
 
 typedef struct {
@@ -87,7 +87,7 @@ nagp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages
 
        if( !self->private->dispose_has_run ){
 
-               listpath = fma_gconf_utils_get_subdirs( self->private->gconf, NAGP_CONFIGURATIONS_PATH );
+               listpath = fma_gconf_utils_get_subdirs( self->private->gconf, FMA_GCONF_CONFIGURATIONS_PATH );
 
                for( ip = listpath ; ip ; ip = ip->next ){
 
@@ -123,17 +123,17 @@ read_item( FMAGConfProvider *provider, const gchar *path, GSList **messages )
        g_return_val_if_fail( FMA_IS_IIO_PROVIDER( provider ), NULL );
        g_return_val_if_fail( !provider->private->dispose_has_run, NULL );
 
-       full_path = gconf_concat_dir_and_key( path, NAGP_ENTRY_TYPE );
-       type = fma_gconf_utils_read_string( provider->private->gconf, full_path, TRUE, NAGP_VALUE_TYPE_ACTION 
);
+       full_path = gconf_concat_dir_and_key( path, FMA_GCONF_ENTRY_TYPE );
+       type = fma_gconf_utils_read_string( provider->private->gconf, full_path, TRUE, 
FMA_GCONF_VALUE_TYPE_ACTION );
        g_free( full_path );
        item = NULL;
 
        /* an item may have 'Action' or 'Menu' type; defaults to Action
         */
-       if( !type || !strlen( type ) || !strcmp( type, NAGP_VALUE_TYPE_ACTION )){
+       if( !type || !strlen( type ) || !strcmp( type, FMA_GCONF_VALUE_TYPE_ACTION )){
                item = FMA_OBJECT_ITEM( fma_object_action_new());
 
-       } else if( !strcmp( type, NAGP_VALUE_TYPE_MENU )){
+       } else if( !strcmp( type, FMA_GCONF_VALUE_TYPE_MENU )){
                item = FMA_OBJECT_ITEM( fma_object_menu_new());
 
        } else {
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index d62a916..b8f9033 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -43,7 +43,7 @@
 
 #include "fma-gconf-provider.h"
 #include "nagp-writer.h"
-#include "nagp-keys.h"
+#include "fma-gconf-keys.h"
 
 #ifdef NA_ENABLE_DEPRECATED
 static void write_start_write_type( FMAGConfProvider *provider, FMAObjectItem *item );
@@ -200,7 +200,7 @@ nagp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectIt
         * mean including the schemas themselves
         */
        if( ret == IIO_PROVIDER_CODE_OK ){
-               path = gconf_concat_dir_and_key( NAGP_CONFIGURATIONS_PATH, uuid );
+               path = gconf_concat_dir_and_key( FMA_GCONF_CONFIGURATIONS_PATH, uuid );
                gconf_client_recursive_unset( self->private->gconf, path, GCONF_UNSET_INCLUDING_SCHEMA_NAMES, 
&error );
                if( error ){
                        g_warning( "%s: path=%s, error=%s", thisfn, path, error->message );
@@ -214,7 +214,7 @@ nagp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectIt
        }
 
        if( ret == IIO_PROVIDER_CODE_OK ){
-               path = gconf_concat_dir_and_key( NAGP_SCHEMAS_PATH, uuid );
+               path = gconf_concat_dir_and_key( FMA_GCONF_SCHEMAS_PATH, uuid );
                gconf_client_recursive_unset( self->private->gconf, path, 0, &error );
                if( error ){
                        g_warning( "%s: path=%s, error=%s", thisfn, path, error->message );
@@ -250,12 +250,12 @@ write_start_write_type( FMAGConfProvider *provider, FMAObjectItem *item )
        gchar *id, *path;
 
        id = fma_object_get_id( item );
-       path = g_strdup_printf( "%s/%s/%s", NAGP_CONFIGURATIONS_PATH, id, NAGP_ENTRY_TYPE );
+       path = g_strdup_printf( "%s/%s/%s", FMA_GCONF_CONFIGURATIONS_PATH, id, FMA_GCONF_ENTRY_TYPE );
 
        fma_gconf_utils_write_string(
                        provider->private->gconf,
                        path,
-                       FMA_IS_OBJECT_ACTION( item ) ? NAGP_VALUE_TYPE_ACTION : NAGP_VALUE_TYPE_MENU,
+                       FMA_IS_OBJECT_ACTION( item ) ? FMA_GCONF_VALUE_TYPE_ACTION : 
FMA_GCONF_VALUE_TYPE_MENU,
                        NULL );
 
        g_free( path );
@@ -269,7 +269,7 @@ write_start_write_version( FMAGConfProvider *provider, FMAObjectItem *item )
        guint iversion;
 
        id = fma_object_get_id( item );
-       path = g_strdup_printf( "%s/%s/%s", NAGP_CONFIGURATIONS_PATH, id, NAGP_ENTRY_IVERSION );
+       path = g_strdup_printf( "%s/%s/%s", FMA_GCONF_CONFIGURATIONS_PATH, id, FMA_GCONF_ENTRY_IVERSION );
 
        iversion = fma_object_get_iversion( item );
        fma_gconf_utils_write_int( provider->private->gconf, path, iversion, NULL );
@@ -315,7 +315,7 @@ nagp_writer_write_data( const FMAIFactoryProvider *provider, void *writer_data,
                        this_id = fma_object_get_id( object );
                }
 
-               this_path = gconf_concat_dir_and_key( NAGP_CONFIGURATIONS_PATH, this_id );
+               this_path = gconf_concat_dir_and_key( FMA_GCONF_CONFIGURATIONS_PATH, this_id );
                path = gconf_concat_dir_and_key( this_path, def->gconf_entry );
 
                gconf = FMA_GCONF_PROVIDER( provider )->private->gconf;