[nautilus-actions/file-manager-actions] NA_FACTORY_xxx types are renamed to FMA_FACTORY_xxx



commit 20e8e06cb9787c513c771cbba79fcf983d8c2991
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Sep 7 22:31:30 2015 +0200

    NA_FACTORY_xxx types are renamed to FMA_FACTORY_xxx

 src/api/fma-gconf-monitor.h          |    8 +-
 src/api/fma-gconf-utils.h            |    8 +-
 src/api/fma-icontext.h               |    4 +-
 src/api/fma-iduplicable.h            |   20 ++--
 src/api/fma-iexporter.h              |   42 ++++----
 src/api/fma-ifactory-object-data.h   |  128 ++++++++++++------------
 src/api/fma-ifactory-object.h        |    8 +-
 src/api/na-object-api.h              |  182 +++++++++++++++++-----------------
 src/core/fma-icontext-factory.c      |   34 +++---
 src/core/na-factory-object.h         |    6 +-
 src/core/na-factory-provider.h       |    6 +-
 src/core/na-object-action-factory.c  |   42 ++++----
 src/core/na-object-id-factory.c      |    4 +-
 src/core/na-object-item-factory.c    |   28 +++---
 src/core/na-object-menu-factory.c    |    8 +-
 src/core/na-object-profile-factory.c |   24 +++---
 src/core/na-object-profile.c         |    8 +-
 src/core/na-tokens.h                 |    2 +-
 src/io-desktop/nadp-writer.c         |    2 +-
 src/io-xml/naxml-writer.c            |    4 +-
 src/utils/nautilus-actions-new.c     |   54 +++++-----
 21 files changed, 311 insertions(+), 311 deletions(-)
---
diff --git a/src/api/fma-gconf-monitor.h b/src/api/fma-gconf-monitor.h
index cbbc4bc..dc05adf 100644
--- a/src/api/fma-gconf-monitor.h
+++ b/src/api/fma-gconf-monitor.h
@@ -61,7 +61,7 @@ typedef struct _FMAGConfMonitorPrivate        FMAGConfMonitorPrivate;
 
 typedef struct {
        /*< private >*/
-       GObject                parent;
+       GObject                 parent;
        FMAGConfMonitorPrivate *private;
 }
        FMAGConfMonitor;
@@ -70,16 +70,16 @@ typedef struct _FMAGConfMonitorClassPrivate   FMAGConfMonitorClassPrivate;
 
 typedef struct {
        /*< private >*/
-       GObjectClass                parent;
+       GObjectClass                 parent;
        FMAGConfMonitorClassPrivate *private;
 }
        FMAGConfMonitorClass;
 
-GType           fma_gconf_monitor_get_type( void );
+GType            fma_gconf_monitor_get_type( void );
 
 FMAGConfMonitor *fma_gconf_monitor_new( const gchar *path, GConfClientNotifyFunc handler, gpointer user_data 
);
 
-void            fma_gconf_monitor_release_monitors( GList *monitors );
+void             fma_gconf_monitor_release_monitors( GList *monitors );
 
 G_END_DECLS
 
diff --git a/src/api/fma-gconf-utils.h b/src/api/fma-gconf-utils.h
index 049d960..2423e86 100644
--- a/src/api/fma-gconf-utils.h
+++ b/src/api/fma-gconf-utils.h
@@ -45,11 +45,11 @@
 
 G_BEGIN_DECLS
 
-GSList  *fma_gconf_utils_get_subdirs( GConfClient *gconf, const gchar *path );
-void     fma_gconf_utils_free_subdirs( GSList *subdirs );
+GSList  *fma_gconf_utils_get_subdirs                 ( GConfClient *gconf, const gchar *path );
+void     fma_gconf_utils_free_subdirs                ( GSList *subdirs );
 
-gboolean fma_gconf_utils_has_entry  ( GSList *entries, const gchar *entry );
-GSList  *fma_gconf_utils_get_entries( GConfClient *gconf, const gchar *path );
+gboolean fma_gconf_utils_has_entry                   ( GSList *entries, const gchar *entry );
+GSList  *fma_gconf_utils_get_entries                 ( GConfClient *gconf, const gchar *path );
 gboolean fma_gconf_utils_get_bool_from_entries       ( GSList *entries, const gchar *entry, gboolean *value 
);
 gboolean fma_gconf_utils_get_string_from_entries     ( GSList *entries, const gchar *entry, gchar **value );
 gboolean fma_gconf_utils_get_string_list_from_entries( GSList *entries, const gchar *entry, GSList **value );
diff --git a/src/api/fma-icontext.h b/src/api/fma-icontext.h
index 035cf4c..355bc03 100644
--- a/src/api/fma-icontext.h
+++ b/src/api/fma-icontext.h
@@ -42,7 +42,7 @@
  *
  * Implementors, typically #NAObjectAction, #NAObjectProfile and
  * #NAObjectMenu, host the required data as #FMADataBoxed in a dedicated
- * NA_FACTORY_CONDITIONS_GROUP data group.
+ * FMA_FACTORY_CONDITIONS_GROUP data group.
  */
 
 #include <glib-object.h>
