[nautilus-actions] nadp_utils_xxx are renamed to fma_desktop_utils_xxx

[Pierre Wieser <pwieser src gnome org>]

commit 6b42a5ae8a3d865f1457e6515d5545f026950d96
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 16:29:22 2015 +0200

    nadp_utils_xxx are renamed to fma_desktop_utils_xxx

 src/io-desktop/Makefile.am                         |    4 ++--
 src/io-desktop/fma-desktop-reader.c                |    4 ++--
 .../{nadp-utils.c => fma-desktop-utils.c}          |   14 +++++++-------
 .../{nadp-utils.h => fma-desktop-utils.h}          |   12 ++++++------
 src/io-desktop/nadp-writer.c                       |    4 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/src/io-desktop/Makefile.am b/src/io-desktop/Makefile.am
index 6776c57..461dcdf 100644
--- a/src/io-desktop/Makefile.am
+++ b/src/io-desktop/Makefile.am
@@ -54,8 +54,8 @@ libna_io_desktop_la_SOURCES = \
        fma-desktop-monitor.h                                                           \
        fma-desktop-reader.c                                                            \
        fma-desktop-reader.h                                                            \
-       nadp-utils.c                                                                            \
-       nadp-utils.h                                                                            \
+       fma-desktop-utils.c                                                                     \
+       fma-desktop-utils.h                                                                     \
        nadp-writer.c                                                                           \
        nadp-writer.h                                                                           \
        nadp-xdg-dirs.c                                                                         \
diff --git a/src/io-desktop/fma-desktop-reader.c b/src/io-desktop/fma-desktop-reader.c
index 2830d30..b982d4f 100644
--- a/src/io-desktop/fma-desktop-reader.c
+++ b/src/io-desktop/fma-desktop-reader.c
@@ -44,7 +44,7 @@
 #include "fma-desktop-provider.h"
 #include "fma-desktop-keys.h"
 #include "fma-desktop-reader.h"
-#include "nadp-utils.h"
+#include "fma-desktop-utils.h"
 #include "nadp-xdg-dirs.h"
 
 typedef struct {
@@ -621,7 +621,7 @@ read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem *
 
        ndf = reader_data->ndf;
        uri = fma_desktop_file_get_key_file_uri( ndf );
-       writable = fma_utils_uri_is_writable( uri );
+       writable = fma_desktop_utils_uri_is_writable( uri );
        g_free( uri );
 
        return( writable );
diff --git a/src/io-desktop/nadp-utils.c b/src/io-desktop/fma-desktop-utils.c
similarity index 90%
rename from src/io-desktop/nadp-utils.c
rename to src/io-desktop/fma-desktop-utils.c
index bcfb03a..8fdb9f6 100644
--- a/src/io-desktop/nadp-utils.c
+++ b/src/io-desktop/fma-desktop-utils.c
@@ -39,17 +39,17 @@
 #include <api/fma-core-utils.h>
 
 #include "fma-desktop-provider.h"
-#include "nadp-utils.h"
+#include "fma-desktop-utils.h"
 
 /**
- * fma_utils_gslist_remove_from:
+ * fma_desktop_utils_gslist_remove_from:
  * @list: the #GSList from which remove the @string.
  * @string: the string to be removed.
  *
  * Removes a @string from a string list, then frees the removed @string.
  */
 GSList *
-fma_utils_gslist_remove_from( GSList *list, const gchar *string )
+fma_desktop_utils_gslist_remove_from( GSList *list, const gchar *string )
 {
        GSList *is;
 
@@ -69,7 +69,7 @@ fma_utils_gslist_remove_from( GSList *list, const gchar *string )
  *
  */
 gboolean
-fma_utils_uri_delete( const gchar *uri )
+fma_desktop_utils_uri_delete( const gchar *uri )
 {
        gboolean deleted;
        gchar *scheme;
@@ -93,7 +93,7 @@ fma_utils_uri_delete( const gchar *uri )
 }
 
 /**
- * fma_utils_uri_is_writable:
+ * fma_desktop_utils_uri_is_writable:
  * @uri: the URI of the file to be tested.
  *
  * Returns: %TRUE if the file is writable, %FALSE else.
@@ -105,9 +105,9 @@ fma_utils_uri_delete( const gchar *uri )
  * There is no "super-test". Just try...
  */
 gboolean
-fma_utils_uri_is_writable( const gchar *uri )
+fma_desktop_utils_uri_is_writable( const gchar *uri )
 {
-       static const gchar *thisfn = "fma_utils_uri_is_writable";
+       static const gchar *thisfn = "fma_desktop_utils_uri_is_writable";
        GFile *file;
        GError *error = NULL;
        GFileInfo *info;
diff --git a/src/io-desktop/nadp-utils.h b/src/io-desktop/fma-desktop-utils.h
similarity index 77%
rename from src/io-desktop/nadp-utils.h
rename to src/io-desktop/fma-desktop-utils.h
index 21371e4..811f1dc 100644
--- a/src/io-desktop/nadp-utils.h
+++ b/src/io-desktop/fma-desktop-utils.h
@@ -27,18 +27,18 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __IO_DESKTOP_FMA_UTILS_H__
-#define __IO_DESKTOP_FMA_UTILS_H__
+#ifndef __IO_DESKTOP_FMA_DESKTOP_UTILS_H__
+#define __IO_DESKTOP_FMA_DESKTOP_UTILS_H__
 
 #include <glib.h>
 
 G_BEGIN_DECLS
 
-GSList  *fma_utils_gslist_remove_from( GSList *list, const gchar *string );
+GSList  *fma_desktop_utils_gslist_remove_from( GSList *list, const gchar *string );
 
-gboolean fma_utils_uri_delete     ( const gchar *uri );
-gboolean fma_utils_uri_is_writable( const gchar *uri );
+gboolean fma_desktop_utils_uri_delete     ( const gchar *uri );
+gboolean fma_desktop_utils_uri_is_writable( const gchar *uri );
 
 G_END_DECLS
 
-#endif /* __IO_DESKTOP_FMA_UTILS_H__ */
+#endif /* __IO_DESKTOP_FMA_DESKTOP_UTILS_H__ */
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 240161b..eb4f3e7 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -43,7 +43,7 @@
 #include "fma-desktop-provider.h"
 #include "fma-desktop-formats.h"
 #include "fma-desktop-keys.h"
-#include "nadp-utils.h"
+#include "fma-desktop-utils.h"
 #include "nadp-writer.h"
 #include "nadp-xdg-dirs.h"
 
@@ -278,7 +278,7 @@ nadp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectIt
        if( ndf ){
                g_return_val_if_fail( FMA_IS_DESKTOP_FILE( ndf ), ret );
                uri = fma_desktop_file_get_key_file_uri( ndf );
-               if( fma_utils_uri_delete( uri )){
+               if( fma_desktop_utils_uri_delete( uri )){
                        ret = IIO_PROVIDER_CODE_OK;
                }
                g_free( uri );