GNOME.org
 

[nautilus-actions/file-manager-actions] NadpReader class is renamed to FMAReader

commit ff2d9c955a3aa3c08be422d241fe9ae011a6c92c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 15:01:11 2015 +0200

    NadpReader class is renamed to FMAReader

 src/io-desktop/Makefile.am                     |    4 +-
 src/io-desktop/fma-desktop-provider.c          |   12 ++--
 src/io-desktop/{nadp-reader.c => fma-reader.c} |   72 ++++++++++++------------
 src/io-desktop/{nadp-reader.h => fma-reader.h} |   16 +++---
 4 files changed, 52 insertions(+), 52 deletions(-)
---
diff --git a/src/io-desktop/Makefile.am b/src/io-desktop/Makefile.am
index de7dd8f..6d9f81c 100644
--- a/src/io-desktop/Makefile.am
+++ b/src/io-desktop/Makefile.am
@@ -52,8 +52,8 @@ libna_io_desktop_la_SOURCES = \
        fma-module.c                                                                            \
        fma-monitor.c                                                                           \
        fma-monitor.h                                                                           \
-       nadp-reader.c                                                                           \
-       nadp-reader.h                                                                           \
+       fma-reader.c                                                                            \
+       fma-reader.h                                                                            \
        nadp-utils.c                                                                            \
        nadp-utils.h                                                                            \
        nadp-writer.c                                                                           \
diff --git a/src/io-desktop/fma-desktop-provider.c b/src/io-desktop/fma-desktop-provider.c
index ae81913..8253972 100644
--- a/src/io-desktop/fma-desktop-provider.c
+++ b/src/io-desktop/fma-desktop-provider.c
@@ -41,7 +41,7 @@
 #include "fma-formats.h"
 #include "fma-keys.h"
 #include "fma-monitor.h"