@@ -67,7 +67,7 @@ typedef struct _FMAIContextInterfacePrivate    FMAIContextInterfacePrivate;
  */
 typedef struct {
        /*< private >*/
-       GTypeInterface              parent;
+       GTypeInterface               parent;
        FMAIContextInterfacePrivate *private;
 
        /*< public >*/
diff --git a/src/api/fma-iduplicable.h b/src/api/fma-iduplicable.h
index 3d301db..9725a41 100644
--- a/src/api/fma-iduplicable.h
+++ b/src/api/fma-iduplicable.h
@@ -124,7 +124,7 @@ typedef struct _FMAIDuplicableInterfacePrivate    FMAIDuplicableInterfacePrivate
  */
 typedef struct {
        /*< private >*/
-       GTypeInterface                 parent;
+       GTypeInterface                  parent;
        FMAIDuplicableInterfacePrivate *private;
 
        /*< public >*/
@@ -204,23 +204,23 @@ typedef enum {
 }
        DuplicableMode;
 
-GType          fma_iduplicable_get_type         ( void );
+GType           fma_iduplicable_get_type         ( void );
 
-void           fma_iduplicable_dispose          ( const FMAIDuplicable *object );
-void           fma_iduplicable_dump             ( const FMAIDuplicable *object );
+void            fma_iduplicable_dispose          ( const FMAIDuplicable *object );
+void            fma_iduplicable_dump             ( const FMAIDuplicable *object );
 FMAIDuplicable *fma_iduplicable_duplicate        ( const FMAIDuplicable *object, guint mode );
-void           fma_iduplicable_check_status     ( const FMAIDuplicable *object );
+void            fma_iduplicable_check_status     ( const FMAIDuplicable *object );
 
 FMAIDuplicable *fma_iduplicable_get_origin       ( const FMAIDuplicable *object );
-gboolean       fma_iduplicable_is_valid         ( const FMAIDuplicable *object );
-gboolean       fma_iduplicable_is_modified      ( const FMAIDuplicable *object );
+gboolean        fma_iduplicable_is_valid         ( const FMAIDuplicable *object );
+gboolean        fma_iduplicable_is_modified      ( const FMAIDuplicable *object );
 
-void           fma_iduplicable_set_origin       ( FMAIDuplicable *object, const FMAIDuplicable *origin );
+void            fma_iduplicable_set_origin       ( FMAIDuplicable *object, const FMAIDuplicable *origin );
 
-void           fma_iduplicable_register_consumer( GObject *consumer );
+void            fma_iduplicable_register_consumer( GObject *consumer );
 
 #ifdef NA_ENABLE_DEPRECATED
-void           fma_iduplicable_set_modified( FMAIDuplicable *object, gboolean modified );
+void            fma_iduplicable_set_modified( FMAIDuplicable *object, gboolean modified );
 #endif
 
 G_END_DECLS
diff --git a/src/api/fma-iexporter.h b/src/api/fma-iexporter.h
index b3826a1..e199c53 100644
--- a/src/api/fma-iexporter.h
+++ b/src/api/fma-iexporter.h
@@ -233,11 +233,11 @@ typedef struct {
  * Deprecated: 3.2
  */
 typedef struct {
-       guint         version;
+       guint          version;
        NAObjectItem *exported;
-       GQuark        format;
-       gchar        *buffer;
-       GSList       *messages;
+       GQuark         format;
+       gchar         *buffer;
+       GSList        *messages;
 }
        FMAIExporterBufferParms;
 
@@ -302,12 +302,12 @@ typedef struct {
  * Since: 3.2
  */
 typedef struct {
-       guint        version;
+       guint         version;
        FMAIExporter *provider;
-       gchar       *format;
-       gchar       *label;
-       gchar       *description;
-       GdkPixbuf   *pixbuf;
+       gchar        *format;
+       gchar        *label;
+       gchar        *description;
+       GdkPixbuf    *pixbuf;
 }
        FMAIExporterFormatv2;
 
@@ -338,13 +338,13 @@ typedef struct {
  * Since: 3.2
  */
 typedef struct {
-       guint         version;
-       guint         content;
+       guint          version;
+       guint          content;
        NAObjectItem *exported;
-       gchar        *folder;
-       gchar        *format;
-       gchar        *basename;
-       GSList       *messages;
+       gchar         *folder;
+       gchar         *format;
+       gchar         *basename;
+       GSList        *messages;
 }
        FMAIExporterFileParmsv2;
 
@@ -373,12 +373,12 @@ typedef struct {
  * Since: 3.2
  */
 typedef struct {
-       guint         version;
-       guint         content;
+       guint          version;
+       guint          content;
        NAObjectItem *exported;
-       gchar        *format;
-       gchar        *buffer;
-       GSList       *messages;
+       gchar         *format;
+       gchar         *buffer;
+       GSList        *messages;
 }
        FMAIExporterBufferParmsv2;
 
@@ -395,7 +395,7 @@ typedef struct {
  */
 typedef struct {
        /*< private >*/
-       GTypeInterface               parent;
+       GTypeInterface                parent;
        FMAIExporterInterfacePrivate *private;
 
        /*< public >*/
diff --git a/src/api/fma-ifactory-object-data.h b/src/api/fma-ifactory-object-data.h
index 6c62c5d..d0b892e 100644
--- a/src/api/fma-ifactory-object-data.h
+++ b/src/api/fma-ifactory-object-data.h
@@ -48,108 +48,108 @@
 G_BEGIN_DECLS
 
 /**
- * NA_FACTORY_OBJECT_ID_GROUP:
+ * FMA_FACTORY_OBJECT_ID_GROUP:
  *
  * #NAObjectId common data.
  */
-#define NA_FACTORY_OBJECT_ID_GROUP          "na-factory-group-id"
-#define NAFO_DATA_ID                        "na-factory-data-id"
-#define NAFO_DATA_LABEL                     "na-factory-data-label"
-#define NAFO_DATA_PARENT                    "na-factory-data-parent"
-#define NAFO_DATA_CONDITIONS                "na-factory-data-conditions"
+#define FMA_FACTORY_OBJECT_ID_GROUP          "na-factory-group-id"
+#define FMAFO_DATA_ID                        "na-factory-data-id"
+#define FMAFO_DATA_LABEL                     "na-factory-data-label"
+#define FMAFO_DATA_PARENT                    "na-factory-data-parent"
+#define FMAFO_DATA_CONDITIONS                "na-factory-data-conditions"
 
 /**
- * NA_FACTORY_OBJECT_ITEM_GROUP:
+ * FMA_FACTORY_OBJECT_ITEM_GROUP:
  *
  * #NAObjectItem common data.
  */
-#define NA_FACTORY_OBJECT_ITEM_GROUP        "na-factory-group-item"
-#define NAFO_DATA_IVERSION                  "na-factory-data-iversion"
-#define NAFO_DATA_TYPE                      "na-factory-data-type"
-#define NAFO_DATA_TOOLTIP                   "na-factory-data-tooltip"
-#define NAFO_DATA_ICON                      "na-factory-data-icon"
-#define NAFO_DATA_ICON_NOLOC                "na-factory-data-unlocalized-icon"
-#define NAFO_DATA_DESCRIPTION               "na-factory-data-description"
-#define NAFO_DATA_SHORTCUT                  "na-factory-data-shortcut"
-#define NAFO_DATA_SUBITEMS                  "na-factory-data-items"
-#define NAFO_DATA_SUBITEMS_SLIST            "na-factory-data-items-slist"
-#define NAFO_DATA_ENABLED                   "na-factory-data-enabled"
-#define NAFO_DATA_READONLY                  "na-factory-data-readonly"
-#define NAFO_DATA_PROVIDER                  "na-factory-data-provider"
-#define NAFO_DATA_PROVIDER_DATA             "na-factory-data-provider-data"
+#define FMA_FACTORY_OBJECT_ITEM_GROUP        "na-factory-group-item"
+#define FMAFO_DATA_IVERSION                  "na-factory-data-iversion"
+#define FMAFO_DATA_TYPE                      "na-factory-data-type"
+#define FMAFO_DATA_TOOLTIP                   "na-factory-data-tooltip"
+#define FMAFO_DATA_ICON                      "na-factory-data-icon"
+#define FMAFO_DATA_ICON_NOLOC                "na-factory-data-unlocalized-icon"
+#define FMAFO_DATA_DESCRIPTION               "na-factory-data-description"
+#define FMAFO_DATA_SHORTCUT                  "na-factory-data-shortcut"
+#define FMAFO_DATA_SUBITEMS                  "na-factory-data-items"
+#define FMAFO_DATA_SUBITEMS_SLIST            "na-factory-data-items-slist"
+#define FMAFO_DATA_ENABLED                   "na-factory-data-enabled"
+#define FMAFO_DATA_READONLY                  "na-factory-data-readonly"
+#define FMAFO_DATA_PROVIDER                  "na-factory-data-provider"
+#define FMAFO_DATA_PROVIDER_DATA             "na-factory-data-provider-data"
 
 /**
- * NA_FACTORY_OBJECT_ACTION_GROUP:
+ * FMA_FACTORY_OBJECT_ACTION_GROUP:
  *
  * #NAObjectAction specific datas.
  */
-#define NA_FACTORY_OBJECT_ACTION_GROUP      "na-factory-group-action"
-#define NAFO_DATA_VERSION                   "na-factory-data-version"
-#define NAFO_DATA_TARGET_SELECTION          "na-factory-data-target-selection"
-#define NAFO_DATA_TARGET_LOCATION           "na-factory-data-target-location"
-#define NAFO_DATA_TARGET_TOOLBAR            "na-factory-data-target-toolbar"
-#define NAFO_DATA_TOOLBAR_LABEL             "na-factory-data-toolbar-label"
-#define NAFO_DATA_TOOLBAR_SAME_LABEL        "na-factory-data-toolbar-same-label"
-#define NAFO_DATA_LAST_ALLOCATED            "na-factory-data-last-allocated"
+#define FMA_FACTORY_OBJECT_ACTION_GROUP      "na-factory-group-action"
+#define FMAFO_DATA_VERSION                   "na-factory-data-version"
+#define FMAFO_DATA_TARGET_SELECTION          "na-factory-data-target-selection"
+#define FMAFO_DATA_TARGET_LOCATION           "na-factory-data-target-location"
+#define FMAFO_DATA_TARGET_TOOLBAR            "na-factory-data-target-toolbar"
+#define FMAFO_DATA_TOOLBAR_LABEL             "na-factory-data-toolbar-label"
+#define FMAFO_DATA_TOOLBAR_SAME_LABEL        "na-factory-data-toolbar-same-label"
+#define FMAFO_DATA_LAST_ALLOCATED            "na-factory-data-last-allocated"
 
 /**
- * NA_FACTORY_ACTION_V1_GROUP:
+ * FMA_FACTORY_ACTION_V1_GROUP:
  *
  * A group of datas which are specific to v 1 actions. It happens to be
  * empty as all these datas have been alter embedded in #NAObjectItem
  * data group.
  */
-#define NA_FACTORY_ACTION_V1_GROUP          "na-factory-group-action-v1"
+#define FMA_FACTORY_ACTION_V1_GROUP          "na-factory-group-action-v1"
 
 /**
- * NA_FACTORY_OBJECT_MENU_GROUP:
+ * FMA_FACTORY_OBJECT_MENU_GROUP:
  *
  * #NAObjectMenu specific datas. It happens to be empty as the definition
  * of a menu is very close of those of an action.
  */
-#define NA_FACTORY_OBJECT_MENU_GROUP        "na-factory-group-menu"
+#define FMA_FACTORY_OBJECT_MENU_GROUP        "na-factory-group-menu"
 
 /**
- * NA_FACTORY_OBJECT_PROFILE_GROUP:
+ * FMA_FACTORY_OBJECT_PROFILE_GROUP:
  *
  * #NAObjectProfile specific datas.
  */
-#define NA_FACTORY_OBJECT_PROFILE_GROUP     "na-factory-group-profile"
-#define NAFO_DATA_DESCNAME                  "na-factory-data-descname"
-#define NAFO_DATA_DESCNAME_NOLOC            "na-factory-data-unlocalized-descname"
-#define NAFO_DATA_PATH                      "na-factory-data-path"
-#define NAFO_DATA_PARAMETERS                "na-factory-data-parameters"
-#define NAFO_DATA_WORKING_DIR               "na-factory-data-working-dir"
-#define NAFO_DATA_EXECUTION_MODE            "na-factory-data-execution-mode"
-#define NAFO_DATA_STARTUP_NOTIFY            "na-factory-data-startup-notify"
-#define NAFO_DATA_STARTUP_WMCLASS           "na-factory-data-startup-wm-class"
-#define NAFO_DATA_EXECUTE_AS                "na-factory-data-execute-as"
+#define FMA_FACTORY_OBJECT_PROFILE_GROUP     "na-factory-group-profile"
+#define FMAFO_DATA_DESCNAME                  "na-factory-data-descname"
+#define FMAFO_DATA_DESCNAME_NOLOC            "na-factory-data-unlocalized-descname"
+#define FMAFO_DATA_PATH                      "na-factory-data-path"
+#define FMAFO_DATA_PARAMETERS                "na-factory-data-parameters"
+#define FMAFO_DATA_WORKING_DIR               "na-factory-data-working-dir"
+#define FMAFO_DATA_EXECUTION_MODE            "na-factory-data-execution-mode"
+#define FMAFO_DATA_STARTUP_NOTIFY            "na-factory-data-startup-notify"
+#define FMAFO_DATA_STARTUP_WMCLASS           "na-factory-data-startup-wm-class"
+#define FMAFO_DATA_EXECUTE_AS                "na-factory-data-execute-as"
 
 /**
- * NA_FACTORY_OBJECT_CONDITIONS_GROUP:
+ * FMA_FACTORY_OBJECT_CONDITIONS_GROUP:
  *
  * The datas which determine the display conditions of a menu or an action.
  *
  * @see_also: #FMAIContext interface.
  */
-#define NA_FACTORY_OBJECT_CONDITIONS_GROUP  "na-factory-group-conditions"
-#define NAFO_DATA_BASENAMES                 "na-factory-data-basenames"
-#define NAFO_DATA_MATCHCASE                 "na-factory-data-matchcase"
-#define NAFO_DATA_MIMETYPES                 "na-factory-data-mimetypes"
-#define NAFO_DATA_MIMETYPES_IS_ALL             "na-factory-data-all-mimetypes"
-#define NAFO_DATA_ISFILE                    "na-factory-data-isfile"
-#define NAFO_DATA_ISDIR                     "na-factory-data-isdir"
-#define NAFO_DATA_MULTIPLE                  "na-factory-data-multiple"
-#define NAFO_DATA_SCHEMES                   "na-factory-data-schemes"
-#define NAFO_DATA_FOLDERS                   "na-factory-data-folders"
-#define NAFO_DATA_SELECTION_COUNT           "na-factory-data-selection-count"
-#define NAFO_DATA_ONLY_SHOW                 "na-factory-data-only-show-in"
-#define NAFO_DATA_NOT_SHOW                  "na-factory-data-not-show-in"
-#define NAFO_DATA_TRY_EXEC                  "na-factory-data-try-exec"
-#define NAFO_DATA_SHOW_IF_REGISTERED        "na-factory-data-show-if-registered"
-#define NAFO_DATA_SHOW_IF_TRUE              "na-factory-data-show-if-true"
-#define NAFO_DATA_SHOW_IF_RUNNING           "na-factory-data-show-if-running"
-#define NAFO_DATA_CAPABILITITES             "na-factory-data-capabilitites"
+#define FMA_FACTORY_OBJECT_CONDITIONS_GROUP  "na-factory-group-conditions"
+#define FMAFO_DATA_BASENAMES                 "na-factory-data-basenames"
+#define FMAFO_DATA_MATCHCASE                 "na-factory-data-matchcase"
+#define FMAFO_DATA_MIMETYPES                 "na-factory-data-mimetypes"
+#define FMAFO_DATA_MIMETYPES_IS_ALL          "na-factory-data-all-mimetypes"
+#define FMAFO_DATA_ISFILE                    "na-factory-data-isfile"
+#define FMAFO_DATA_ISDIR                     "na-factory-data-isdir"
+#define FMAFO_DATA_MULTIPLE                  "na-factory-data-multiple"
+#define FMAFO_DATA_SCHEMES                   "na-factory-data-schemes"
+#define FMAFO_DATA_FOLDERS                   "na-factory-data-folders"
+#define FMAFO_DATA_SELECTION_COUNT           "na-factory-data-selection-count"
+#define FMAFO_DATA_ONLY_SHOW                 "na-factory-data-only-show-in"
+#define FMAFO_DATA_NOT_SHOW                  "na-factory-data-not-show-in"
+#define FMAFO_DATA_TRY_EXEC                  "na-factory-data-try-exec"
+#define FMAFO_DATA_SHOW_IF_REGISTERED        "na-factory-data-show-if-registered"
+#define FMAFO_DATA_SHOW_IF_TRUE              "na-factory-data-show-if-true"
+#define FMAFO_DATA_SHOW_IF_RUNNING           "na-factory-data-show-if-running"
+#define FMAFO_DATA_CAPABILITITES             "na-factory-data-capabilitites"
 
 G_END_DECLS
 
diff --git a/src/api/fma-ifactory-object.h b/src/api/fma-ifactory-object.h
index cfc52b8..7751a14 100644
--- a/src/api/fma-ifactory-object.h
+++ b/src/api/fma-ifactory-object.h
@@ -108,7 +108,7 @@ typedef struct _FMAIFactoryObjectInterfacePrivate     FMAIFactoryObjectInterface
  */
 typedef struct {
        /*< private >*/
-       GTypeInterface                    parent;
+       GTypeInterface                     parent;
        FMAIFactoryObjectInterfacePrivate *private;
 
        /*< public >*/
@@ -236,12 +236,12 @@ typedef struct {
 }
        FMAIFactoryObjectInterface;
 
-GType        fma_ifactory_object_get_type( void );
+GType         fma_ifactory_object_get_type       ( void );
 
 FMADataBoxed *fma_ifactory_object_get_data_boxed ( const FMAIFactoryObject *object, const gchar *name );
 FMADataGroup *fma_ifactory_object_get_data_groups( const FMAIFactoryObject *object );
-void        *fma_ifactory_object_get_as_void    ( const FMAIFactoryObject *object, const gchar *name );
-void         fma_ifactory_object_set_from_void  ( FMAIFactoryObject *object, const gchar *name, const void 
*data );
+void         *fma_ifactory_object_get_as_void    ( const FMAIFactoryObject *object, const gchar *name );
+void          fma_ifactory_object_set_from_void  ( FMAIFactoryObject *object, const gchar *name, const void 
*data );
 
 G_END_DECLS
 
diff --git a/src/api/na-object-api.h b/src/api/na-object-api.h
index 6ada04c..0358156 100644
--- a/src/api/na-object-api.h
+++ b/src/api/na-object-api.h
@@ -75,14 +75,14 @@ G_BEGIN_DECLS
 
 /* NAObjectId
  */
-#define na_object_get_id( obj )                         (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ID ))
-#define na_object_get_label( obj )                      (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), ( NA_IS_OBJECT_PROFILE( obj ) ? NAFO_DATA_DESCNAME : NAFO_DATA_LABEL )))
-#define na_object_get_label_noloc( obj )                (( gchar * )( NA_IS_OBJECT_PROFILE( obj ) ? 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCNAME_NOLOC ) : NULL ))
-#define na_object_get_parent( obj )                     (( NAObjectItem * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARENT ))
+#define na_object_get_id( obj )                         (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ID ))
+#define na_object_get_label( obj )                      (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), ( NA_IS_OBJECT_PROFILE( obj ) ? FMAFO_DATA_DESCNAME : FMAFO_DATA_LABEL )))
+#define na_object_get_label_noloc( obj )                (( gchar * )( NA_IS_OBJECT_PROFILE( obj ) ? 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_DESCNAME_NOLOC ) : NULL ))
+#define na_object_get_parent( obj )                     (( NAObjectItem * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PARENT ))
 
-#define na_object_set_id( obj, id )                     fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ID, ( const void * )( id ))
-#define na_object_set_label( obj, label )               fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), ( NA_IS_OBJECT_PROFILE( obj ) ? NAFO_DATA_DESCNAME : NAFO_DATA_LABEL ), ( const 
void * )( label ))
-#define na_object_set_parent( obj, parent )             fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARENT, ( const void * )( parent ))
+#define na_object_set_id( obj, id )                     fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ID, ( const void * )( id ))
+#define na_object_set_label( obj, label )               fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), ( NA_IS_OBJECT_PROFILE( obj ) ? FMAFO_DATA_DESCNAME : FMAFO_DATA_LABEL ), ( const 
void * )( label ))
+#define na_object_set_parent( obj, parent )             fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PARENT, ( const void * )( parent ))
 
 #define na_object_sort_alpha_asc( a, b )                na_object_id_sort_alpha_asc( NA_OBJECT_ID( a ), 
NA_OBJECT_ID( b ))
 #define na_object_sort_alpha_desc( a, b )               na_object_id_sort_alpha_desc( NA_OBJECT_ID( a ), 
NA_OBJECT_ID( b ))
@@ -94,30 +94,30 @@ G_BEGIN_DECLS
 
 /* NAObjectItem
  */
-#define na_object_get_tooltip( obj )                    (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLTIP ))
-#define na_object_get_icon( obj )                       (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON ))
-#define na_object_get_icon_noloc( obj )                 (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON_NOLOC ))
-#define na_object_get_description( obj )                (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCRIPTION ))
-#define na_object_get_items( obj )                      (( GList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS ))
-#define na_object_get_items_slist( obj )                (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS_SLIST ))
-#define na_object_is_enabled( obj )                     (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ENABLED )))
-#define na_object_is_readonly( obj )                    (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_READONLY )))
-#define na_object_get_provider( obj )                   fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER )
-#define na_object_get_provider_data( obj )              fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER_DATA )
-#define na_object_get_iversion( obj )                   GPOINTER_TO_UINT( fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_IVERSION ))
-#define na_object_get_shortcut( obj )                   (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHORTCUT ))
-
-#define na_object_set_tooltip( obj, tooltip )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLTIP, ( const void * )( tooltip ))
-#define na_object_set_icon( obj, icon )                 fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ICON, ( const void * )( icon ))
-#define na_object_set_description( obj, desc )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_DESCRIPTION, ( const void * )( desc ))
-#define na_object_set_items( obj, list )                fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS, ( const void * )( list ))
-#define na_object_set_items_slist( obj, slist )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SUBITEMS_SLIST, ( const void * )( slist ))
-#define na_object_set_enabled( obj, enabled )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ENABLED, ( const void * ) GUINT_TO_POINTER( enabled ))
-#define na_object_set_readonly( obj, readonly )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_READONLY, ( const void * ) GUINT_TO_POINTER( readonly ))
-#define na_object_set_provider( obj, provider )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER, ( const void * )( provider ))
-#define na_object_set_provider_data( obj, data )        fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PROVIDER_DATA, ( const void * )( data ))
-#define na_object_set_iversion( obj, version )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_IVERSION, ( const void * ) GUINT_TO_POINTER( version ))
-#define na_object_set_shortcut( obj, shortcut )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHORTCUT, ( const void * )( shortcut ))
+#define na_object_get_tooltip( obj )                    (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TOOLTIP ))
+#define na_object_get_icon( obj )                       (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ICON ))
+#define na_object_get_icon_noloc( obj )                 (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ICON_NOLOC ))
+#define na_object_get_description( obj )                (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_DESCRIPTION ))
+#define na_object_get_items( obj )                      (( GList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SUBITEMS ))
+#define na_object_get_items_slist( obj )                (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SUBITEMS_SLIST ))
+#define na_object_is_enabled( obj )                     (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ENABLED )))
+#define na_object_is_readonly( obj )                    (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_READONLY )))
+#define na_object_get_provider( obj )                   fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PROVIDER )
+#define na_object_get_provider_data( obj )              fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PROVIDER_DATA )
+#define na_object_get_iversion( obj )                   GPOINTER_TO_UINT( fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_IVERSION ))
+#define na_object_get_shortcut( obj )                   (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SHORTCUT ))
+
+#define na_object_set_tooltip( obj, tooltip )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TOOLTIP, ( const void * )( tooltip ))
+#define na_object_set_icon( obj, icon )                 fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ICON, ( const void * )( icon ))
+#define na_object_set_description( obj, desc )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_DESCRIPTION, ( const void * )( desc ))
+#define na_object_set_items( obj, list )                fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SUBITEMS, ( const void * )( list ))
+#define na_object_set_items_slist( obj, slist )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SUBITEMS_SLIST, ( const void * )( slist ))
+#define na_object_set_enabled( obj, enabled )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ENABLED, ( const void * ) GUINT_TO_POINTER( enabled ))
+#define na_object_set_readonly( obj, readonly )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_READONLY, ( const void * ) GUINT_TO_POINTER( readonly ))
+#define na_object_set_provider( obj, provider )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PROVIDER, ( const void * )( provider ))
+#define na_object_set_provider_data( obj, data )        fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PROVIDER_DATA, ( const void * )( data ))
+#define na_object_set_iversion( obj, version )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_IVERSION, ( const void * ) GUINT_TO_POINTER( version ))
+#define na_object_set_shortcut( obj, shortcut )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SHORTCUT, ( const void * )( shortcut ))
 
 #define na_object_get_item( obj, id )                   na_object_item_get_item( NA_OBJECT_ITEM( obj ),( 
const gchar * )( id ))
 #define na_object_get_position( obj, child )            na_object_item_get_position( NA_OBJECT_ITEM( obj ), 
NA_OBJECT_ID( child ))
@@ -136,81 +136,81 @@ G_BEGIN_DECLS
 
 /* NAObjectAction
  */
