[nautilus-actions] Remove 'na-' prefix from data factory objects

[Pierre Wieser <pwieser src gnome org>]

commit b60e83c9092eed5935ded7ccdfeec5e8dcacc455
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Sep 9 09:57:29 2015 +0200

    Remove 'na-' prefix from data factory objects

 src/api/fma-ifactory-object-data.h |  114 ++++++++++++++++++------------------
 src/core/fma-factory-object.c      |    2 +-
 2 files changed, 58 insertions(+), 58 deletions(-)
---
diff --git a/src/api/fma-ifactory-object-data.h b/src/api/fma-ifactory-object-data.h
index 8d187ec..268283b 100644
--- a/src/api/fma-ifactory-object-data.h
+++ b/src/api/fma-ifactory-object-data.h
@@ -52,45 +52,45 @@ G_BEGIN_DECLS
  *
  * #FMAObjectId common data.
  */
-#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"
+#define FMA_FACTORY_OBJECT_ID_GROUP          "factory-group-id"
+#define FMAFO_DATA_ID                        "factory-data-id"
+#define FMAFO_DATA_LABEL                     "factory-data-label"
+#define FMAFO_DATA_PARENT                    "factory-data-parent"
+#define FMAFO_DATA_CONDITIONS                "factory-data-conditions"
 
 /**
  * FMA_FACTORY_OBJECT_ITEM_GROUP:
  *
  * #FMAObjectItem common 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"
+#define FMA_FACTORY_OBJECT_ITEM_GROUP        "factory-group-item"
+#define FMAFO_DATA_IVERSION                  "factory-data-iversion"
+#define FMAFO_DATA_TYPE                      "factory-data-type"
+#define FMAFO_DATA_TOOLTIP                   "factory-data-tooltip"
+#define FMAFO_DATA_ICON                      "factory-data-icon"
+#define FMAFO_DATA_ICON_NOLOC                "factory-data-unlocalized-icon"
+#define FMAFO_DATA_DESCRIPTION               "factory-data-description"
+#define FMAFO_DATA_SHORTCUT                  "factory-data-shortcut"
+#define FMAFO_DATA_SUBITEMS                  "factory-data-items"
+#define FMAFO_DATA_SUBITEMS_SLIST            "factory-data-items-slist"
+#define FMAFO_DATA_ENABLED                   "factory-data-enabled"
+#define FMAFO_DATA_READONLY                  "factory-data-readonly"
+#define FMAFO_DATA_PROVIDER                  "factory-data-provider"
+#define FMAFO_DATA_PROVIDER_DATA             "factory-data-provider-data"
 
 /**
  * FMA_FACTORY_OBJECT_ACTION_GROUP:
  *
  * #FMAObjectAction specific datas.
  */
-#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"
+#define FMA_FACTORY_OBJECT_ACTION_GROUP      "factory-group-action"
+#define FMAFO_DATA_VERSION                   "factory-data-version"
+#define FMAFO_DATA_TARGET_SELECTION          "factory-data-target-selection"
+#define FMAFO_DATA_TARGET_LOCATION           "factory-data-target-location"
+#define FMAFO_DATA_TARGET_TOOLBAR            "factory-data-target-toolbar"
+#define FMAFO_DATA_TOOLBAR_LABEL             "factory-data-toolbar-label"
+#define FMAFO_DATA_TOOLBAR_SAME_LABEL        "factory-data-toolbar-same-label"
+#define FMAFO_DATA_LAST_ALLOCATED            "factory-data-last-allocated"
 
 /**
  * FMA_FACTORY_ACTION_V1_GROUP:
@@ -99,7 +99,7 @@ G_BEGIN_DECLS
  * empty as all these datas have been alter embedded in #FMAObjectItem
  * data group.
  */
