[nautilus-actions/file-manager-actions] Rename 'na-' prefixed I/O providers to 'io-'



commit b0f19616c095867a6015f7a3335e37aacc4d0e39
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Sep 9 10:17:55 2015 +0200

    Rename 'na-' prefixed I/O providers to 'io-'

 docs/reference/na-compiling.xml |    6 +++---
 m4/na-default-io-provider.m4    |    8 ++++----
 src/api/fma-iio-provider.h      |    6 +++---
 src/utils/fma-new.c             |    6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/docs/reference/na-compiling.xml b/docs/reference/na-compiling.xml
index c7c48b5..6efcee3 100644
--- a/docs/reference/na-compiling.xml
+++ b/docs/reference/na-compiling.xml
@@ -165,7 +165,7 @@
           <arg>--with-nautilus-extdir=DIR</arg>
         </group>
         <group>
-          <arg>--with-default-io-provider=na-gconf|na-desktop</arg>
+          <arg>--with-default-io-provider=na-gconf|io-desktop</arg>
         </group>
         <group>
           <arg>--enable-html-manuals[=gdt|db2html]</arg>
@@ -210,7 +210,7 @@
     </formalpara>
 
     <formalpara>
-      <title><systemitem>--with-default-io-provider=na-gconf|na-desktop</systemitem></title>
+      <title><systemitem>--with-default-io-provider=na-gconf|io-desktop</systemitem></title>
       <para>
         As of version 3.0, &prodname; may store menus and actions
         both in GConf, which is the historical behavior, or as
@@ -222,7 +222,7 @@
         created.
       </para>
       <para>
-        This defaults to &quot;na-desktop&quot; which is the internal
+        This defaults to &quot;io-desktop&quot; which is the internal
         identifier of the I/O provider which manages
         <filename>.desktop</filename> files.
       </para>
diff --git a/m4/na-default-io-provider.m4 b/m4/na-default-io-provider.m4
index 044f5a0..31415af 100644
--- a/m4/na-default-io-provider.m4
+++ b/m4/na-default-io-provider.m4
@@ -29,14 +29,14 @@
 
 dnl --with-default-io-provider=gconf|desktop
 dnl   Defines the default I/O Provider when creating a new action
-dnl   Default to 'na-desktop'
+dnl   Default to 'io-desktop'
 dnl
 dnl configure.ac usage:  NA_SET_DEFAULT_IO_PROVIDER
 dnl
 dnl ac_define NA_DEFAULT_IO_PROVIDER variable
 
 AC_DEFUN([NA_SET_DEFAULT_IO_PROVIDER],[
-       _AC_ARG_NA_WITH_DEFAULT_IO_PROVIDER([na-desktop])
+       _AC_ARG_NA_WITH_DEFAULT_IO_PROVIDER([io-desktop])
        _CHECK_FOR_DEFAULT_IO_PROVIDER
 ])
 
@@ -54,8 +54,8 @@ AC_DEFUN([_CHECK_FOR_DEFAULT_IO_PROVIDER],[
        AC_MSG_CHECKING([for default I/O provider on new items])
        AC_MSG_RESULT([${with_default_io_provider}])
        if test "${with_default_io_provider}" != "na-gconf"; then
-               if test "${with_default_io_provider}" != "na-desktop"; then
-                       AC_MSG_ERROR([a default I/O provider must be specified, must be 'na-gconf' or 
'na-desktop'])
+               if test "${with_default_io_provider}" != "io-desktop"; then
+                       AC_MSG_ERROR([a default I/O provider must be specified, must be 'na-gconf' or 
'io-desktop'])
                fi
        fi
 
diff --git a/src/api/fma-iio-provider.h b/src/api/fma-iio-provider.h
index 913820a..16191ab 100644
--- a/src/api/fma-iio-provider.h
+++ b/src/api/fma-iio-provider.h
@@ -45,7 +45,7 @@
  * of this interface.
  *
  * &prodname; is bundled with several I/O providers.
- * Since version 3, the <literal>na-desktop</literal> I/O provider, which
+ * Since version 3, the <literal>io-desktop</literal> I/O provider, which
  * implements the
  * <ulink role="online-location" url="http://www.filemanager-actions.org/?q=node/377/";>DES-EMA</ulink>
  * specification, is the preferred way of storing (and sharing) items.
@@ -144,7 +144,7 @@
  *          <entry>2010-01-28</entry>
  *        </row>
  *        <row>
- *          <entry><literal>na-desktop</literal></entry>
+ *          <entry><literal>io-desktop</literal></entry>
  *          <entry>NA Desktop I/O Provider</entry>
  *          <entry>&prodname;</entry>
  *          <entry>2009-12-16</entry>
@@ -156,7 +156,7 @@
  *          <entry>2009-12-16</entry>
  *        </row>
  *        <row>
- *          <entry><literal>na-xml</literal></entry>
+ *          <entry><literal>io-xml</literal></entry>
  *          <entry>NA XML module</entry>
  *          <entry>&prodname;</entry>
  *          <entry>2010-02-14</entry>
diff --git a/src/utils/fma-new.c b/src/utils/fma-new.c
index 397dd10..76f17c1 100644
--- a/src/utils/fma-new.c
+++ b/src/utils/fma-new.c
@@ -585,7 +585,7 @@ output_to_desktop( FMAObjectAction *action, GSList **msgs )
        gboolean code;
 
        updater = fma_updater_new();
-       provider = fma_io_provider_find_io_provider_by_id( FMA_PIVOT( updater ), "na-desktop" );
+       provider = fma_io_provider_find_io_provider_by_id( FMA_PIVOT( updater ), "io-desktop" );
 
        if( provider ){
                fma_object_set_provider( action, provider );
@@ -593,8 +593,8 @@ output_to_desktop( FMAObjectAction *action, GSList **msgs )
                code = ( ret == IIO_PROVIDER_CODE_OK );
 
        } else {
-               /* i18n: 'na-desktop' is a plugin identifier - do not translate */
-               *msgs = g_slist_append( *msgs, _( "Error: unable to find 'na-desktop' i/o provider." ));
+               /* i18n: 'io-desktop' is a plugin identifier - do not translate */
+               *msgs = g_slist_append( *msgs, _( "Error: unable to find 'io-desktop' i/o provider." ));
                code = FALSE;
        }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]