-#define na_object_get_version( obj )                    (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_VERSION ))
-#define na_object_is_target_selection( obj )            (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_SELECTION )))
-#define na_object_is_target_location( obj )             (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_LOCATION )))
-#define na_object_is_target_toolbar( obj )              (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_TOOLBAR )))
-#define na_object_get_toolbar_label( obj )              (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_LABEL ))
-#define na_object_is_toolbar_same_label( obj )          (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_SAME_LABEL )))
-#define na_object_get_last_allocated( obj )             (( guint ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED )))
-
-#define na_object_set_version( obj, version )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_VERSION, ( const void * )( version ))
-#define na_object_set_target_selection( obj, target )   fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_SELECTION, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_target_location( obj, target )    fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_LOCATION, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_target_toolbar( obj, target )     fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TARGET_TOOLBAR, ( const void * ) GUINT_TO_POINTER( target ))
-#define na_object_set_toolbar_label( obj, label )       fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_LABEL, ( const void * )( label ))
-#define na_object_set_toolbar_same_label( obj, same )   fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TOOLBAR_SAME_LABEL, ( const void * ) GUINT_TO_POINTER( same ))
-#define na_object_set_last_allocated( obj, last )       fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( last ))
+#define na_object_get_version( obj )                    (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_VERSION ))
+#define na_object_is_target_selection( obj )            (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TARGET_SELECTION )))
+#define na_object_is_target_location( obj )             (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TARGET_LOCATION )))
+#define na_object_is_target_toolbar( obj )              (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TARGET_TOOLBAR )))
+#define na_object_get_toolbar_label( obj )              (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TOOLBAR_LABEL ))
+#define na_object_is_toolbar_same_label( obj )          (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TOOLBAR_SAME_LABEL )))
+#define na_object_get_last_allocated( obj )             (( guint ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_LAST_ALLOCATED )))
+
+#define na_object_set_version( obj, version )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_VERSION, ( const void * )( version ))
+#define na_object_set_target_selection( obj, target )   fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TARGET_SELECTION, ( const void * ) GUINT_TO_POINTER( target ))
+#define na_object_set_target_location( obj, target )    fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TARGET_LOCATION, ( const void * ) GUINT_TO_POINTER( target ))
+#define na_object_set_target_toolbar( obj, target )     fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TARGET_TOOLBAR, ( const void * ) GUINT_TO_POINTER( target ))
+#define na_object_set_toolbar_label( obj, label )       fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TOOLBAR_LABEL, ( const void * )( label ))
+#define na_object_set_toolbar_same_label( obj, same )   fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TOOLBAR_SAME_LABEL, ( const void * ) GUINT_TO_POINTER( same ))
+#define na_object_set_last_allocated( obj, last )       fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( last ))
 
 #define na_object_set_last_version( obj )               na_object_action_set_last_version( NA_OBJECT_ACTION( 
