[nautilus-actions/file-manager-actions] nadp_xdg_dirs_xxx are renamed to fma_desktop_xgd_dirs_xxx

[Pierre Wieser <pwieser src gnome org>]

commit 46d9992d5cb0fc73b697c6b1fe0ebdd9f15cb28f
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 16:37:35 2015 +0200

    nadp_xdg_dirs_xxx are renamed to fma_desktop_xgd_dirs_xxx

 src/io-desktop/Makefile.am                         |    4 ++--
 src/io-desktop/fma-desktop-reader.c                |    4 ++--
 src/io-desktop/fma-desktop-writer.c                |    6 +++---
 .../{nadp-xdg-dirs.c => fma-desktop-xdg-dirs.c}    |   18 +++++++++---------
 .../{nadp-xdg-dirs.h => fma-desktop-xdg-dirs.h}    |   12 ++++++------
 5 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/io-desktop/Makefile.am b/src/io-desktop/Makefile.am
index c31a3c7..2e6509e 100644
--- a/src/io-desktop/Makefile.am
+++ b/src/io-desktop/Makefile.am
@@ -58,8 +58,8 @@ libna_io_desktop_la_SOURCES = \
        fma-desktop-utils.h                                                                     \
        fma-desktop-writer.c                                                            \
        fma-desktop-writer.h                                                            \
-       nadp-xdg-dirs.c                                                                         \
-       nadp-xdg-dirs.h                                                                         \
+       fma-desktop-xdg-dirs.c                                                          \
+       fma-desktop-xdg-dirs.h                                                          \
        $(NULL)
 
 libna_io_desktop_la_LIBADD = \
diff --git a/src/io-desktop/fma-desktop-reader.c b/src/io-desktop/fma-desktop-reader.c
index b982d4f..74f6d1e 100644
--- a/src/io-desktop/fma-desktop-reader.c
+++ b/src/io-desktop/fma-desktop-reader.c
@@ -45,7 +45,7 @@
 #include "fma-desktop-keys.h"
 #include "fma-desktop-reader.h"
 #include "fma-desktop-utils.h"
