GNOME.org
 

[nautilus-actions] na_gconf_migration renamed to fma_gconf_migration

commit 3b75018f824e9889b8bc103115bcb6ab92a2acb5
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Sep 7 23:40:26 2015 +0200

    na_gconf_migration renamed to fma_gconf_migration

 src/api/fma-iio-provider.h                         |    2 +-
 src/core/Makefile.am                               |    4 ++--
 ...{na-gconf-migration.c => fma-gconf-migration.c} |   10 +++++-----
 ...{na-gconf-migration.h => fma-gconf-migration.h} |    8 ++++----
 src/core/na-io-provider.c                          |    2 +-
 src/io-gconf/nagp-gconf-provider.c                 |    2 +-
 src/io-gconf/nagp-gconf-provider.h                 |    2 +-
 src/nact/main.c                                    |    4 ++--
 src/plugin-menu/nautilus-module.c                  |    4 ++--
 src/utils/.gitignore                               |    2 +-
 src/utils/Makefile.am                              |    4 ++--
 src/utils/na-gconf2key.sh.in                       |   12 ++++++------
 src/utils/nautilus-actions-new.c                   |    4 ++--
 src/utils/nautilus-actions-run.c                   |    4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/src/api/fma-iio-provider.h b/src/api/fma-iio-provider.h
index 1ab2b84..25e829b 100644
--- a/src/api/fma-iio-provider.h
+++ b/src/api/fma-iio-provider.h
@@ -150,7 +150,7 @@
  *          <entry>2009-12-16</entry>
  *        </row>
  *        <row>
- *          <entry><literal>na-gconf</literal></entry>
+ *          <entry><literal>fma-gconf</literal></entry>
  *          <entry>NA GConf I/O Provider</entry>
  *          <entry>&prodname;</entry>
  *          <entry>2009-12-16</entry>
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 5d0b7b3..2ca0db0 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -68,8 +68,8 @@ libna_core_la_SOURCES = \
        fma-factory-object.h                                                                    \
        fma-factory-provider.c                                                          \
        fma-factory-provider.h                                                          \
-       na-gconf-migration.c                                                            \
-       na-gconf-migration.h                                                            \
+       fma-gconf-migration.c                                                           \
+       fma-gconf-migration.h                                                           \
        fma-gconf-monitor.c                                                                     \
        fma-gconf-utils.c                                                                       \
        na-gnome-vfs-uri.c                                                                      \
diff --git a/src/core/na-gconf-migration.c b/src/core/fma-gconf-migration.c
similarity index 89%
rename from src/core/na-gconf-migration.c
rename to src/core/fma-gconf-migration.c
index 38735e5..5c89300 100644
--- a/src/core/na-gconf-migration.c
+++ b/src/core/fma-gconf-migration.c
@@ -31,12 +31,12 @@
 #include <config.h>
 #endif
 
-#include "na-gconf-migration.h"
+#include "fma-gconf-migration.h"
 
-#define MIGRATION_COMMAND                              PKGLIBEXECDIR "/na-gconf2key.sh -delete -nodummy 
-verbose"
+#define MIGRATION_COMMAND                              PKGLIBEXECDIR "/fma-gconf2key.sh -delete -nodummy 
-verbose"
 
 /**
- * na_gconf_migration_run:
+ * fma_gconf_migration_run:
  *
  * Migrate users actions and menus from GConf to .desktop files.
  * Disable GConf I/O provider both for reading and writing.
@@ -45,9 +45,9 @@
  * Since: 3.1
  */
 void