-#include "nadp-reader.h"
+#include "fma-reader.h"
 #include "nadp-writer.h"
 
 /* private class data
@@ -233,7 +233,7 @@ iio_provider_iface_init( FMAIIOProviderInterface *iface )
        iface->get_version = iio_provider_get_version;
        iface->get_id = iio_provider_get_id;
        iface->get_name = iio_provider_get_name;
-       iface->read_items = nadp_iio_provider_read_items;
+       iface->read_items = fma_iio_provider_read_items;
        iface->is_willing_to_write = nadp_iio_provider_is_willing_to_write;
        iface->is_able_to_write = nadp_iio_provider_is_able_to_write;
        iface->write_item = nadp_iio_provider_write_item;
@@ -267,9 +267,9 @@ ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface )
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
        iface->get_version = ifactory_provider_get_version;
-       iface->read_start = nadp_reader_ifactory_provider_read_start;
-       iface->read_data = nadp_reader_ifactory_provider_read_data;
-       iface->read_done = nadp_reader_ifactory_provider_read_done;
+       iface->read_start = fma_reader_ifactory_provider_read_start;
+       iface->read_data = fma_reader_ifactory_provider_read_data;
+       iface->read_done = fma_reader_ifactory_provider_read_done;
        iface->write_start = nadp_writer_ifactory_provider_write_start;
        iface->write_data = nadp_writer_ifactory_provider_write_data;
        iface->write_done = nadp_writer_ifactory_provider_write_done;
@@ -289,7 +289,7 @@ iimporter_iface_init( FMAIImporterInterface *iface )
        g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
 
        iface->get_version = iimporter_get_version;
-       iface->import_from_uri = nadp_reader_iimporter_import_from_uri;
+       iface->import_from_uri = fma_reader_iimporter_import_from_uri;
 }
 
 static guint
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/fma-reader.c
similarity index 88%
rename from src/io-desktop/nadp-reader.c
rename to src/io-desktop/fma-reader.c
index 87042c4..fd9c747 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/fma-reader.c
@@ -43,7 +43,7 @@
 
 #include "fma-desktop-provider.h"
 #include "fma-keys.h"
-#include "nadp-reader.h"
+#include "fma-reader.h"
 #include "nadp-utils.h"
 #include "nadp-xdg-dirs.h"
 
@@ -59,7 +59,7 @@ typedef struct {
        FMADesktopFile *ndf;
        FMAObjectAction  *action;
 }
-       NadpReaderData;
+       FMAReaderData;
 
 #define ERR_NOT_DESKTOP                _( "The Desktop I/O Provider is not able to handle the URI" )
 
@@ -72,12 +72,12 @@ static FMAIFactoryObject *item_from_desktop_file( const FMADesktopProvider *prov
 static void              desktop_weak_notify( FMADesktopFile *ndf, GObject *item );
 static void              free_desktop_paths( GList *paths );
 
-static void              read_start_read_subitems_key( const FMAIFactoryProvider *provider, FMAObjectItem 
*item, NadpReaderData *reader_data, GSList **messages );
-static void              read_start_profile_attach_profile( const FMAIFactoryProvider *provider, 
FMAObjectProfile *profile, NadpReaderData *reader_data, GSList **messages );
+static void              read_start_read_subitems_key( const FMAIFactoryProvider *provider, FMAObjectItem 
*item, FMAReaderData *reader_data, GSList **messages );
+static void              read_start_profile_attach_profile( const FMAIFactoryProvider *provider, 
FMAObjectProfile *profile, FMAReaderData *reader_data, GSList **messages );
 
-static gboolean          read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem 
*item, NadpReaderData *reader_data, GSList **messages );
-static void              read_done_action_read_profiles( const FMAIFactoryProvider *provider, 
FMAObjectAction *action, NadpReaderData *data, GSList **messages );
-static void              read_done_action_load_profile( const FMAIFactoryProvider *provider, NadpReaderData 
*reader_data, const gchar *profile_id, GSList **messages );
+static gboolean          read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem 
*item, FMAReaderData *reader_data, GSList **messages );
+static void              read_done_action_read_profiles( const FMAIFactoryProvider *provider, 
FMAObjectAction *action, FMAReaderData *data, GSList **messages );
+static void              read_done_action_load_profile( const FMAIFactoryProvider *provider, FMAReaderData 
*reader_data, const gchar *profile_id, GSList **messages );
 
 /*
  * Returns an unordered list of FMAIFactoryObject-derived objects
@@ -85,9 +85,9 @@ static void              read_done_action_load_profile( const FMAIFactoryProvide
  * This is implementation of FMAIIOProvider::read_items method
  */
 GList *