obj ))
-#define na_object_reset_last_allocated( obj )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( 0 ))
+#define na_object_reset_last_allocated( obj )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_LAST_ALLOCATED, ( const void * ) GUINT_TO_POINTER( 0 ))
 #define na_object_attach_profile( obj, profile )        na_object_action_attach_profile( NA_OBJECT_ACTION( 
obj ), NA_OBJECT_PROFILE( profile ))
 
 /* NAObjectProfile
  */
-#define na_object_get_path( obj )                       (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PATH ))
-#define na_object_get_parameters( obj )                 (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARAMETERS ))
-#define na_object_get_working_dir( obj )                (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_WORKING_DIR ))
-#define na_object_get_execution_mode( obj )             (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTION_MODE ))
-#define na_object_get_startup_notify( obj )             (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_NOTIFY )))
-#define na_object_get_startup_class( obj )              (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_WMCLASS ))
-#define na_object_get_execute_as( obj )                 (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTE_AS ))
-
-#define na_object_set_path( obj, path )                 fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PATH, ( const void * )( path ))
-#define na_object_set_parameters( obj, parms )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_PARAMETERS, ( const void * )( parms ))
-#define na_object_set_working_dir( obj, uri )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_WORKING_DIR, ( const void * )( uri ))
-#define na_object_set_execution_mode( obj, mode )       fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTION_MODE, ( const void * )( mode ))
-#define na_object_set_startup_notify( obj, notify )     fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_NOTIFY, ( const void * ) GUINT_TO_POINTER( notify ))
-#define na_object_set_startup_class( obj, class )       fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_STARTUP_WMCLASS, ( const void * )( class ))
-#define na_object_set_execute_as( obj, user )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_EXECUTE_AS, ( const void * )( user ))
+#define na_object_get_path( obj )                       (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PATH ))
+#define na_object_get_parameters( obj )                 (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PARAMETERS ))
+#define na_object_get_working_dir( obj )                (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_WORKING_DIR ))
+#define na_object_get_execution_mode( obj )             (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_EXECUTION_MODE ))
+#define na_object_get_startup_notify( obj )             (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_STARTUP_NOTIFY )))
+#define na_object_get_startup_class( obj )              (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_STARTUP_WMCLASS ))
+#define na_object_get_execute_as( obj )                 (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_EXECUTE_AS ))
+
+#define na_object_set_path( obj, path )                 fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PATH, ( const void * )( path ))
+#define na_object_set_parameters( obj, parms )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_PARAMETERS, ( const void * )( parms ))
+#define na_object_set_working_dir( obj, uri )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_WORKING_DIR, ( const void * )( uri ))
+#define na_object_set_execution_mode( obj, mode )       fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_EXECUTION_MODE, ( const void * )( mode ))
+#define na_object_set_startup_notify( obj, notify )     fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_STARTUP_NOTIFY, ( const void * ) GUINT_TO_POINTER( notify ))
+#define na_object_set_startup_class( obj, class )       fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_STARTUP_WMCLASS, ( const void * )( class ))
+#define na_object_set_execute_as( obj, user )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_EXECUTE_AS, ( const void * )( user ))
 
 /* FMAIContext
  */
 #define na_object_check_mimetypes( obj )                fma_icontext_check_mimetypes( FMA_ICONTEXT( obj ))
 