-na_gconf_migration_run( void )
+fma_gconf_migration_run( void )
 {
-       static const gchar *thisfn = "na_gconf_migration_run";
+       static const gchar *thisfn = "fma_gconf_migration_run";
 #ifdef HAVE_GCONF
        gchar *out, *err;
        GError *error;
diff --git a/src/core/na-gconf-migration.h b/src/core/fma-gconf-migration.h
similarity index 85%
rename from src/core/na-gconf-migration.h
rename to src/core/fma-gconf-migration.h
index 16068c2..325969a 100644
--- a/src/core/na-gconf-migration.h
+++ b/src/core/fma-gconf-migration.h
@@ -27,15 +27,15 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAUTILUS_ACTIONS_CORE_NA_GCONF_MIGRATION_H__
-#define __NAUTILUS_ACTIONS_CORE_NA_GCONF_MIGRATION_H__
+#ifndef __CORE_FMA_GCONF_MIGRATION_H__
+#define __CORE_FMA_GCONF_MIGRATION_H__
 
 #include <glib.h>
 
 G_BEGIN_DECLS
 
-void  na_gconf_migration_run( void );
+void  fma_gconf_migration_run( void );
 
 G_END_DECLS
 
-#endif /* __NAUTILUS_ACTIONS_CORE_NA_GCONF_MIGRATION_H__ */
+#endif /* __CORE_FMA_GCONF_MIGRATION_H__ */
diff --git a/src/core/na-io-provider.c b/src/core/na-io-provider.c
index cdcf96a..ef6aac3 100644
--- a/src/core/na-io-provider.c
+++ b/src/core/na-io-provider.c
@@ -160,7 +160,7 @@ class_init( NAIOProviderClass *klass )
        spec = g_param_spec_string(
                        IO_PROVIDER_PROP_ID,
                        "I/O Provider Id",
-                       "Internal identifier of the I/O provider (e.g. 'na-gconf')", "",
+                       "Internal identifier of the I/O provider (e.g. 'fma-gconf')", "",
                        G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
        g_object_class_install_property( object_class, IO_PROVIDER_PROP_ID_ID, spec );
 
diff --git a/src/io-gconf/nagp-gconf-provider.c b/src/io-gconf/nagp-gconf-provider.c
index a4a0a23..e220537 100644
--- a/src/io-gconf/nagp-gconf-provider.c
+++ b/src/io-gconf/nagp-gconf-provider.c
@@ -238,7 +238,7 @@ iio_provider_iface_init( FMAIIOProviderInterface *iface )
 static gchar *
 iio_provider_get_id( const FMAIIOProvider *provider )
 {
-       return( g_strdup( "na-gconf" ));
+       return( g_strdup( "fma-gconf" ));
 }
 
 static gchar *
diff --git a/src/io-gconf/nagp-gconf-provider.h b/src/io-gconf/nagp-gconf-provider.h
index a765f4a..3cd567d 100644
--- a/src/io-gconf/nagp-gconf-provider.h
+++ b/src/io-gconf/nagp-gconf-provider.h
@@ -33,7 +33,7 @@
 /**
  * SECTION: nagp_gconf_provider
  * @short_description: #NagpGConfProvider class definition.
- * @include: na-gconf-provider.h
+ * @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
diff --git a/src/nact/main.c b/src/nact/main.c
index 79823f6..a755ef0 100644
--- a/src/nact/main.c
+++ b/src/nact/main.c
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include <core/na-gconf-migration.h>
+#include <core/fma-gconf-migration.h>
 
 #include "nact-application.h"
 
@@ -62,7 +62,7 @@ main( int argc, char *argv[] )
         * run GConf migration tools before doing anything else
         * above all before allocating a new NAPivot
         */
-       na_gconf_migration_run();
+       fma_gconf_migration_run();
 
        /* create and run the application
         */
diff --git a/src/plugin-menu/nautilus-module.c b/src/plugin-menu/nautilus-module.c
index c32f1f8..6f929d4 100644
--- a/src/plugin-menu/nautilus-module.c
+++ b/src/plugin-menu/nautilus-module.c
@@ -37,7 +37,7 @@
 
 #include <libnautilus-extension/nautilus-extension-types.h>
 
-#include <core/na-gconf-migration.h>
+#include <core/fma-gconf-migration.h>
 #include <core/na-settings.h>
 
 #include "nautilus-actions.h"
@@ -76,7 +76,7 @@ nautilus_module_initialize( GTypeModule *module )
         * run GConf migration tools before doing anything else
         * above all before allocating a new NAPivot
         */
-       na_gconf_migration_run();
+       fma_gconf_migration_run();
 
        nautilus_actions_register_type( module );
 }
diff --git a/src/utils/.gitignore b/src/utils/.gitignore
index d44b740..8774447 100644
--- a/src/utils/.gitignore
+++ b/src/utils/.gitignore
@@ -3,5 +3,5 @@ file-manager-actions-print
 file-manager-actions-run
 file-manager-actions-run-bindings.h
 na-delete-xmltree
-na-gconf2key.sh
+fma-gconf2key.sh
 na-print-schemas
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index a290387..ac2b2d8 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -119,7 +119,7 @@ na_set_conf_LDADD = \
        $(NULL)
 
 EXTRA_DIST = \
-       na-gconf2key.sh.in                                                                                    
  \
+       fma-gconf2key.sh.in                                                                                   
  \
        $(NULL)
 
 CLEANFILES = \
@@ -144,7 +144,7 @@ na_delete_xmltree_LDADD = \
        $(NULL)
 
 pkglibexec_SCRIPTS = \
-       na-gconf2key.sh                                                                                       
  \
+       fma-gconf2key.sh                                                                                      
          \
        $(NULL)
 
 do_subst = sed \
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index f30a318..0fb86b7 100644
--- a/src/utils/na-gconf2key.sh.in
+++ b/src/utils/na-gconf2key.sh.in
@@ -402,8 +402,8 @@ function add_pref
 
        # make sure that GConf is at the end of the list of I/O providers
        if [ "${_key}" = "io-providers-order" ]; then
-               if [ "$(echo ${_newvalue} | grep na-gconf)" != "" ]; then
-                       typeset _v="$(echo "${_newvalue}" | sed -e 's/na-gconf//');na-gconf;"
+               if [ "$(echo ${_newvalue} | grep fma-gconf)" != "" ]; then
+                       typeset _v="$(echo "${_newvalue}" | sed -e 's/fma-gconf//');fma-gconf;"
                        _newvalue="$(echo "${_v}" | sed -e 's/;\+/;/g')"
                fi
        fi
@@ -643,7 +643,7 @@ fi
 if [ "${opt_admin}" = "yes" ]; then
        for dir in $(gconftool-2 --all-dirs ${na_mandatory}); do
                bdir=${dir##*/}
-               if [ "${bdir}" != "na-gconf" ]; then
+               if [ "${bdir}" != "fma-gconf" ]; then
                        value=$(gconftool-2 --get ${dir}/locked 2>/dev/null)
                        if [ "${value}" != "" ]; then
                                # 'all/locked' means 'all preferences are read-only'
@@ -663,7 +663,7 @@ fi
 if [ "${opt_admin}" = "no" ]; then
        for dir in $(gconftool-2 --all-dirs ${na_providers}); do
                bdir=${dir##*/}
-               if [ "${bdir}" != "na-gconf" ]; then
+               if [ "${bdir}" != "fma-gconf" ]; then
                        gconftool-2 --all-entries ${dir} | while read key x value; do
                                case ${key} in
                                        read-at-startup)
@@ -680,7 +680,7 @@ fi
 
 # whether we are running admin tasks or not, we try to force the GConf i/o provider
 # to be locked
-cat <<! >${my_tmproot}.io-provider_na-gconf
+cat <<! >${my_tmproot}.io-provider_fma-gconf
 # Starting with 3.1.0, GConf as I/O provider is deprecated
 readable=true
 writable = false
@@ -690,7 +690,7 @@ let nbprefs=0
 
 if [ -e ${destconf} ]; then
        msg "${destconf} already exists: do not replace it, update the N-A configuration file instead"
-       command "@pkglibexecdir@/na-set-conf --group 'io-provider na-gconf' --key writable --type bool 
--value false"
+       command "@pkglibexecdir@/na-set-conf --group 'io-provider fma-gconf' --key writable --type bool 
--value false"
 else
        nbprefs=$(cat ${my_tmproot}.nact ${my_tmproot}.runtime ${my_tmproot}.io-provider_* 2>/dev/null | wc 
-l)
 
diff --git a/src/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
index 7640756..87fee24 100644
--- a/src/utils/nautilus-actions-new.c
+++ b/src/utils/nautilus-actions-new.c
@@ -42,7 +42,7 @@
 #include <api/fma-iio-provider.h>
 #include <api/fma-object-api.h>
 
-#include <core/na-gconf-migration.h>
+#include <core/fma-gconf-migration.h>
 #include <core/na-io-provider.h>
 #include <core/fma-exporter.h>
 #include <core/na-updater.h>
@@ -191,7 +191,7 @@ main( int argc, char** argv )
         * run GConf migration tools before doing anything else
         * above all before allocating a new NAPivot
         */
-       na_gconf_migration_run();
+       fma_gconf_migration_run();
 
        context = init_options();
 
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index ea64fc3..04846d6 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -41,7 +41,7 @@
 #include <api/fma-object-api.h>
 #include <api/fma-dbus.h>
 
-#include <core/na-gconf-migration.h>
+#include <core/fma-gconf-migration.h>
 #include <core/na-pivot.h>
 #include <core/na-selected-info.h>
 #include <core/na-tokens.h>
@@ -103,7 +103,7 @@ main( int argc, char** argv )
         * run GConf migration tools before doing anything else
         * above all before allocating a new NAPivot
         */
-       na_gconf_migration_run();
+       fma_gconf_migration_run();
 
        context = init_options();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]