-nadp_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages )
+fma_iio_provider_read_items( const FMAIIOProvider *provider, GSList **messages )
 {
-       static const gchar *thisfn = "nadp_iio_provider_read_items";
+       static const gchar *thisfn = "io-desktop/fma_iio_provider_read_items";
        GList *items;
        GList *desktop_paths, *ip;
        FMAIFactoryObject *item;
@@ -167,7 +167,7 @@ get_list_of_desktop_paths( FMADesktopProvider *provider, GSList **messages )
 static void
 get_list_of_desktop_files( const FMADesktopProvider *provider, GList **files, const gchar *dir, GSList 
**messages )
 {
-       static const gchar *thisfn = "nadp_reader_get_list_of_desktop_files";
+       static const gchar *thisfn = "fma_reader_get_list_of_desktop_files";
        GDir *dir_handle;
        GError *error;
        const gchar *name;
@@ -272,10 +272,10 @@ item_from_desktop_path( const FMADesktopProvider *provider, DesktopPath *dps, GS
 static FMAIFactoryObject *
 item_from_desktop_file( const FMADesktopProvider *provider, FMADesktopFile *ndf, GSList **messages )
 {
-       /*static const gchar *thisfn = "nadp_reader_item_from_desktop_file";*/
+       /*static const gchar *thisfn = "fma_reader_item_from_desktop_file";*/
        FMAIFactoryObject *item;
        gchar *type;
-       NadpReaderData *reader_data;
+       FMAReaderData *reader_data;
        gchar *id;
 
        item = NULL;
@@ -297,7 +297,7 @@ item_from_desktop_file( const FMADesktopProvider *provider, FMADesktopFile *ndf,
                fma_object_set_id( item, id );
                g_free( id );
 
-               reader_data = g_new0( NadpReaderData, 1 );
+               reader_data = g_new0( FMAReaderData, 1 );
                reader_data->ndf = ndf;
 
                fma_ifactory_provider_read_item( FMA_IFACTORY_PROVIDER( provider ), reader_data, item, 
messages );
@@ -316,7 +316,7 @@ item_from_desktop_file( const FMADesktopProvider *provider, FMADesktopFile *ndf,
 static void
 desktop_weak_notify( FMADesktopFile *ndf, GObject *item )
 {
-       static const gchar *thisfn = "nadp_reader_desktop_weak_notify";
+       static const gchar *thisfn = "fma_reader_desktop_weak_notify";
 
        g_debug( "%s: ndf=%p (%s), item=%p (%s)",
                        thisfn, ( void * ) ndf, G_OBJECT_TYPE_NAME( ndf ),
@@ -342,7 +342,7 @@ free_desktop_paths( GList *paths )
 }
 
 /**
- * nadp_reader_iimporter_import_from_uri:
+ * fma_reader_iimporter_import_from_uri:
  * @instance: the #FMAIImporter provider.
  * @parms: a #FMAIImporterUriParms structure.
  *
@@ -361,9 +361,9 @@ free_desktop_paths( GList *paths )
  * thus no more checking here against possible duplicate identifiers.
  */
 guint
-nadp_reader_iimporter_import_from_uri( const FMAIImporter *instance, void *parms_ptr )
+fma_reader_iimporter_import_from_uri( const FMAIImporter *instance, void *parms_ptr )
 {
-       static const gchar *thisfn = "nadp_reader_iimporter_import_from_uri";
+       static const gchar *thisfn = "fma_reader_iimporter_import_from_uri";
        guint code;
        FMAIImporterImportFromUriParmsv2 *parms;
        FMADesktopFile *ndf;
@@ -419,9 +419,9 @@ nadp_reader_iimporter_import_from_uri( const FMAIImporter *instance, void *parms
  * depending of the exact class of the FMAObjectItem
  */
 void
-nadp_reader_ifactory_provider_read_start( const FMAIFactoryProvider *reader, void *reader_data, const 
FMAIFactoryObject *serializable, GSList **messages )
+fma_reader_ifactory_provider_read_start( const FMAIFactoryProvider *reader, void *reader_data, const 
FMAIFactoryObject *serializable, GSList **messages )
 {
-       static const gchar *thisfn = "nadp_reader_ifactory_provider_read_start";
+       static const gchar *thisfn = "fma_reader_ifactory_provider_read_start";
 
        g_return_if_fail( FMA_IS_IFACTORY_PROVIDER( reader ));
        g_return_if_fail( FMA_IS_DESKTOP_PROVIDER( reader ));
@@ -437,18 +437,18 @@ nadp_reader_ifactory_provider_read_start( const FMAIFactoryProvider *reader, voi
                                ( void * ) messages );
 
                if( FMA_IS_OBJECT_ITEM( serializable )){
-                       read_start_read_subitems_key( reader, FMA_OBJECT_ITEM( serializable ), ( 
NadpReaderData * ) reader_data, messages );
+                       read_start_read_subitems_key( reader, FMA_OBJECT_ITEM( serializable ), ( 
FMAReaderData * ) reader_data, messages );
                        fma_object_set_iversion( serializable, 3 );
                }
 
                if( FMA_IS_OBJECT_PROFILE( serializable )){
-                       read_start_profile_attach_profile( reader, FMA_OBJECT_PROFILE( serializable ), ( 
NadpReaderData * ) reader_data, messages );
+                       read_start_profile_attach_profile( reader, FMA_OBJECT_PROFILE( serializable ), ( 
FMAReaderData * ) reader_data, messages );
                }
        }
 }
 
 static void
-read_start_read_subitems_key( const FMAIFactoryProvider *provider, FMAObjectItem *item, NadpReaderData 
*reader_data, GSList **messages )
+read_start_read_subitems_key( const FMAIFactoryProvider *provider, FMAObjectItem *item, FMAReaderData 
*reader_data, GSList **messages )
 {
        GSList *subitems;
        gboolean key_found;
@@ -467,7 +467,7 @@ read_start_read_subitems_key( const FMAIFactoryProvider *provider, FMAObjectItem
 }
 
 static void
-read_start_profile_attach_profile( const FMAIFactoryProvider *provider, FMAObjectProfile *profile, 
NadpReaderData *reader_data, GSList **messages )
+read_start_profile_attach_profile( const FMAIFactoryProvider *provider, FMAObjectProfile *profile, 
FMAReaderData *reader_data, GSList **messages )
 {
        fma_object_attach_profile( reader_data->action, profile );
 }
@@ -483,12 +483,12 @@ read_start_profile_attach_profile( const FMAIFactoryProvider *provider, FMAObjec
  * letting the caller deal with default values
  */
 FMADataBoxed *
-nadp_reader_ifactory_provider_read_data( const FMAIFactoryProvider *reader, void *reader_data, const 
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages )
+fma_reader_ifactory_provider_read_data( const FMAIFactoryProvider *reader, void *reader_data, const 
FMAIFactoryObject *object, const FMADataDef *def, GSList **messages )
 {
-       static const gchar *thisfn = "nadp_reader_ifactory_provider_read_data";
+       static const gchar *thisfn = "fma_reader_ifactory_provider_read_data";
        FMADataBoxed *boxed;
        gboolean found;
-       NadpReaderData *nrd;
+       FMAReaderData *nrd;
        gchar *group, *id;
        gchar *msg;
        gchar *str_value;
@@ -504,7 +504,7 @@ nadp_reader_ifactory_provider_read_data( const FMAIFactoryProvider *reader, void
 
        if( !FMA_DESKTOP_PROVIDER( reader )->private->dispose_has_run ){
 
-               nrd = ( NadpReaderData * ) reader_data;
+               nrd = ( FMAReaderData * ) reader_data;
                g_return_val_if_fail( FMA_IS_DESKTOP_FILE( nrd->ndf ), NULL );
 
                if( def->desktop_entry ){
@@ -581,9 +581,9 @@ nadp_reader_ifactory_provider_read_data( const FMAIFactoryProvider *reader, void
  * called when each FMAIFactoryObject object has been read
  */
 void
-nadp_reader_ifactory_provider_read_done( const FMAIFactoryProvider *reader, void *reader_data, const 
FMAIFactoryObject *serializable, GSList **messages )
+fma_reader_ifactory_provider_read_done( const FMAIFactoryProvider *reader, void *reader_data, const 
FMAIFactoryObject *serializable, GSList **messages )
 {
-       static const gchar *thisfn = "nadp_reader_ifactory_provider_read_done";
+       static const gchar *thisfn = "fma_reader_ifactory_provider_read_done";
        gboolean writable;
 
        g_return_if_fail( FMA_IS_IFACTORY_PROVIDER( reader ));
@@ -600,12 +600,12 @@ nadp_reader_ifactory_provider_read_done( const FMAIFactoryProvider *reader, void
                                ( void * ) messages );
 
                if( FMA_IS_OBJECT_ITEM( serializable )){
-                       writable = read_done_item_is_writable( reader, FMA_OBJECT_ITEM( serializable ), ( 
NadpReaderData * ) reader_data, messages );
+                       writable = read_done_item_is_writable( reader, FMA_OBJECT_ITEM( serializable ), ( 
FMAReaderData * ) reader_data, messages );
                        fma_object_set_readonly( serializable, !writable );
                }
 
                if( FMA_IS_OBJECT_ACTION( serializable )){
-                       read_done_action_read_profiles( reader, FMA_OBJECT_ACTION( serializable ), ( 
NadpReaderData * ) reader_data, messages );
+                       read_done_action_read_profiles( reader, FMA_OBJECT_ACTION( serializable ), ( 
FMAReaderData * ) reader_data, messages );
                }
 
                g_debug( "%s: quitting for %s at %p", thisfn, G_OBJECT_TYPE_NAME( serializable ), ( void * ) 
serializable );
@@ -613,7 +613,7 @@ nadp_reader_ifactory_provider_read_done( const FMAIFactoryProvider *reader, void
 }
 
 static gboolean
-read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem *item, NadpReaderData 
*reader_data, GSList **messages )
+read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem *item, FMAReaderData 
*reader_data, GSList **messages )
 {
        FMADesktopFile *ndf;
        gchar *uri;
@@ -636,9 +636,9 @@ read_done_item_is_writable( const FMAIFactoryProvider *provider, FMAObjectItem *
  * - ensure that there is at least one profile attached to the action
  */
 static void
-read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAction *action, NadpReaderData 
*reader_data, GSList **messages )
+read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAction *action, FMAReaderData 
*reader_data, GSList **messages )
 {
-       static const gchar *thisfn = "nadp_reader_read_done_action_read_profiles";
+       static const gchar *thisfn = "fma_reader_read_done_action_read_profiles";
        GSList *order;
        GSList *ip;
        gchar *profile_id;
@@ -666,9 +666,9 @@ read_done_action_read_profiles( const FMAIFactoryProvider *provider, FMAObjectAc
 }
 
 static void
-read_done_action_load_profile( const FMAIFactoryProvider *provider, NadpReaderData *reader_data, const gchar 
*profile_id, GSList **messages )
+read_done_action_load_profile( const FMAIFactoryProvider *provider, FMAReaderData *reader_data, const gchar 
*profile_id, GSList **messages )
 {
-       static const gchar *thisfn = "nadp_reader_read_done_action_load_profile";
+       static const gchar *thisfn = "fma_reader_read_done_action_load_profile";
        FMAObjectProfile *profile;
 
        g_debug( "%s: loading profile=%s", thisfn, profile_id );
diff --git a/src/io-desktop/nadp-reader.h b/src/io-desktop/fma-reader.h
similarity index 73%
rename from src/io-desktop/nadp-reader.h
rename to src/io-desktop/fma-reader.h
index 00ca927..4509b10 100644
--- a/src/io-desktop/nadp-reader.h
+++ b/src/io-desktop/fma-reader.h
@@ -27,8 +27,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NADP_READER_H__
-#define __NADP_READER_H__
+#ifndef __IO_DESKTOP_FMA_READER_H__
+#define __IO_DESKTOP_FMA_READER_H__
 
 #include <api/fma-iio-provider.h>
 #include <api/fma-iimporter.h>
@@ -36,14 +36,14 @@
 
 G_BEGIN_DECLS
 
-GList       *nadp_iio_provider_read_items            ( const FMAIIOProvider *provider, GSList **messages );
+GList        *fma_iio_provider_read_items            ( const FMAIIOProvider *provider, GSList **messages );
 
-guint        nadp_reader_iimporter_import_from_uri   ( const FMAIImporter *instance, void *parms_ptr );
+guint         fma_reader_iimporter_import_from_uri   ( const FMAIImporter *instance, void *parms_ptr );
 
-void         nadp_reader_ifactory_provider_read_start( const FMAIFactoryProvider *reader, void *reader_data, 
const FMAIFactoryObject *serializable, GSList **messages );
-FMADataBoxed *nadp_reader_ifactory_provider_read_data ( const FMAIFactoryProvider *reader, void 
*reader_data, const FMAIFactoryObject *serializable, const FMADataDef *iddef, GSList **messages );
-void         nadp_reader_ifactory_provider_read_done ( const FMAIFactoryProvider *reader, void *reader_data, 
const FMAIFactoryObject *serializable, GSList **messages );
+void          fma_reader_ifactory_provider_read_start( const FMAIFactoryProvider *reader, void *reader_data, 
const FMAIFactoryObject *serializable, GSList **messages );
+FMADataBoxed *fma_reader_ifactory_provider_read_data ( const FMAIFactoryProvider *reader, void *reader_data, 
const FMAIFactoryObject *serializable, const FMADataDef *iddef, GSList **messages );
+void          fma_reader_ifactory_provider_read_done ( const FMAIFactoryProvider *reader, void *reader_data, 
const FMAIFactoryObject *serializable, GSList **messages );
 
 G_END_DECLS
 
-#endif /* __NADP_READER_H__ */
+#endif /* __IO_DESKTOP_FMA_READER_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]