-#include "nadp-xdg-dirs.h"
+#include "fma-desktop-xdg-dirs.h"
 
 typedef struct {
        gchar *path;
@@ -136,7 +136,7 @@ get_list_of_desktop_paths( FMADesktopProvider *provider, GSList **messages )
        gchar *dir;
 
        files = NULL;
-       xdg_dirs = nadp_xdg_dirs_get_data_dirs();
+       xdg_dirs = fma_desktop_xdg_dirs_get_data_dirs();
        subdirs = fma_core_utils_slist_from_split( FMA_DESKTOP_PROVIDER_SUBDIRS, G_SEARCHPATH_SEPARATOR_S );
 
        /* explore each directory from XDG_DATA_DIRS
diff --git a/src/io-desktop/fma-desktop-writer.c b/src/io-desktop/fma-desktop-writer.c
index a405dff..670be62 100644
--- a/src/io-desktop/fma-desktop-writer.c
+++ b/src/io-desktop/fma-desktop-writer.c
@@ -45,7 +45,7 @@
 #include "fma-desktop-keys.h"
 #include "fma-desktop-utils.h"
 #include "fma-desktop-writer.h"
-#include "nadp-xdg-dirs.h"
+#include "fma-desktop-xdg-dirs.h"
 
 /* the association between an export format and the functions
  */
@@ -102,7 +102,7 @@ fma_desktop_writer_iio_provider_is_able_to_write( const FMAIIOProvider *provider
 
        able_to = FALSE;
 
-       userdir = nadp_xdg_dirs_get_user_data_dir();
+       userdir = fma_desktop_xdg_dirs_get_user_data_dir();
 
        if( g_file_test( userdir, G_FILE_TEST_IS_DIR )){
                able_to = fma_core_utils_dir_is_writable_path( userdir );
@@ -154,7 +154,7 @@ fma_desktop_writer_iio_provider_write_item( const FMAIIOProvider *provider, cons
                g_return_val_if_fail( FMA_IS_DESKTOP_FILE( ndf ), ret );
 
        } else {
-               userdir = nadp_xdg_dirs_get_user_data_dir();
+               userdir = fma_desktop_xdg_dirs_get_user_data_dir();
                subdirs = fma_core_utils_slist_from_split( FMA_DESKTOP_PROVIDER_SUBDIRS, 
G_SEARCHPATH_SEPARATOR_S );
                fulldir = g_build_filename( userdir, ( gchar * ) subdirs->data, NULL );
                dir_ok = TRUE;
diff --git a/src/io-desktop/nadp-xdg-dirs.c b/src/io-desktop/fma-desktop-xdg-dirs.c
similarity index 87%
rename from src/io-desktop/nadp-xdg-dirs.c
rename to src/io-desktop/fma-desktop-xdg-dirs.c
index 2fce0e2..96b5042 100644
--- a/src/io-desktop/nadp-xdg-dirs.c
+++ b/src/io-desktop/fma-desktop-xdg-dirs.c
@@ -33,10 +33,10 @@
 
 #include <api/fma-core-utils.h>
 
-#include "nadp-xdg-dirs.h"
+#include "fma-desktop-xdg-dirs.h"
 
 /**
- * nadp_xdg_dirs_get_data_dirs:
+ * fma_desktop_xdg_dirs_get_data_dirs:
  *
  * Returns: the ordered list of data directories, most important first,
  * as a GSList of newly allocated strings.
@@ -45,23 +45,23 @@
  * freed by the caller.
  */
 GSList *
-nadp_xdg_dirs_get_data_dirs( void )
+fma_desktop_xdg_dirs_get_data_dirs( void )
 {
        GSList *listdirs;
        gchar *userdir;
        GSList *datadirs;
 
-       userdir = nadp_xdg_dirs_get_user_data_dir();
+       userdir = fma_desktop_xdg_dirs_get_user_data_dir();
        listdirs = g_slist_prepend( NULL, userdir );
 
-       datadirs = nadp_xdg_dirs_get_system_data_dirs();
+       datadirs = fma_desktop_xdg_dirs_get_system_data_dirs();
        listdirs = g_slist_concat( listdirs, datadirs );
 
        return( listdirs );
 }
 
 /**
- * nadp_xdg_dirs_get_user_data_dir:
+ * fma_desktop_xdg_dirs_get_user_data_dir:
  *
  * Returns: the path to the single base directory relative to which
  * user-specific data files should be written, as a newly allocated
@@ -74,7 +74,7 @@ nadp_xdg_dirs_get_data_dirs( void )
  * The returned string should be g_free() by the caller.
  */
 gchar *
-nadp_xdg_dirs_get_user_data_dir( void )
+fma_desktop_xdg_dirs_get_user_data_dir( void )
 {
        gchar *dir;
 
@@ -84,7 +84,7 @@ nadp_xdg_dirs_get_user_data_dir( void )
 }
 
 /**
- * nadp_xdg_dirs_get_system_data_dirs:
+ * fma_desktop_xdg_dirs_get_system_data_dirs:
  *
  * Returns: the set of preference ordered base directories relative to
  * which data files should be written, as a GSList of newly allocated
@@ -99,7 +99,7 @@ nadp_xdg_dirs_get_user_data_dir( void )
  * by the caller.
  */
 GSList *
-nadp_xdg_dirs_get_system_data_dirs( void )
+fma_desktop_xdg_dirs_get_system_data_dirs( void )
 {
        const gchar **dirs;
        GSList *paths;
diff --git a/src/io-desktop/nadp-xdg-dirs.h b/src/io-desktop/fma-desktop-xdg-dirs.h
similarity index 79%
rename from src/io-desktop/nadp-xdg-dirs.h
rename to src/io-desktop/fma-desktop-xdg-dirs.h
index 14e460e..85f66ca 100644
--- a/src/io-desktop/nadp-xdg-dirs.h
+++ b/src/io-desktop/fma-desktop-xdg-dirs.h
@@ -27,19 +27,19 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NADP_XDG_DIRS_H__
-#define __NADP_XDG_DIRS_H__
+#ifndef __IO_DESKTOP_FMA_DESKTOP_XDG_DIRS_H__
+#define __IO_DESKTOP_FMA_DESKTOP_XDG_DIRS_H__
 
 #include <glib.h>
 
 G_BEGIN_DECLS
 
-GSList *nadp_xdg_dirs_get_data_dirs       ( void );
+GSList *fma_desktop_xdg_dirs_get_data_dirs       ( void );
 
-gchar  *nadp_xdg_dirs_get_user_data_dir   ( void );
+gchar  *fma_desktop_xdg_dirs_get_user_data_dir   ( void );
 
-GSList *nadp_xdg_dirs_get_system_data_dirs( void );
+GSList *fma_desktop_xdg_dirs_get_system_data_dirs( void );
 
 G_END_DECLS
 
-#endif /* __NADP_XDG_DIRS_H__ */
+#endif /* __IO_DESKTOP_FMA_DESKTOP_XDG_DIRS_H__ */