-#define na_object_get_basenames( obj )                  (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_BASENAMES ))
-#define na_object_get_matchcase( obj )                  (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MATCHCASE )))
-#define na_object_get_mimetypes( obj )                  (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES ))
-#define na_object_get_all_mimetypes( obj )              (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES_IS_ALL )))
-#define na_object_get_folders( obj )                    (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_FOLDERS ))
-#define na_object_get_schemes( obj )                    (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SCHEMES ))
-#define na_object_get_only_show_in( obj )               (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ONLY_SHOW ))
-#define na_object_get_not_show_in( obj )                (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_NOT_SHOW ))
-#define na_object_get_try_exec( obj )                   (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TRY_EXEC ))
-#define na_object_get_show_if_registered( obj )         (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_REGISTERED ))
-#define na_object_get_show_if_true( obj )               (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_TRUE ))
-#define na_object_get_show_if_running( obj )            (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_RUNNING ))
-#define na_object_get_selection_count( obj )            (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SELECTION_COUNT ))
-#define na_object_get_capabilities( obj )               (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_CAPABILITITES ))
-
-#define na_object_set_basenames( obj, bnames )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_BASENAMES, ( const void * )( bnames ))
-#define na_object_set_matchcase( obj, match )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MATCHCASE, ( const void * ) GUINT_TO_POINTER( match ))
-#define na_object_set_mimetypes( obj, types )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES, ( const void * )( types ))
-#define na_object_set_all_mimetypes( obj, all )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MIMETYPES_IS_ALL, ( const void * ) GUINT_TO_POINTER( all ))
-#define na_object_set_folders( obj, folders )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_FOLDERS, ( const void * )( folders ))
+#define na_object_get_basenames( obj )                  (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_BASENAMES ))
+#define na_object_get_matchcase( obj )                  (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_MATCHCASE )))
+#define na_object_get_mimetypes( obj )                  (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_MIMETYPES ))
+#define na_object_get_all_mimetypes( obj )              (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_MIMETYPES_IS_ALL )))
+#define na_object_get_folders( obj )                    (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_FOLDERS ))
+#define na_object_get_schemes( obj )                    (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SCHEMES ))
+#define na_object_get_only_show_in( obj )               (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ONLY_SHOW ))
+#define na_object_get_not_show_in( obj )                (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_NOT_SHOW ))
+#define na_object_get_try_exec( obj )                   (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TRY_EXEC ))
+#define na_object_get_show_if_registered( obj )         (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SHOW_IF_REGISTERED ))
+#define na_object_get_show_if_true( obj )               (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SHOW_IF_TRUE ))
+#define na_object_get_show_if_running( obj )            (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SHOW_IF_RUNNING ))
+#define na_object_get_selection_count( obj )            (( gchar * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SELECTION_COUNT ))
+#define na_object_get_capabilities( obj )               (( GSList * ) fma_ifactory_object_get_as_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_CAPABILITITES ))
+
+#define na_object_set_basenames( obj, bnames )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_BASENAMES, ( const void * )( bnames ))
+#define na_object_set_matchcase( obj, match )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_MATCHCASE, ( const void * ) GUINT_TO_POINTER( match ))
+#define na_object_set_mimetypes( obj, types )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_MIMETYPES, ( const void * )( types ))
+#define na_object_set_all_mimetypes( obj, all )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_MIMETYPES_IS_ALL, ( const void * ) GUINT_TO_POINTER( all ))
+#define na_object_set_folders( obj, folders )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_FOLDERS, ( const void * )( folders ))
 #define na_object_replace_folder( obj, old, new )       fma_icontext_replace_folder( FMA_ICONTEXT( obj ), ( 
const gchar * )( old ), ( const gchar * )( new ))
 #define na_object_set_scheme( obj, scheme, add )        fma_icontext_set_scheme( FMA_ICONTEXT( obj ), ( 
const gchar * )( scheme ), ( add ))
-#define na_object_set_schemes( obj, schemes )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SCHEMES, ( const void * )( schemes ))
-#define na_object_set_only_show_in( obj, list )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ONLY_SHOW, ( const void * )( list ))
+#define na_object_set_schemes( obj, schemes )           fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SCHEMES, ( const void * )( schemes ))
+#define na_object_set_only_show_in( obj, list )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ONLY_SHOW, ( const void * )( list ))
 #define na_object_set_only_desktop( obj, desktop, add ) fma_icontext_set_only_desktop( FMA_ICONTEXT( obj ), 
( const gchar * )( desktop ), ( add ))
-#define na_object_set_not_show_in( obj, list )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_NOT_SHOW, ( const void * )( list ))
+#define na_object_set_not_show_in( obj, list )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_NOT_SHOW, ( const void * )( list ))
 #define na_object_set_not_desktop( obj, desktop, add )  fma_icontext_set_not_desktop( FMA_ICONTEXT( obj ), ( 