-#define FMA_FACTORY_ACTION_V1_GROUP          "na-factory-group-action-v1"
+#define FMA_FACTORY_ACTION_V1_GROUP          "factory-group-action-v1"
 
 /**
  * FMA_FACTORY_OBJECT_MENU_GROUP:
@@ -107,23 +107,23 @@ G_BEGIN_DECLS
  * #FMAObjectMenu specific datas. It happens to be empty as the definition
  * of a menu is very close of those of an action.
  */
-#define FMA_FACTORY_OBJECT_MENU_GROUP        "na-factory-group-menu"
+#define FMA_FACTORY_OBJECT_MENU_GROUP        "factory-group-menu"
 
 /**
  * FMA_FACTORY_OBJECT_PROFILE_GROUP:
  *
  * #FMAObjectProfile specific datas.
  */
-#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"
+#define FMA_FACTORY_OBJECT_PROFILE_GROUP     "factory-group-profile"
+#define FMAFO_DATA_DESCNAME                  "factory-data-descname"
+#define FMAFO_DATA_DESCNAME_NOLOC            "factory-data-unlocalized-descname"
+#define FMAFO_DATA_PATH                      "factory-data-path"
+#define FMAFO_DATA_PARAMETERS                "factory-data-parameters"
+#define FMAFO_DATA_WORKING_DIR               "factory-data-working-dir"
+#define FMAFO_DATA_EXECUTION_MODE            "factory-data-execution-mode"
+#define FMAFO_DATA_STARTUP_NOTIFY            "factory-data-startup-notify"
+#define FMAFO_DATA_STARTUP_WMCLASS           "factory-data-startup-wm-class"
+#define FMAFO_DATA_EXECUTE_AS                "factory-data-execute-as"
 
 /**
  * FMA_FACTORY_OBJECT_CONDITIONS_GROUP:
@@ -132,24 +132,24 @@ G_BEGIN_DECLS
  *
  * @see_also: #FMAIContext interface.
  */
-#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"
+#define FMA_FACTORY_OBJECT_CONDITIONS_GROUP  "factory-group-conditions"
+#define FMAFO_DATA_BASENAMES                 "factory-data-basenames"
+#define FMAFO_DATA_MATCHCASE                 "factory-data-matchcase"
+#define FMAFO_DATA_MIMETYPES                 "factory-data-mimetypes"
+#define FMAFO_DATA_MIMETYPES_IS_ALL          "factory-data-all-mimetypes"
+#define FMAFO_DATA_ISFILE                    "factory-data-isfile"
+#define FMAFO_DATA_ISDIR                     "factory-data-isdir"
+#define FMAFO_DATA_MULTIPLE                  "factory-data-multiple"
+#define FMAFO_DATA_SCHEMES                   "factory-data-schemes"
+#define FMAFO_DATA_FOLDERS                   "factory-data-folders"
+#define FMAFO_DATA_SELECTION_COUNT           "factory-data-selection-count"
+#define FMAFO_DATA_ONLY_SHOW                 "factory-data-only-show-in"
+#define FMAFO_DATA_NOT_SHOW                  "factory-data-not-show-in"
+#define FMAFO_DATA_TRY_EXEC                  "factory-data-try-exec"
+#define FMAFO_DATA_SHOW_IF_REGISTERED        "factory-data-show-if-registered"
+#define FMAFO_DATA_SHOW_IF_TRUE              "factory-data-show-if-true"
+#define FMAFO_DATA_SHOW_IF_RUNNING           "factory-data-show-if-running"
+#define FMAFO_DATA_CAPABILITITES             "factory-data-capabilitites"
 
 G_END_DECLS
 
diff --git a/src/core/fma-factory-object.c b/src/core/fma-factory-object.c
index 4c39865..6d4de89 100644
--- a/src/core/fma-factory-object.c
+++ b/src/core/fma-factory-object.c
@@ -546,7 +546,7 @@ void
 fma_factory_object_dump( const FMAIFactoryObject *object )
 {
        static const gchar *thisfn = "fma_factory_object_dump";
-       static const gchar *prefix = "na-factory-data-";
+       static const gchar *prefix = "factory-data-";
        GList *list, *it;
        guint length;
        guint l_prefix;