const gchar * )( desktop ), ( add ))
-#define na_object_set_try_exec( obj, exec )             fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_TRY_EXEC, ( const void * )( exec ))
-#define na_object_set_show_if_registered( obj, name )   fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_REGISTERED, ( const void * )( name ))
-#define na_object_set_show_if_true( obj, exec )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_TRUE, ( const void * )( exec ))
-#define na_object_set_show_if_running( obj, name )      fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SHOW_IF_RUNNING, ( const void * )( name ))
-#define na_object_set_selection_count( obj, cond )      fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_SELECTION_COUNT, ( const void * )( cond ))
-#define na_object_set_capabilities( obj, cap )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_CAPABILITITES, ( const void * )( cap ))
+#define na_object_set_try_exec( obj, exec )             fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_TRY_EXEC, ( const void * )( exec ))
+#define na_object_set_show_if_registered( obj, name )   fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SHOW_IF_REGISTERED, ( const void * )( name ))
+#define na_object_set_show_if_true( obj, exec )         fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SHOW_IF_TRUE, ( const void * )( exec ))
+#define na_object_set_show_if_running( obj, name )      fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SHOW_IF_RUNNING, ( const void * )( name ))
+#define na_object_set_selection_count( obj, cond )      fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SELECTION_COUNT, ( const void * )( cond ))
+#define na_object_set_capabilities( obj, cap )          fma_ifactory_object_set_from_void( 
FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_CAPABILITITES, ( const void * )( cap ))
 
 #ifdef NA_ENABLE_DEPRECATED
 #define na_object_set_modified( obj, modified )         fma_iduplicable_set_modified( FMA_IDUPLICABLE( obj 
), ( modified ))
diff --git a/src/core/fma-icontext-factory.c b/src/core/fma-icontext-factory.c
index af2f35d..bd4f91d 100644
--- a/src/core/fma-icontext-factory.c
+++ b/src/core/fma-icontext-factory.c
@@ -44,7 +44,7 @@
 
 FMADataDef data_def_conditions [] = {
 
-       { NAFO_DATA_BASENAMES,
+       { FMAFO_DATA_BASENAMES,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -79,7 +79,7 @@ FMADataDef data_def_conditions [] = {
                                         *  so is tranlatable */
                                N_( "<EXPR>" ) },
 
-       { NAFO_DATA_MATCHCASE,
+       { FMAFO_DATA_MATCHCASE,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -107,7 +107,7 @@ FMADataDef data_def_conditions [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_MIMETYPES,
+       { FMAFO_DATA_MIMETYPES,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -145,7 +145,7 @@ FMADataDef data_def_conditions [] = {
         * This value is set when loading a pre-v3 profile, and then reset each time
         * we update the list of mimetypes.
         */
-       { NAFO_DATA_MIMETYPES_IS_ALL,
+       { FMAFO_DATA_MIMETYPES_IS_ALL,
                                FALSE,
                                FALSE,
                                TRUE,
@@ -172,7 +172,7 @@ FMADataDef data_def_conditions [] = {
        /* this is obsoleted starting with 2.30-newdata (released as 2.31.x serie)
         * and replaced by mimetypes
         */
-       { NAFO_DATA_ISFILE,
+       { FMAFO_DATA_ISFILE,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -203,7 +203,7 @@ FMADataDef data_def_conditions [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_ISDIR,
+       { FMAFO_DATA_ISDIR,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -237,7 +237,7 @@ FMADataDef data_def_conditions [] = {
        /* this is obsoleted starting with 2.30-newdata (released as 2.31.x serie)
         * and replaced by selection-count
         */
-       { NAFO_DATA_MULTIPLE,
+       { FMAFO_DATA_MULTIPLE,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -263,7 +263,7 @@ FMADataDef data_def_conditions [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_SCHEMES,
+       { FMAFO_DATA_SCHEMES,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -305,7 +305,7 @@ FMADataDef data_def_conditions [] = {
                                /* i18n: "<STRING>" is just an abbreviation for "a string", so is tranlatable 
*/
                                N_( "<STRING>" ) },
 
-       { NAFO_DATA_FOLDERS,
+       { FMAFO_DATA_FOLDERS,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -331,7 +331,7 @@ FMADataDef data_def_conditions [] = {
                                /* i18n: "<PATH>" is just an abbreviation for "a folder path", so is 
tranlatable */
                                N_( "<PATH>" ) },
 
-       { NAFO_DATA_SELECTION_COUNT,
+       { FMAFO_DATA_SELECTION_COUNT,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -357,7 +357,7 @@ FMADataDef data_def_conditions [] = {
                                /* i18n: "<EXPR>" is just an abbreviation for "an expression", so is 
tranlatable */
                                N_( "<EXPR>" ) },
 
-       { NAFO_DATA_ONLY_SHOW,
+       { FMAFO_DATA_ONLY_SHOW,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -381,7 +381,7 @@ FMADataDef data_def_conditions [] = {
                                /* i18n: "<DESKTOP>" is just a placeholder for "a desktop name", so is 
tranlatable */
                                N_( "<DESKTOP>" ) },
 
-       { NAFO_DATA_NOT_SHOW,
+       { FMAFO_DATA_NOT_SHOW,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -405,7 +405,7 @@ FMADataDef data_def_conditions [] = {
                                /* i18n: "<DESKTOP>" is just a placeholder for "a desktop name", so is 
tranlatable */
                                N_( "<DESKTOP>" ) },
 
-       { NAFO_DATA_TRY_EXEC,
+       { FMAFO_DATA_TRY_EXEC,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -432,7 +432,7 @@ FMADataDef data_def_conditions [] = {
                                /* i18n: "<PATH>" is the path to a binary, so may be tranlatable */
                                N_( "<PATH>" ) },
 
-       { NAFO_DATA_SHOW_IF_REGISTERED,
+       { FMAFO_DATA_SHOW_IF_REGISTERED,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -458,7 +458,7 @@ FMADataDef data_def_conditions [] = {
                                N_( "The name of a service which must be registered on session DBus" ),
                                N_( "<NAME>" ) },
 
-       { NAFO_DATA_SHOW_IF_TRUE,
+       { FMAFO_DATA_SHOW_IF_TRUE,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -485,7 +485,7 @@ FMADataDef data_def_conditions [] = {
                                N_( "The path to a command which will display the 'true' string" ),
                                N_( "<PATH>" ) },
 
-       { NAFO_DATA_SHOW_IF_RUNNING,
+       { FMAFO_DATA_SHOW_IF_RUNNING,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -511,7 +511,7 @@ FMADataDef data_def_conditions [] = {
                                N_( "The name of a binary which must be running" ),
                                N_( "<NAME>" ) },
 
-       { NAFO_DATA_CAPABILITITES,
+       { FMAFO_DATA_CAPABILITITES,
                                TRUE,
                                TRUE,
                                TRUE,
diff --git a/src/core/na-factory-object.h b/src/core/na-factory-object.h
index 8f1af74..9141922 100644
--- a/src/core/na-factory-object.h
+++ b/src/core/na-factory-object.h
@@ -27,8 +27,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __CORE_NA_FACTORY_OBJECT_H__
-#define __CORE_NA_FACTORY_OBJECT_H__
+#ifndef __CORE_FMA_FACTORY_OBJECT_H__
+#define __CORE_FMA_FACTORY_OBJECT_H__
 
 /* @title: FMAIFactoryObject
  * @short_description: The #FMAIFactoryObject Internal Functions
@@ -74,4 +74,4 @@ void         na_factory_object_set_from_void    ( FMAIFactoryObject *object, con
 
 G_END_DECLS
 
-#endif /* __CORE_NA_FACTORY_OBJECT_H__ */
+#endif /* __CORE_FMA_FACTORY_OBJECT_H__ */
diff --git a/src/core/na-factory-provider.h b/src/core/na-factory-provider.h
index 35e5af4..a025900 100644
--- a/src/core/na-factory-provider.h
+++ b/src/core/na-factory-provider.h
@@ -27,8 +27,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __CORE_NA_FACTORY_PROVIDER_H__
-#define __CORE_NA_FACTORY_PROVIDER_H__
+#ifndef __CORE_FMA_FACTORY_PROVIDER_H__
+#define __CORE_FMA_FACTORY_PROVIDER_H__
 
 /* @title: NAIFactoryProvider
  * @short_description: The #NAIFactoryProvider Internal Functions
@@ -52,4 +52,4 @@ guint        na_factory_provider_write_data( const NAIFactoryProvider *writer, v
 
 G_END_DECLS
 
-#endif /* __NAUTILUS_ACTIONS_API_NA_FACTORY_PROVIDER_H__ */
+#endif /* __NAUTILUS_ACTIONS_API_FMA_FACTORY_PROVIDER_H__ */
diff --git a/src/core/na-object-action-factory.c b/src/core/na-object-action-factory.c
index aa62746..ebf66b2 100644
--- a/src/core/na-object-action-factory.c
+++ b/src/core/na-object-action-factory.c
@@ -51,7 +51,7 @@ static FMADataDef data_def_action [] = {
        /* this version number, expressed as a string, is obsoleted starting with .desktop
         * files introduction ; it is replaced by an integer version number, at the item level
         */
-       { NAFO_DATA_VERSION,
+       { FMAFO_DATA_VERSION,
                                TRUE,
                                FALSE,
                                TRUE,
@@ -73,7 +73,7 @@ static FMADataDef data_def_action [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_TARGET_SELECTION,
+       { FMAFO_DATA_TARGET_SELECTION,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -99,7 +99,7 @@ static FMADataDef data_def_action [] = {
                                N_( "Targets the selection context menu [true]" ),
                                NULL },
 
-       { NAFO_DATA_TARGET_LOCATION,
+       { FMAFO_DATA_TARGET_LOCATION,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -125,7 +125,7 @@ static FMADataDef data_def_action [] = {
                                N_( "Targets the location context menu [false]" ),
                                NULL },
 
-       { NAFO_DATA_TARGET_TOOLBAR,
+       { FMAFO_DATA_TARGET_TOOLBAR,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -150,7 +150,7 @@ static FMADataDef data_def_action [] = {
                                N_( "Targets the toolbar [false]" ),
                                NULL },
 
-       { NAFO_DATA_TOOLBAR_LABEL,
+       { FMAFO_DATA_TOOLBAR_LABEL,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -179,7 +179,7 @@ static FMADataDef data_def_action [] = {
         * it is now only used in the NACT user interface
         * it is so left readable, but no more writable (obsolete)
         */
-       { NAFO_DATA_TOOLBAR_SAME_LABEL,
+       { FMAFO_DATA_TOOLBAR_SAME_LABEL,
                                TRUE,
                                FALSE,
                                TRUE,
@@ -203,7 +203,7 @@ static FMADataDef data_def_action [] = {
 
        /* dynamic data, so non readable / non writable
         */
-       { NAFO_DATA_LAST_ALLOCATED,
+       { FMAFO_DATA_LAST_ALLOCATED,
                                FALSE,
                                FALSE,
                                TRUE,
@@ -235,7 +235,7 @@ static FMADataDef data_def_action [] = {
  */
 FMADataDef data_def_action_v1 [] = {
 
-       { NAFO_DATA_PATH,
+       { FMAFO_DATA_PATH,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -257,7 +257,7 @@ FMADataDef data_def_action_v1 [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_PARAMETERS,
+       { FMAFO_DATA_PARAMETERS,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -279,7 +279,7 @@ FMADataDef data_def_action_v1 [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_BASENAMES,
+       { FMAFO_DATA_BASENAMES,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -301,7 +301,7 @@ FMADataDef data_def_action_v1 [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_MATCHCASE,
+       { FMAFO_DATA_MATCHCASE,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -323,7 +323,7 @@ FMADataDef data_def_action_v1 [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_MIMETYPES,
+       { FMAFO_DATA_MIMETYPES,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -345,7 +345,7 @@ FMADataDef data_def_action_v1 [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_ISFILE,
+       { FMAFO_DATA_ISFILE,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -367,7 +367,7 @@ FMADataDef data_def_action_v1 [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_ISDIR,
+       { FMAFO_DATA_ISDIR,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -389,7 +389,7 @@ FMADataDef data_def_action_v1 [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_MULTIPLE,
+       { FMAFO_DATA_MULTIPLE,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -411,7 +411,7 @@ FMADataDef data_def_action_v1 [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_SCHEMES,
+       { FMAFO_DATA_SCHEMES,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -437,10 +437,10 @@ FMADataDef data_def_action_v1 [] = {
 };
 
 FMADataGroup action_data_groups [] = {
-       { NA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
-       { NA_FACTORY_OBJECT_ITEM_GROUP,       data_def_item },
-       { NA_FACTORY_OBJECT_ACTION_GROUP,     data_def_action },
-       { NA_FACTORY_ACTION_V1_GROUP,         data_def_action_v1 },
-       { NA_FACTORY_OBJECT_CONDITIONS_GROUP, data_def_conditions },
+       { FMA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
+       { FMA_FACTORY_OBJECT_ITEM_GROUP,       data_def_item },
+       { FMA_FACTORY_OBJECT_ACTION_GROUP,     data_def_action },
+       { FMA_FACTORY_ACTION_V1_GROUP,         data_def_action_v1 },
+       { FMA_FACTORY_OBJECT_CONDITIONS_GROUP, data_def_conditions },
        { NULL }
 };
diff --git a/src/core/na-object-id-factory.c b/src/core/na-object-id-factory.c
index 798c077..705ebb3 100644
--- a/src/core/na-object-id-factory.c
+++ b/src/core/na-object-id-factory.c
@@ -45,7 +45,7 @@ FMADataDef data_def_id [] = {
        /* this data is marked non readable / non writable as it has to be read
         * written specifically when serializing / deserializing items
         */
-       { NAFO_DATA_ID,
+       { FMAFO_DATA_ID,
                                FALSE,
                                FALSE,
                                TRUE,
@@ -71,7 +71,7 @@ FMADataDef data_def_id [] = {
 
        /* dynamic data, so not readable / not writable
         */
-       { NAFO_DATA_PARENT,
+       { FMAFO_DATA_PARENT,
                                FALSE,
                                FALSE,
                                TRUE,
diff --git a/src/core/na-object-item-factory.c b/src/core/na-object-item-factory.c
index b073904..a7dfd01 100644
--- a/src/core/na-object-item-factory.c
+++ b/src/core/na-object-item-factory.c
@@ -58,7 +58,7 @@ FMADataDef data_def_item [] = {
         * it is just left here to be able to define the corresponding GConf schema
         * and to export it as XML
         */
-       { NAFO_DATA_TYPE,
+       { FMAFO_DATA_TYPE,
                                FALSE,
                                FALSE,
                                FALSE,
@@ -87,7 +87,7 @@ FMADataDef data_def_item [] = {
         * so default value is directly set in na_object_action_new_with_defaults()
         * and na_object_menu_new_with_defaults()
         */
-       { NAFO_DATA_LABEL,
+       { FMAFO_DATA_LABEL,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -111,7 +111,7 @@ FMADataDef data_def_item [] = {
                                NULL,
                                N_( "<STRING>" ) },
 
-       { NAFO_DATA_TOOLTIP,
+       { FMAFO_DATA_TOOLTIP,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -135,7 +135,7 @@ FMADataDef data_def_item [] = {
                                NULL,
                                N_( "<STRING>" ) },
 
-       { NAFO_DATA_ICON,
+       { FMAFO_DATA_ICON,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -162,7 +162,7 @@ FMADataDef data_def_item [] = {
 
        /* icon used to be not localized up to and included 2.29.4
         */
-       { NAFO_DATA_ICON_NOLOC,
+       { FMAFO_DATA_ICON_NOLOC,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -184,7 +184,7 @@ FMADataDef data_def_item [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_DESCRIPTION,
+       { FMAFO_DATA_DESCRIPTION,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -207,7 +207,7 @@ FMADataDef data_def_item [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_SHORTCUT,
+       { FMAFO_DATA_SHORTCUT,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -236,7 +236,7 @@ FMADataDef data_def_item [] = {
 
        /* dynamic data, so not readable / not writable
         */
-       { NAFO_DATA_SUBITEMS,
+       { FMAFO_DATA_SUBITEMS,
                                FALSE,                  /* not serializable */
                                FALSE,
                                TRUE,
@@ -261,7 +261,7 @@ FMADataDef data_def_item [] = {
        /* list of subitems as a string list
         * dynamically rebuilt on write_start()
         */
-       { NAFO_DATA_SUBITEMS_SLIST,
+       { FMAFO_DATA_SUBITEMS_SLIST,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -286,7 +286,7 @@ FMADataDef data_def_item [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_ENABLED,
+       { FMAFO_DATA_ENABLED,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -313,7 +313,7 @@ FMADataDef data_def_item [] = {
        /* dynamic data, so non readable / non writable
         * must be set by the NAIIOProvider when reading the item
         */
-       { NAFO_DATA_READONLY,
+       { FMAFO_DATA_READONLY,
                                FALSE,
                                FALSE,
                                TRUE,
@@ -342,7 +342,7 @@ FMADataDef data_def_item [] = {
 
        /* dynamic data, so non readable / non writable
         */
-       { NAFO_DATA_PROVIDER,
+       { FMAFO_DATA_PROVIDER,
                                FALSE,
                                FALSE,
                                TRUE,
@@ -369,7 +369,7 @@ FMADataDef data_def_item [] = {
         * not copyable as directly duplicated by NAIIOProvider interface
         * (see NAObjectItem::object_copy)
         */
-       { NAFO_DATA_PROVIDER_DATA,
+       { FMAFO_DATA_PROVIDER_DATA,
                                FALSE,
                                FALSE,
                                TRUE,
@@ -402,7 +402,7 @@ FMADataDef data_def_item [] = {
         * is marked as not automatically writable: it has to be written specifically
         * by each i/o provider.
         */
-       { NAFO_DATA_IVERSION,
+       { FMAFO_DATA_IVERSION,
                                TRUE,
                                FALSE,
                                TRUE,
diff --git a/src/core/na-object-menu-factory.c b/src/core/na-object-menu-factory.c
index ea9fe6f..fac3bb7 100644
--- a/src/core/na-object-menu-factory.c
+++ b/src/core/na-object-menu-factory.c
@@ -49,9 +49,9 @@ static FMADataDef data_def_menu [] = {
 };
 
 FMADataGroup menu_data_groups [] = {
-       { NA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
-       { NA_FACTORY_OBJECT_ITEM_GROUP,       data_def_item },
-       { NA_FACTORY_OBJECT_MENU_GROUP,       data_def_menu },
-       { NA_FACTORY_OBJECT_CONDITIONS_GROUP, data_def_conditions },
+       { FMA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
+       { FMA_FACTORY_OBJECT_ITEM_GROUP,       data_def_item },
+       { FMA_FACTORY_OBJECT_MENU_GROUP,       data_def_menu },
+       { FMA_FACTORY_OBJECT_CONDITIONS_GROUP, data_def_conditions },
        { NULL }
 };
diff --git a/src/core/na-object-profile-factory.c b/src/core/na-object-profile-factory.c
index 7f362f7..a108108 100644
--- a/src/core/na-object-profile-factory.c
+++ b/src/core/na-object-profile-factory.c
@@ -42,7 +42,7 @@ extern FMADataDef data_def_conditions [];     /* defined in fma-icontext-factory.c *
 
 static FMADataDef data_def_profile [] = {
 
-       { NAFO_DATA_DESCNAME,
+       { FMAFO_DATA_DESCNAME,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -67,7 +67,7 @@ static FMADataDef data_def_profile [] = {
 
        /* label of the profile was unlocalized up to and included 1.11.0
         */
-       { NAFO_DATA_DESCNAME_NOLOC,
+       { FMAFO_DATA_DESCNAME_NOLOC,
                                TRUE,
                                FALSE,
                                FALSE,
@@ -93,7 +93,7 @@ static FMADataDef data_def_profile [] = {
         * export files and in NACT. Only in desktop files, they are merged as only
         * one 'Exec' data which is splitted at read time.
         */
-       { NAFO_DATA_PATH,
+       { FMAFO_DATA_PATH,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -120,7 +120,7 @@ static FMADataDef data_def_profile [] = {
         * but also slightly changed the meaning of some parameters. This is synchronized
         * with the change of version data (from "2.0" string to '1' integer)
         */
-       { NAFO_DATA_PARAMETERS,
+       { FMAFO_DATA_PARAMETERS,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -181,7 +181,7 @@ static FMADataDef data_def_profile [] = {
                                NULL,
                                N_( "<STRING>" ) },
 
-       { NAFO_DATA_WORKING_DIR,
+       { FMAFO_DATA_WORKING_DIR,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -204,7 +204,7 @@ static FMADataDef data_def_profile [] = {
                                NULL,
                                N_( "<PATH>" ) },
 
-       { NAFO_DATA_EXECUTION_MODE,
+       { FMAFO_DATA_EXECUTION_MODE,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -237,7 +237,7 @@ static FMADataDef data_def_profile [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_STARTUP_NOTIFY,
+       { FMAFO_DATA_STARTUP_NOTIFY,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -260,7 +260,7 @@ static FMADataDef data_def_profile [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_STARTUP_WMCLASS,
+       { FMAFO_DATA_STARTUP_WMCLASS,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -283,7 +283,7 @@ static FMADataDef data_def_profile [] = {
                                NULL,
                                NULL },
 
-       { NAFO_DATA_EXECUTE_AS,
+       { FMAFO_DATA_EXECUTE_AS,
                                TRUE,
                                TRUE,
                                TRUE,
@@ -312,8 +312,8 @@ static FMADataDef data_def_profile [] = {
 };
 
 FMADataGroup profile_data_groups [] = {
-       { NA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
-       { NA_FACTORY_OBJECT_PROFILE_GROUP,    data_def_profile },
-       { NA_FACTORY_OBJECT_CONDITIONS_GROUP, data_def_conditions },
+       { FMA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
+       { FMA_FACTORY_OBJECT_PROFILE_GROUP,    data_def_profile },
+       { FMA_FACTORY_OBJECT_CONDITIONS_GROUP, data_def_conditions },
        { NULL }
 };
diff --git a/src/core/na-object-profile.c b/src/core/na-object-profile.c
index 4fe95da..67f3a99 100644
--- a/src/core/na-object-profile.c
+++ b/src/core/na-object-profile.c
@@ -60,9 +60,9 @@ struct _NAObjectProfilePrivate {
 
 #define PROFILE_NAME_PREFIX                                    "profile-"
 
-#define na_object_is_file( obj )                       (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ISFILE )))
-#define na_object_is_dir( obj )                                (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_ISDIR )))
-#define na_object_is_multiple( obj )           (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), NAFO_DATA_MULTIPLE )))
+#define na_object_is_file( obj )                       (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ISFILE )))
+#define na_object_is_dir( obj )                                (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_ISDIR )))
+#define na_object_is_multiple( obj )           (( gboolean ) GPOINTER_TO_UINT( 
fma_ifactory_object_get_as_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_MULTIPLE )))
 
 extern FMADataGroup profile_data_groups [];    /* defined in na-item-profile-factory.c */
 
@@ -587,7 +587,7 @@ convert_pre_v3_isfiledir( NAObjectProfile *profile )
                 * value when the data is not set (see #651911)
                 */
                isfile = TRUE;
-               if( na_factory_object_is_set( FMA_IFACTORY_OBJECT( profile ), NAFO_DATA_ISFILE )){
+               if( na_factory_object_is_set( FMA_IFACTORY_OBJECT( profile ), FMAFO_DATA_ISFILE )){
                        isfile = na_object_is_file( profile );
                }
                isdir = na_object_is_dir( profile );
diff --git a/src/core/na-tokens.h b/src/core/na-tokens.h
index 3a40932..6b36b9c 100644
--- a/src/core/na-tokens.h
+++ b/src/core/na-tokens.h
@@ -51,7 +51,7 @@
  * - src/core/na-tokens.c::is_singular_exec() function
  * - src/core/na-tokens.c::parse_singular() function
  * - src/nact/file-manager-actions-config-tool.ui:LegendDialog labels
- * - src/core/na-object-profile-factory.c:NAFO_DATA_PARAMETERS comment
+ * - src/core/na-object-profile-factory.c:FMAFO_DATA_PARAMETERS comment
  *
  * Valid parameters are :
  *
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 405df76..c84b4f9 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -539,7 +539,7 @@ nadp_writer_ifactory_provider_write_data(
                                case FMA_DATA_TYPE_STRING:
                                        str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
 
-                                       if( !strcmp( def->name, NAFO_DATA_PATH )){
+                                       if( !strcmp( def->name, FMAFO_DATA_PATH )){
                                                parms = na_object_get_parameters( object );
                                                tmp = g_strdup_printf( "%s %s", str_value, parms );
                                                g_free( str_value );
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index ea425d7..9744ad8 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -446,7 +446,7 @@ write_start_write_type( NAXMLWriter *writer, NAObjectItem *object, const FMAData
 
        writer->private->schema_node = NULL;
        writer->private->locale_node = NULL;
-       def = fma_data_def_get_data_def( groups, NA_FACTORY_OBJECT_ITEM_GROUP, NAFO_DATA_TYPE );
+       def = fma_data_def_get_data_def( groups, FMA_FACTORY_OBJECT_ITEM_GROUP, FMAFO_DATA_TYPE );
        svalue = NA_IS_OBJECT_ACTION( object ) ? NAGP_VALUE_TYPE_ACTION : NAGP_VALUE_TYPE_MENU;
 
        ( *writer->private->fn_str->write_type_fn )( writer, object, def, svalue );
@@ -461,7 +461,7 @@ write_start_write_version( NAXMLWriter *writer, NAObjectItem *object, const FMAD
 
        writer->private->schema_node = NULL;
        writer->private->locale_node = NULL;
-       def = fma_data_def_get_data_def( groups, NA_FACTORY_OBJECT_ITEM_GROUP, NAFO_DATA_IVERSION );
+       def = fma_data_def_get_data_def( groups, FMA_FACTORY_OBJECT_ITEM_GROUP, FMAFO_DATA_IVERSION );
        iversion = na_object_get_iversion( object );
        svalue = g_strdup_printf( "%d", iversion );
 
diff --git a/src/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
index 12cb7e3..19d4028 100644
--- a/src/utils/nautilus-actions-new.c
+++ b/src/utils/nautilus-actions-new.c
@@ -99,33 +99,33 @@ extern FMADataGroup action_data_groups[];                   /* defined in 
na-object-action-facto
 extern FMADataGroup profile_data_groups[];                     /* defined in na-object-profile-factory.c */
 
 static const ArgFromDataDef st_arg_from_data_def[] = {
-               { action_data_groups,  NA_FACTORY_OBJECT_ITEM_GROUP,       NAFO_DATA_LABEL,              
&label },
-               { action_data_groups,  NA_FACTORY_OBJECT_ITEM_GROUP,       NAFO_DATA_TOOLTIP,            
&tooltip },
-               { action_data_groups,  NA_FACTORY_OBJECT_ITEM_GROUP,       NAFO_DATA_ICON,               
&icon },
-               { action_data_groups,  NA_FACTORY_OBJECT_ITEM_GROUP,       NAFO_DATA_ENABLED,            
&enabled },
-               { action_data_groups,  NA_FACTORY_OBJECT_ACTION_GROUP,     NAFO_DATA_TARGET_SELECTION,   
&target_selection },
-               { action_data_groups,  NA_FACTORY_OBJECT_ACTION_GROUP,     NAFO_DATA_TARGET_LOCATION,    
&target_location },
-               { action_data_groups,  NA_FACTORY_OBJECT_ACTION_GROUP,     NAFO_DATA_TARGET_TOOLBAR,     
&target_toolbar },
-               { action_data_groups,  NA_FACTORY_OBJECT_ACTION_GROUP,     NAFO_DATA_TOOLBAR_LABEL,      
&label_toolbar },
-               { profile_data_groups, NA_FACTORY_OBJECT_PROFILE_GROUP,    NAFO_DATA_PATH,               
&command },
-               { profile_data_groups, NA_FACTORY_OBJECT_PROFILE_GROUP,    NAFO_DATA_PARAMETERS,         
&parameters },
-               { profile_data_groups, NA_FACTORY_OBJECT_PROFILE_GROUP,    NAFO_DATA_WORKING_DIR,        
&workingdir },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_BASENAMES,          
&basenames_array },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_MATCHCASE,          
&matchcase },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_MIMETYPES,          
&mimetypes_array },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_ISFILE,             
&isfile },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_ISDIR,              
&isdir },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_MULTIPLE,           
&accept_multiple },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_SCHEMES,            
&schemes_array },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_FOLDERS,            
&folders_array },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_SELECTION_COUNT,    
&selection_count },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_ONLY_SHOW,          
&onlyshow_array },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_NOT_SHOW,           
&notshow_array },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_TRY_EXEC,           
&try_exec },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_SHOW_IF_REGISTERED, 
&show_registered },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_SHOW_IF_TRUE,       
&show_true },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_SHOW_IF_RUNNING,    
&show_running },
-               { profile_data_groups, NA_FACTORY_OBJECT_CONDITIONS_GROUP, NAFO_DATA_CAPABILITITES,      
&capability_array },
+               { action_data_groups,  FMA_FACTORY_OBJECT_ITEM_GROUP,       FMAFO_DATA_LABEL,              
&label },
+               { action_data_groups,  FMA_FACTORY_OBJECT_ITEM_GROUP,       FMAFO_DATA_TOOLTIP,            
&tooltip },
+               { action_data_groups,  FMA_FACTORY_OBJECT_ITEM_GROUP,       FMAFO_DATA_ICON,               
&icon },
+               { action_data_groups,  FMA_FACTORY_OBJECT_ITEM_GROUP,       FMAFO_DATA_ENABLED,            
&enabled },
+               { action_data_groups,  FMA_FACTORY_OBJECT_ACTION_GROUP,     FMAFO_DATA_TARGET_SELECTION,   
&target_selection },
+               { action_data_groups,  FMA_FACTORY_OBJECT_ACTION_GROUP,     FMAFO_DATA_TARGET_LOCATION,    
&target_location },
+               { action_data_groups,  FMA_FACTORY_OBJECT_ACTION_GROUP,     FMAFO_DATA_TARGET_TOOLBAR,     
&target_toolbar },
+               { action_data_groups,  FMA_FACTORY_OBJECT_ACTION_GROUP,     FMAFO_DATA_TOOLBAR_LABEL,      
&label_toolbar },
+               { profile_data_groups, FMA_FACTORY_OBJECT_PROFILE_GROUP,    FMAFO_DATA_PATH,               
&command },
+               { profile_data_groups, FMA_FACTORY_OBJECT_PROFILE_GROUP,    FMAFO_DATA_PARAMETERS,         
&parameters },
+               { profile_data_groups, FMA_FACTORY_OBJECT_PROFILE_GROUP,    FMAFO_DATA_WORKING_DIR,        
&workingdir },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_BASENAMES,          
&basenames_array },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_MATCHCASE,          
&matchcase },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_MIMETYPES,          
&mimetypes_array },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_ISFILE,             
&isfile },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_ISDIR,              
&isdir },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_MULTIPLE,           
&accept_multiple },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_SCHEMES,            
&schemes_array },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_FOLDERS,            
&folders_array },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_SELECTION_COUNT,    
&selection_count },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_ONLY_SHOW,          
&onlyshow_array },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_NOT_SHOW,           
&notshow_array },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_TRY_EXEC,           
&try_exec },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_SHOW_IF_REGISTERED, 
&show_registered },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_SHOW_IF_TRUE,       
&show_true },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_SHOW_IF_RUNNING,    
&show_running },
+               { profile_data_groups, FMA_FACTORY_OBJECT_CONDITIONS_GROUP, FMAFO_DATA_CAPABILITITES,      
&capability_array },
                { NULL }
 };
 


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