[nautilus-actions] NA_DATA_TYPES are renamed to FMA_DATA_TYPES



commit 1a184e9677b46f7e63ce8a414d1ca7d418a0e22c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Sep 7 22:22:41 2015 +0200

    NA_DATA_TYPES are renamed to FMA_DATA_TYPES

 src/api/fma-data-def.h               |    2 +-
 src/api/fma-data-types.h             |   55 +++++++-------
 src/core/fma-boxed.c                 |   38 +++++-----
 src/core/fma-data-boxed.c            |   14 ++--
 src/core/fma-data-types.c            |   14 ++--
 src/core/fma-icontext-factory.c      |   34 ++++----
 src/core/fma-ifactory-object.c       |    4 +-
 src/core/na-factory-object.c         |    4 +-
 src/core/na-object-action-factory.c  |   32 ++++----
 src/core/na-object-id-factory.c      |    4 +-
 src/core/na-object-item-factory.c    |   28 ++++----
 src/core/na-object-profile-factory.c |   18 ++--
 src/core/na-settings.c               |  136 +++++++++++++++++-----------------
 src/io-desktop/nadp-reader.c         |   10 +-
 src/io-desktop/nadp-writer.c         |   10 +-
 src/io-gconf/nagp-reader.c           |   10 +-
 src/io-gconf/nagp-writer.c           |   10 +-
 src/io-xml/naxml-reader.c            |   12 ++--
 src/io-xml/naxml-writer.c            |   12 ++--
 src/utils/na-print-schemas.c         |    2 +-
 20 files changed, 226 insertions(+), 223 deletions(-)
---
diff --git a/src/api/fma-data-def.h b/src/api/fma-data-def.h
index c158051..d1dcbbd 100644
--- a/src/api/fma-data-def.h
+++ b/src/api/fma-data-def.h
@@ -67,7 +67,7 @@ G_BEGIN_DECLS
  *                    Used in GParamSpec and in schemas.
  * @long_label:       long, if not complete, localizable description.
  *                    Used in GParamSpec and in schemas?
- * @type:             the elementary NA_DATA_TYPE_xxx data type.
+ * @type:             the elementary FMA_DATA_TYPE_xxx data type.
  * @default_value:    the default to assign when creating a new object.
  *                    This default is also displayed in command-line help
  *                    of file-manager-actions-new utility.
diff --git a/src/api/fma-data-types.h b/src/api/fma-data-types.h
index 47a8465..c9b654e 100644
--- a/src/api/fma-data-types.h
+++ b/src/api/fma-data-types.h
@@ -43,47 +43,50 @@ G_BEGIN_DECLS
 
 /**
  * FMADataType:
- * @NA_DATA_TYPE_BOOLEAN:       a boolean
- *                              can be initialized with "true" or "false" (case insensitive)
- * @NA_DATA_TYPE_POINTER:       a ( void * ) pointer
- * @NA_DATA_TYPE_STRING:        an ASCII string
- * @NA_DATA_TYPE_STRING_LIST:   a list of ASCII strings
- * @NA_DATA_TYPE_LOCALE_STRING: a localized UTF-8 string
- * @NA_DATA_TYPE_UINT:          an unsigned integer
- * @NA_DATA_TYPE_UINT_LIST:     a list of unsigned integers
+ * @FMA_DATA_TYPE_BOOLEAN:       a boolean
+ *                               can be initialized with "true" or "false"
+ *                               (case insensitive)
+ * @FMA_DATA_TYPE_POINTER:       a ( void * ) pointer
+ * @FMA_DATA_TYPE_STRING:        an ASCII string
+ * @FMA_DATA_TYPE_STRING_LIST:   a list of ASCII strings
+ * @FMA_DATA_TYPE_LOCALE_STRING: a localized UTF-8 string
+ * @FMA_DATA_TYPE_UINT:          an unsigned integer
+ * @FMA_DATA_TYPE_UINT_LIST:     a list of unsigned integers
  *
- * Each elementary data which would take advantage of #FMABoxed facilities
- * should be typed at instanciation time.
+ * Each elementary data which would take advantage of #FMABoxed
+ * facilities should be typed at instanciation time.
  *
- * #NAIFactoryProvider implementations should provide a primitive for reading
- * (resp. writing) a value for each of these elementary data types.
+ * #NAIFactoryProvider implementations should provide a primitive for
+ * reading (resp. writing) a value for each of these elementary data
+ * types.
  *
  * <note>
  *   <para>
- * Please note that this enumeration may be compiled in by the extensions.
- * They must so remain fixed, unless you are prepared to see strange effects
- * (e.g. an extension has been compiled with %NA_DATA_TYPE_STRING = 2, while you
- * have inserted another element, making it to 3 !) - or you know what
- * you are doing...
+ * Please note that this enumeration may be compiled in by the
+ * extensions. They must so remain fixed, unless you are prepared to
+ * see strange effects (e.g. an extension may have been compiled with
+ * %FMA_DATA_TYPE_STRING = 2, while you have inserted another element,
+ * making it to 3 !) - or you know what you are doing...
  *   </para>
  *   <para>
- *     So, only add new items at the end of the enum. You have been warned!
+ *     So, only add new items at the end of the enum. You have been
+ *     warned!
  *   </para>
  * </note>
  *
  * Since: 2.30
  */
 typedef enum {
-       NA_DATA_TYPE_BOOLEAN = 1,
-       NA_DATA_TYPE_POINTER,
-       NA_DATA_TYPE_STRING,
-       NA_DATA_TYPE_STRING_LIST,
-       NA_DATA_TYPE_LOCALE_STRING,
-       NA_DATA_TYPE_UINT,
-       NA_DATA_TYPE_UINT_LIST,
+       FMA_DATA_TYPE_BOOLEAN = 1,
+       FMA_DATA_TYPE_POINTER,
+       FMA_DATA_TYPE_STRING,
+       FMA_DATA_TYPE_STRING_LIST,
+       FMA_DATA_TYPE_LOCALE_STRING,
+       FMA_DATA_TYPE_UINT,
+       FMA_DATA_TYPE_UINT_LIST,
        /*< private >*/
        /* count of defined types */
-       NA_DATA_TYPE_N
+       FMA_DATA_TYPE_N
 }
        FMADataType;
 
diff --git a/src/core/fma-boxed.c b/src/core/fma-boxed.c
index cef2710..21e5b02 100644
--- a/src/core/fma-boxed.c
+++ b/src/core/fma-boxed.c
@@ -172,7 +172,7 @@ static void             uint_list_to_value( const FMABoxed *boxed, GValue *value
 static void            *uint_list_to_void( const FMABoxed *boxed );
 
 static sBoxedDef st_boxed_def[] = {
-               { NA_DATA_TYPE_BOOLEAN,
+               { FMA_DATA_TYPE_BOOLEAN,
                                "boolean",
                                bool_are_equal,
                                bool_copy,
@@ -189,7 +189,7 @@ static sBoxedDef st_boxed_def[] = {
                                bool_to_value,
                                bool_to_void
                                },
-               { NA_DATA_TYPE_POINTER,
+               { FMA_DATA_TYPE_POINTER,
                                "pointer",
                                pointer_are_equal,
                                pointer_copy,
@@ -206,7 +206,7 @@ static sBoxedDef st_boxed_def[] = {
                                pointer_to_value,
                                pointer_to_void
                                },
-               { NA_DATA_TYPE_STRING,
+               { FMA_DATA_TYPE_STRING,
                                "string",
                                string_are_equal,
                                string_copy,
@@ -223,7 +223,7 @@ static sBoxedDef st_boxed_def[] = {
                                string_to_value,
                                string_to_void
                                },
-               { NA_DATA_TYPE_STRING_LIST,
+               { FMA_DATA_TYPE_STRING_LIST,
                                "string_list",
                                string_list_are_equal,
                                string_list_copy,
@@ -240,7 +240,7 @@ static sBoxedDef st_boxed_def[] = {
                                string_list_to_value,
                                string_list_to_void
                                },
-               { NA_DATA_TYPE_LOCALE_STRING,
+               { FMA_DATA_TYPE_LOCALE_STRING,
                                "locale_string",
                                locale_are_equal,
                                string_copy,
@@ -257,7 +257,7 @@ static sBoxedDef st_boxed_def[] = {
                                string_to_value,
                                string_to_void
                                },
-               { NA_DATA_TYPE_UINT,
+               { FMA_DATA_TYPE_UINT,
                                "uint",
                                uint_are_equal,
                                uint_copy,
@@ -274,7 +274,7 @@ static sBoxedDef st_boxed_def[] = {
                                uint_to_value,
                                uint_to_void
                                },
-               { NA_DATA_TYPE_UINT_LIST,
+               { FMA_DATA_TYPE_UINT_LIST,
                                "uint_list",
                                uint_list_are_equal,
                                uint_list_copy,
@@ -627,7 +627,7 @@ fma_boxed_new_from_string( guint type, const gchar *string )
  * fma_boxed_get_boolean:
  * @boxed: the #FMABoxed structure.
  *
- * Returns: the boolean value if @boxed is of %NA_DATA_TYPE_BOOLEAN type,
+ * Returns: the boolean value if @boxed is of %FMA_DATA_TYPE_BOOLEAN type,
  * %FALSE else.
  *
  * Since: 3.1
@@ -640,7 +640,7 @@ fma_boxed_get_boolean( const FMABoxed *boxed )
        g_return_val_if_fail( FMA_IS_BOXED( boxed ), FALSE );
        g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, FALSE );
        g_return_val_if_fail( boxed->private->def, FALSE );
-       g_return_val_if_fail( boxed->private->def->type == NA_DATA_TYPE_BOOLEAN, FALSE );
+       g_return_val_if_fail( boxed->private->def->type == FMA_DATA_TYPE_BOOLEAN, FALSE );
        g_return_val_if_fail( boxed->private->def->to_bool, FALSE );
 
        value = ( *boxed->private->def->to_bool )( boxed );
@@ -652,7 +652,7 @@ fma_boxed_get_boolean( const FMABoxed *boxed )
  * fma_boxed_get_pointer:
  * @boxed: the #FMABoxed structure.
  *
- * Returns: a const pointer to the data if @boxed is of %NA_DATA_TYPE_POINTER
+ * Returns: a const pointer to the data if @boxed is of %FMA_DATA_TYPE_POINTER
  * type, %NULL else.
  *
  * Since: 3.1
@@ -676,7 +676,7 @@ fma_boxed_get_pointer( const FMABoxed *boxed )
  * fma_boxed_get_string:
  * @boxed: the #FMABoxed structure.
  *
- * Returns: a newly allocated string if @boxed is of %NA_DATA_TYPE_STRING
+ * Returns: a newly allocated string if @boxed is of %FMA_DATA_TYPE_STRING
  * type, which should be g_free() by the caller, %NULL else.
  *
  * Since: 3.1
@@ -700,7 +700,7 @@ fma_boxed_get_string( const FMABoxed *boxed )
  * fma_boxed_get_string_list:
  * @boxed: the #FMABoxed structure.
  *
- * Returns: a newly allocated string list if @boxed is of %NA_DATA_TYPE_STRING_LIST
+ * Returns: a newly allocated string list if @boxed is of %FMA_DATA_TYPE_STRING_LIST
  * type, which should be fma_core_utils_slist_free() by the caller, %NULL else.
  *
  * Since: 3.1
@@ -713,7 +713,7 @@ fma_boxed_get_string_list( const FMABoxed *boxed )
        g_return_val_if_fail( FMA_IS_BOXED( boxed ), NULL );
        g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, NULL );
        g_return_val_if_fail( boxed->private->def, NULL );
-       g_return_val_if_fail( boxed->private->def->type == NA_DATA_TYPE_STRING_LIST, NULL );
+       g_return_val_if_fail( boxed->private->def->type == FMA_DATA_TYPE_STRING_LIST, NULL );
        g_return_val_if_fail( boxed->private->def->to_string_list, NULL );
 
        value = ( *boxed->private->def->to_string_list )( boxed );
@@ -725,7 +725,7 @@ fma_boxed_get_string_list( const FMABoxed *boxed )
  * fma_boxed_get_uint:
  * @boxed: the #FMABoxed structure.
  *
- * Returns: an unsigned integer if @boxed is of %NA_DATA_TYPE_UINT type,
+ * Returns: an unsigned integer if @boxed is of %FMA_DATA_TYPE_UINT type,
  * zero else.
  *
  * Since: 3.1
@@ -738,7 +738,7 @@ fma_boxed_get_uint( const FMABoxed *boxed )
        g_return_val_if_fail( FMA_IS_BOXED( boxed ), 0 );
        g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, 0 );
        g_return_val_if_fail( boxed->private->def, 0 );
-       g_return_val_if_fail( boxed->private->def->type == NA_DATA_TYPE_UINT, 0 );
+       g_return_val_if_fail( boxed->private->def->type == FMA_DATA_TYPE_UINT, 0 );
        g_return_val_if_fail( boxed->private->def->to_uint, 0 );
 
        value = ( *boxed->private->def->to_uint )( boxed );
@@ -750,7 +750,7 @@ fma_boxed_get_uint( const FMABoxed *boxed )
  * fma_boxed_get_uint_list:
  * @boxed: the #FMABoxed structure.
  *
- * Returns: a newly allocated list if @boxed is of %NA_DATA_TYPE_UINT_LIST
+ * Returns: a newly allocated list if @boxed is of %FMA_DATA_TYPE_UINT_LIST
  * type, which should be g_list_free() by the caller, %FALSE else.
  *
  * Since: 3.1
@@ -763,7 +763,7 @@ fma_boxed_get_uint_list( const FMABoxed *boxed )
        g_return_val_if_fail( FMA_IS_BOXED( boxed ), NULL );
        g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, NULL );
        g_return_val_if_fail( boxed->private->def, NULL );
-       g_return_val_if_fail( boxed->private->def->type == NA_DATA_TYPE_UINT_LIST, NULL );
+       g_return_val_if_fail( boxed->private->def->type == FMA_DATA_TYPE_UINT_LIST, NULL );
        g_return_val_if_fail( boxed->private->def->to_uint_list, NULL );
 
        value = ( *boxed->private->def->to_uint_list )( boxed );
@@ -797,8 +797,8 @@ fma_boxed_get_as_value( const FMABoxed *boxed, GValue *value )
  *
  * Returns: the content of the @boxed.
  *
- * If of type NA_DATA_TYPE_STRING (resp. NA_DATA_TYPE_LOCALE_STRING,
- * NA_DATA_TYPE_STRING_LIST or NA_DATA_TYPE_UINT_LIST), then the content
+ * If of type FMA_DATA_TYPE_STRING (resp. FMA_DATA_TYPE_LOCALE_STRING,
+ * FMA_DATA_TYPE_STRING_LIST or FMA_DATA_TYPE_UINT_LIST), then the content
  * is returned in a newly allocated value, which should be g_free() (resp.
  * g_free(), fma_core_utils_slist_free(), g_list_free()) by the caller.
  *
diff --git a/src/core/fma-data-boxed.c b/src/core/fma-data-boxed.c
index 338076d..cf61960 100644
--- a/src/core/fma-data-boxed.c
+++ b/src/core/fma-data-boxed.c
@@ -104,37 +104,37 @@ static gboolean            uint_list_is_default( const FMADataBoxed *boxed );
 static gboolean            uint_list_is_valid( const FMADataBoxed *boxed );
 
 static DataBoxedDef st_data_boxed_def[] = {
-               { NA_DATA_TYPE_BOOLEAN,
+               { FMA_DATA_TYPE_BOOLEAN,
                                bool_spec,
                                bool_is_default,
                                bool_is_valid
                                },
-               { NA_DATA_TYPE_POINTER,
+               { FMA_DATA_TYPE_POINTER,
                                pointer_spec,
                                pointer_is_default,
                                pointer_is_valid
                                },
-               { NA_DATA_TYPE_STRING,
+               { FMA_DATA_TYPE_STRING,
                                string_spec,
                                string_is_default,
                                string_is_valid
                                },
-               { NA_DATA_TYPE_STRING_LIST,
+               { FMA_DATA_TYPE_STRING_LIST,
                                string_list_spec,
                                string_list_is_default,
                                string_list_is_valid
                                },
-               { NA_DATA_TYPE_LOCALE_STRING,
+               { FMA_DATA_TYPE_LOCALE_STRING,
                                string_spec,
                                locale_is_default,
                                locale_is_valid
                                },
-               { NA_DATA_TYPE_UINT,
+               { FMA_DATA_TYPE_UINT,
                                uint_spec,
                                uint_is_default,
                                uint_is_valid
                                },
-               { NA_DATA_TYPE_UINT_LIST,
+               { FMA_DATA_TYPE_UINT_LIST,
                                uint_list_spec,
                                uint_list_is_default,
                                uint_list_is_valid
diff --git a/src/core/fma-data-types.c b/src/core/fma-data-types.c
index 6750e82..04d5d59 100644
--- a/src/core/fma-data-types.c
+++ b/src/core/fma-data-types.c
@@ -42,13 +42,13 @@ typedef struct {
        FactoryType;
 
 static FactoryType st_factory_type[] = {
-               { NA_DATA_TYPE_BOOLEAN,       "bool",   NULL },
-               { NA_DATA_TYPE_POINTER,        NULL,    NULL },
-               { NA_DATA_TYPE_STRING,        "string", NULL },
-               { NA_DATA_TYPE_STRING_LIST,   "list",   "string" },
-               { NA_DATA_TYPE_LOCALE_STRING, "string", NULL },
-               { NA_DATA_TYPE_UINT,          "int",    NULL },
-               { NA_DATA_TYPE_UINT_LIST,     "list",   "int" },
+               { FMA_DATA_TYPE_BOOLEAN,       "bool",   NULL },
+               { FMA_DATA_TYPE_POINTER,        NULL,    NULL },
+               { FMA_DATA_TYPE_STRING,        "string", NULL },
+               { FMA_DATA_TYPE_STRING_LIST,   "list",   "string" },
+               { FMA_DATA_TYPE_LOCALE_STRING, "string", NULL },
+               { FMA_DATA_TYPE_UINT,          "int",    NULL },
+               { FMA_DATA_TYPE_UINT_LIST,     "list",   "int" },
                { 0 }
 };
 
diff --git a/src/core/fma-icontext-factory.c b/src/core/fma-icontext-factory.c
index c06793b..af2f35d 100644
--- a/src/core/fma-icontext-factory.c
+++ b/src/core/fma-icontext-factory.c
@@ -57,7 +57,7 @@ FMADataDef data_def_conditions [] = {
                                        "display.\n" \
                                        "This obviously only applies when there is a selection.\n" \
                                        "Defaults to '*'." ),
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                "*",
                                FALSE,
                                TRUE,
@@ -91,7 +91,7 @@ FMADataDef data_def_conditions [] = {
                                        "then set 'false'.\n" \
                                        "This obviously only applies when there is a selection.\n" \
                                        "Defaults to 'true'." ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "true",
                                FALSE,
                                TRUE,
@@ -118,7 +118,7 @@ FMADataDef data_def_conditions [] = {
                                        "the mimetype patterns for the action to appear.\n" \
                                        "This obviously only applies when there is a selection.\n" \
                                        "Defaults to '*/*'." ),
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                "*",
                                FALSE,
                                TRUE,
@@ -153,7 +153,7 @@ FMADataDef data_def_conditions [] = {
                                "The generic wildcard may be coded as '*', or '*/*' or 'all' or 'all/*' or 
'all/all'. "
                                "In each case, we will try to spend as less time as possible to check " \
                                "selection mimetypes",
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "true",
                                FALSE,
                                TRUE,
@@ -187,7 +187,7 @@ FMADataDef data_def_conditions [] = {
                                        "(your configuration will never appear).\n" \
                                        "This obviously only applies when there is a selection.\n" \
                                        "Defaults to 'true'." ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "true",
                                FALSE,
                                TRUE,
@@ -218,7 +218,7 @@ FMADataDef data_def_conditions [] = {
                                        "(your configuration will never appear).\n" \
                                        "This obviously only applies when there is a selection.\n" \
                                        "Defaults to 'false'." ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "false",
                                FALSE,
                                TRUE,
@@ -247,7 +247,7 @@ FMADataDef data_def_conditions [] = {
                                        "key to 'true'. If you want just one file or folder, set it to 
'false'.\n" \
                                        "This obviously only applies when there is a selection.\n" \
                                        "Defaults to 'false'." ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "false",
                                FALSE,
                                FALSE,
@@ -287,7 +287,7 @@ FMADataDef data_def_conditions [] = {
                                        "This obviously only applies when there is a selection, " \
                                        "or when targeting the special 'x-nautilus-desktop' scheme.\n" \
                                        "Defaults to 'file'." ),
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                "*",
                                FALSE,
                                TRUE,
@@ -313,7 +313,7 @@ FMADataDef data_def_conditions [] = {
                                N_( "Defines the list of valid paths to be matched against the current 
folder.\n " \
                                        "All folders 'under' the specified path are considered valid.\n" \
                                        "Defaults to '/'." ),
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                "/",
                                FALSE,
                                TRUE,
@@ -340,7 +340,7 @@ FMADataDef data_def_conditions [] = {
                                        "This is a string of the form \"{'<'|'='|'>'} number\".\n" \
                                        "Examples of valid strings are: \"=0\", \"> 1\", \"< 10\".\n" \
                                        "Defaults to \">0\"." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                ">0",
                                FALSE,
                                TRUE,
@@ -363,7 +363,7 @@ FMADataDef data_def_conditions [] = {
                                TRUE,
                                N_( "Only show in environment" ),
                                N_( "Defaults to all." ),
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                "",
                                FALSE,
                                TRUE,
@@ -387,7 +387,7 @@ FMADataDef data_def_conditions [] = {
                                TRUE,
                                N_( "Not show in environment" ),
                                N_( "Defaults to none." ),
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                "",
                                FALSE,
                                TRUE,
@@ -415,7 +415,7 @@ FMADataDef data_def_conditions [] = {
                                        "the specified file are checked.\n" \
                                        "Parameters may appear in 'TryExec' value, and will be substituted at 
runtime.\n" \
                                        "Defaults to successful." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -442,7 +442,7 @@ FMADataDef data_def_conditions [] = {
                                        "The item will be candidate if the named service is registered on 
session DBus at runtime.\n" \
                                        "Parameters may appear in 'ShowIfRegistered' value, and will be 
substituted at runtime.\n" \
                                        "Defaults to successful." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -468,7 +468,7 @@ FMADataDef data_def_conditions [] = {
                                        "The item will be candidate if the outputed string is equal to 
\"true\".\n" \
                                        "Parameters may appear in 'ShowIfTrue' value, and will be substituted 
at runtime.\n" \
                                        "Defaults to successful." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -495,7 +495,7 @@ FMADataDef data_def_conditions [] = {
                                        "The item will be candidate if the process name is found in memory at 
runtime.\n" \
                                        "Parameters may appear in 'ShowIfRunning' value, and will be 
substituted at runtime.\n" \
                                        "Defaults to successful." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -527,7 +527,7 @@ FMADataDef data_def_conditions [] = {
                                        "- 'Executable': selected items are executable by user\n" \
                                        "- 'Local': selected items are local.\n" \
                                        "Defaults to empty list." ),
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                "",
                                FALSE,
                                TRUE,
diff --git a/src/core/fma-ifactory-object.c b/src/core/fma-ifactory-object.c
index 109da27..96ab2ef 100644
--- a/src/core/fma-ifactory-object.c
+++ b/src/core/fma-ifactory-object.c
@@ -206,8 +206,8 @@ fma_ifactory_object_get_data_groups( const FMAIFactoryObject *object )
  * @object: this #FMAIFactoryObject instance.
  * @name: the elementary data whose value is to be got.
  *
- * If the type of the value is %NA_DATA_TYPE_STRING, %NA_DATA_TYPE_LOCALE_STRING,
- * or %NA_DATA_TYPE_STRING_LIST, then the returned value is a newly allocated
+ * If the type of the value is %FMA_DATA_TYPE_STRING, %FMA_DATA_TYPE_LOCALE_STRING,
+ * or %FMA_DATA_TYPE_STRING_LIST, then the returned value is a newly allocated
  * one and should be g_free() (resp. fma_core_utils_slist_free()) by the
  * caller.
  *
diff --git a/src/core/na-factory-object.c b/src/core/na-factory-object.c
index 7163072..dc917f8 100644
--- a/src/core/na-factory-object.c
+++ b/src/core/na-factory-object.c
@@ -754,8 +754,8 @@ na_factory_object_get_as_value( const FMAIFactoryObject *object, const gchar *na
  *
  * Returns: the searched value.
  *
- * If the type of the value is NA_DATA_TYPE_STRING or NA_DATA_TYPE_LOCALE_STRING
- * (resp. NA_DATA_TYPE_STRING_LIST), then the returned value is a newly allocated
+ * If the type of the value is FMA_DATA_TYPE_STRING or FMA_DATA_TYPE_LOCALE_STRING
+ * (resp. FMA_DATA_TYPE_STRING_LIST), then the returned value is a newly allocated
  * string (resp. GSList) and should be g_free() (resp. fma_core_utils_slist_free())
  * by the caller.
  */
diff --git a/src/core/na-object-action-factory.c b/src/core/na-object-action-factory.c
index 64fd6ad..aa62746 100644
--- a/src/core/na-object-action-factory.c
+++ b/src/core/na-object-action-factory.c
@@ -57,7 +57,7 @@ static FMADataDef data_def_action [] = {
                                TRUE,
                                "Version of the format",
                                "The version of the configuration format that will be used to manage backward 
compatibility.",
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -83,7 +83,7 @@ static FMADataDef data_def_action [] = {
                                        "Note that menus are always potential candidate to the display in " \
                                        "selection context menus provided that they contain at least one 
action.\n" \
                                        "Defaults to TRUE." ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "true",
                                FALSE,
                                TRUE,
@@ -109,7 +109,7 @@ static FMADataDef data_def_action [] = {
                                        "Note that menus are always potential candidate to the display in " \
                                        "selection context menus provided that they contain at least one 
action.\n" \
                                        "Defaults to FALSE" ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "false",
                                FALSE,
                                TRUE,
@@ -134,7 +134,7 @@ static FMADataDef data_def_action [] = {
                                        "This only applies to current location.\n" \
                                        "Note that menus are never displayed in the toolbar.\n" \
                                        "Defaults to FALSE." ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "false",
                                FALSE,
                                TRUE,
@@ -158,7 +158,7 @@ static FMADataDef data_def_action [] = {
                                N_( "The label displayed besides of the icon in the file manager toolbar.\n" \
                                        "Note that actual display may depend of your own Desktop Environment 
preferences.\n" \
                                        "Defaults to label of the context menu when not set or empty."),
-                               NA_DATA_TYPE_LOCALE_STRING,
+                               FMA_DATA_TYPE_LOCALE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -185,7 +185,7 @@ static FMADataDef data_def_action [] = {
                                TRUE,
                                "Does the toolbar label is the same than the main one ?",
                                "Does the toolbar label is the same than the main one ?",
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "true",
                                FALSE,
                                TRUE,
@@ -210,7 +210,7 @@ static FMADataDef data_def_action [] = {
                                "Last allocated profile",
                                "Last allocated profile number in na_object_action_get_new_profile_name(), " \
                                "reset to zero when saving the action.",
-                               NA_DATA_TYPE_UINT,
+                               FMA_DATA_TYPE_UINT,
                                "0",
                                FALSE,
                                TRUE,
@@ -241,7 +241,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Command path",
                                NULL,
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                NULL,
                                FALSE,
                                FALSE,
@@ -263,7 +263,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Command parameters",
                                NULL,
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                NULL,
                                FALSE,
                                FALSE,
@@ -285,7 +285,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Basenames",
                                NULL,
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                NULL,
                                FALSE,
                                FALSE,
@@ -307,7 +307,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Case sensitive",
                                NULL,
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                NULL,
                                FALSE,
                                FALSE,
@@ -329,7 +329,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Mimetypes",
                                NULL,
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                NULL,
                                FALSE,
                                FALSE,
@@ -351,7 +351,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Applies to files only",
                                NULL,
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                NULL,
                                FALSE,
                                FALSE,
@@ -373,7 +373,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Applies to directories only",
                                NULL,
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                NULL,
                                FALSE,
                                FALSE,
@@ -395,7 +395,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Multiple selection",
                                NULL,
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                NULL,
                                FALSE,
                                FALSE,
@@ -417,7 +417,7 @@ FMADataDef data_def_action_v1 [] = {
                                FALSE,
                                "Schemes",
                                NULL,
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                NULL,
                                FALSE,
                                FALSE,
diff --git a/src/core/na-object-id-factory.c b/src/core/na-object-id-factory.c
index 2e2265e..798c077 100644
--- a/src/core/na-object-id-factory.c
+++ b/src/core/na-object-id-factory.c
@@ -53,7 +53,7 @@ FMADataDef data_def_id [] = {
                                "Internal identifier of the NAObjectId object. " \
                                "Historically a UUID used as a GConf directory (thus ASCII, case 
insensitive), " \
                                "it is also the basename of the .desktop file (thus UTF-8, case sensitive).",
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -77,7 +77,7 @@ FMADataDef data_def_id [] = {
                                TRUE,
                                "NAObjectId Parent",
                                "The NAObjectItem which is the parent of this object.",
-                               NA_DATA_TYPE_POINTER,
+                               FMA_DATA_TYPE_POINTER,
                                NULL,
                                FALSE,
                                FALSE,
diff --git a/src/core/na-object-item-factory.c b/src/core/na-object-item-factory.c
index d5bbf5a..b073904 100644
--- a/src/core/na-object-item-factory.c
+++ b/src/core/na-object-item-factory.c
@@ -67,7 +67,7 @@ FMADataDef data_def_item [] = {
                                        "- 'Action',\n" \
                                        "- 'Menu'.\n" \
                                        "The value is case sensitive and must not be localized." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                NULL,
                                FALSE,
                                FALSE,
@@ -95,7 +95,7 @@ FMADataDef data_def_item [] = {
                                N_( "The label of the menu item that will appear in the file manager context 
" \
                                        "menu when the selection matches the appearance condition 
settings.\n" \
                                        "It is also used as a default for the toolbar label of an action." ),
-                               NA_DATA_TYPE_LOCALE_STRING,
+                               FMA_DATA_TYPE_LOCALE_STRING,
                                N_( "Empty label" ),
                                FALSE,
                                TRUE,
@@ -119,7 +119,7 @@ FMADataDef data_def_item [] = {
                                N_( "The tooltip of the menu item that will appear in the file manager " \
                                        "statusbar when the user points to the file manager context menu item 
" \
                                        "with his/her mouse." ),
-                               NA_DATA_TYPE_LOCALE_STRING,
+                               FMA_DATA_TYPE_LOCALE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -144,7 +144,7 @@ FMADataDef data_def_item [] = {
                                        "in the file manager context menu when the selection matches the 
appearance " \
                                        "conditions settings.\n" \
                                        "May be the localized name of a themed icon, or a full path to any 
appropriate image." ),
-                               NA_DATA_TYPE_LOCALE_STRING,
+                               FMA_DATA_TYPE_LOCALE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -168,7 +168,7 @@ FMADataDef data_def_item [] = {
                                FALSE,
                                "Unlocalized icon name or path",
                                NULL,
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                FALSE,
@@ -191,7 +191,7 @@ FMADataDef data_def_item [] = {
                                N_( "Description relative to the item" ),
                                N_( "Some text which explains the goal of the menu or the action.\n" \
                                        "May be used, e.g. when displaying available items on a web site." ),
-                               NA_DATA_TYPE_LOCALE_STRING,
+                               FMA_DATA_TYPE_LOCALE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -218,7 +218,7 @@ FMADataDef data_def_item [] = {
                                        "an already existing shortcut to define this one.\n" \
                                        "The format may look like \"<Control>a\" or \"<Shift><Alt>F1\".\n" \
                                        "Defaults to empty." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -242,7 +242,7 @@ FMADataDef data_def_item [] = {
                                TRUE,
                                "Subitems",
                                "List of subitems objects",
-                               NA_DATA_TYPE_POINTER,
+                               FMA_DATA_TYPE_POINTER,
                                NULL,
                                FALSE,
                                FALSE,                  /* not copyable */
@@ -270,7 +270,7 @@ FMADataDef data_def_item [] = {
                                        "if the item is a menu, or profiles if the item is an action.\n" \
                                        "If this list doesn't exist or is empty for an action or a menu, " \
                                        "subitems are attached in the order of the read operations." ),
-                               NA_DATA_TYPE_STRING_LIST,
+                               FMA_DATA_TYPE_STRING_LIST,
                                NULL,
                                FALSE,
                                FALSE,
@@ -294,7 +294,7 @@ FMADataDef data_def_item [] = {
                                N_( "If the or the menu action is disabled, it will never appear in the " \
                                        "file manager context menu.\n" \
                                        "Defaults to TRUE." ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "true",
                                FALSE,
                                TRUE,
@@ -324,7 +324,7 @@ FMADataDef data_def_item [] = {
                                "as this also depend of parameters set by user and administrator. " \
                                "Also, a property initially set to FALSE when first unserializing may be set 
to" \
                                "TRUE if an eccor occurs on a later write operation.",
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "false",
                                FALSE,
                                FALSE,
@@ -348,7 +348,7 @@ FMADataDef data_def_item [] = {
                                TRUE,
                                "I/O provider",
                                "A pointer to the NAIOProvider object.",
-                               NA_DATA_TYPE_POINTER,
+                               FMA_DATA_TYPE_POINTER,
                                NULL,
                                FALSE,
                                TRUE,
@@ -375,7 +375,7 @@ FMADataDef data_def_item [] = {
                                TRUE,
                                "I/O provider data",
                                "A pointer to some NAIOProvider specific data.",
-                               NA_DATA_TYPE_POINTER,
+                               FMA_DATA_TYPE_POINTER,
                                NULL,
                                FALSE,
                                FALSE,
@@ -408,7 +408,7 @@ FMADataDef data_def_item [] = {
                                TRUE,
                                N_( "Version of the format" ),
                                N_( "The version of the configuration format that will be used to manage 
backward compatibility." ),
-                               NA_DATA_TYPE_UINT,
+                               FMA_DATA_TYPE_UINT,
                                "3",
                                FALSE,
                                TRUE,
diff --git a/src/core/na-object-profile-factory.c b/src/core/na-object-profile-factory.c
index 1a1e950..7f362f7 100644
--- a/src/core/na-object-profile-factory.c
+++ b/src/core/na-object-profile-factory.c
@@ -49,7 +49,7 @@ static FMADataDef data_def_profile [] = {
                                N_( "Name of the profile" ),
                                N_( "May be used as a description for the function of the profile.\n" \
                                        "If not set, it defaults to an auto-generated name." ),
-                               NA_DATA_TYPE_LOCALE_STRING,
+                               FMA_DATA_TYPE_LOCALE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -73,7 +73,7 @@ static FMADataDef data_def_profile [] = {
                                FALSE,
                                "Unlocalized name of the profile",
                                NULL,
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                FALSE,
@@ -100,7 +100,7 @@ static FMADataDef data_def_profile [] = {
                                N_( "Path of the command" ),
                                N_( "The path of the command to be executed when the user select the menu 
item " \
                                        "in the file manager context menu or in the toolbar." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -165,7 +165,7 @@ static FMADataDef data_def_profile [] = {
                                        "  %x: (first) extension\n" \
                                        "  %X: space-separated list of the extensions of the selected 
file(s)/folder(s)\n" \
                                        "  %%: a percent sign." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -188,7 +188,7 @@ static FMADataDef data_def_profile [] = {
                                N_( "Working directory" ),
                                N_( "The working directory the command will be started in.\n" \
                                        "Defaults to \"%d\"." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "%d",
                                FALSE,
                                TRUE,
@@ -221,7 +221,7 @@ static FMADataDef data_def_profile [] = {
                                                "standard streams (stdout, stderr) should be collected and 
displayed; " \
                                                "an acceptable fallback is Terminal.\n" \
                                        "Defaults to \"Normal\"." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "Normal",
                                FALSE,
                                TRUE,
@@ -244,7 +244,7 @@ static FMADataDef data_def_profile [] = {
                                N_( "Startup notify" ),
                                N_( "Only relevant when ExecutionMode=Normal.\n" \
                                        "Defaults to FALSE." ),
-                               NA_DATA_TYPE_BOOLEAN,
+                               FMA_DATA_TYPE_BOOLEAN,
                                "false",
                                FALSE,
                                TRUE,
@@ -267,7 +267,7 @@ static FMADataDef data_def_profile [] = {
                                N_( "Startup WM Class" ),
                                N_( "Only relevant when ExecutionMode=Normal.\n" \
                                        "Defaults to empty." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
@@ -292,7 +292,7 @@ static FMADataDef data_def_profile [] = {
                                        "The user may be identified by its numeric UID or by its login.\n" \
                                        "The profile is ignored if defined with a non-existing UID or 
login.\n" \
                                        "Defaults to empty: the command will be executed as the current 
user." ),
-                               NA_DATA_TYPE_STRING,
+                               FMA_DATA_TYPE_STRING,
                                "",
                                FALSE,
                                TRUE,
diff --git a/src/core/na-settings.c b/src/core/na-settings.c
index bab280e..0508130 100644
--- a/src/core/na-settings.c
+++ b/src/core/na-settings.c
@@ -129,64 +129,64 @@ typedef struct {
        KeyDef;
 
 static const KeyDef st_def_keys[] = {
-       { NA_IPREFS_ADMIN_PREFERENCES_LOCKED,         GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_ADMIN_IO_PROVIDERS_LOCKED,        GROUP_RUNTIME, NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_ASSISTANT_ESC_CONFIRM,            GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "true" },
-       { NA_IPREFS_ASSISTANT_ESC_QUIT,               GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "true" },
-       { NA_IPREFS_CAPABILITY_ADD_CAPABILITY_WSP,    GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_COMMAND_CHOOSER_WSP,              GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_COMMAND_CHOOSER_URI,              GROUP_NACT,    NA_DATA_TYPE_STRING,      "file:///bin" 
},
-       { NA_IPREFS_COMMAND_LEGEND_WSP,               GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_CONFIRM_LOGOUT_WSP,               GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_DESKTOP_ENVIRONMENT,              GROUP_RUNTIME, NA_DATA_TYPE_STRING,      "" },
-       { NA_IPREFS_WORKING_DIR_WSP,                  GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_WORKING_DIR_URI,                  GROUP_NACT,    NA_DATA_TYPE_STRING,      "file:///" },
-       { NA_IPREFS_SHOW_IF_RUNNING_WSP,              GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_SHOW_IF_RUNNING_URI,              GROUP_NACT,    NA_DATA_TYPE_STRING,      "file:///bin" 
},
-       { NA_IPREFS_TRY_EXEC_WSP,                     GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_TRY_EXEC_URI,                     GROUP_NACT,    NA_DATA_TYPE_STRING,      "file:///bin" 
},
-       { NA_IPREFS_EXPORT_ASK_USER_WSP,              GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_EXPORT_ASK_USER_LAST_FORMAT,      GROUP_NACT,    NA_DATA_TYPE_STRING,      "Desktop1" },
-       { NA_IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_EXPORT_ASSISTANT_WSP,             GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_EXPORT_ASSISTANT_URI,             GROUP_NACT,    NA_DATA_TYPE_STRING,      "file:///tmp" 
},
-       { NA_IPREFS_EXPORT_ASSISTANT_PANED,           GROUP_NACT,    NA_DATA_TYPE_UINT,        "200" },
-       { NA_IPREFS_EXPORT_PREFERRED_FORMAT,          GROUP_NACT,    NA_DATA_TYPE_STRING,      "Ask" },
-       { NA_IPREFS_FOLDER_CHOOSER_WSP,               GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_FOLDER_CHOOSER_URI,               GROUP_NACT,    NA_DATA_TYPE_STRING,      "file:///" },
-       { NA_IPREFS_IMPORT_ASK_USER_WSP,              GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_IMPORT_ASK_USER_LAST_MODE,        GROUP_NACT,    NA_DATA_TYPE_STRING,      "NoImport" },
-       { NA_IPREFS_IMPORT_ASSISTANT_WSP,             GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_IMPORT_ASSISTANT_URI,             GROUP_NACT,    NA_DATA_TYPE_STRING,      "file:///tmp" 
},
-       { NA_IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_IMPORT_PREFERRED_MODE,            GROUP_NACT,    NA_DATA_TYPE_STRING,      "Ask" },
-       { NA_IPREFS_IO_PROVIDERS_WRITE_ORDER,         GROUP_NACT,    NA_DATA_TYPE_STRING_LIST, "" },
-       { NA_IPREFS_ICON_CHOOSER_URI,                 GROUP_NACT,    NA_DATA_TYPE_STRING,      "file:///" },
-       { NA_IPREFS_ICON_CHOOSER_PANED,               GROUP_NACT,    NA_DATA_TYPE_UINT,        "200" },
-       { NA_IPREFS_ICON_CHOOSER_WSP,                 GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_ITEMS_ADD_ABOUT_ITEM,             GROUP_RUNTIME, NA_DATA_TYPE_BOOLEAN,     "true" },
-       { NA_IPREFS_ITEMS_CREATE_ROOT_MENU,           GROUP_RUNTIME, NA_DATA_TYPE_BOOLEAN,     "true" },
-       { NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER,           GROUP_RUNTIME, NA_DATA_TYPE_STRING_LIST, "" },
-       { NA_IPREFS_ITEMS_LIST_ORDER_MODE,            GROUP_RUNTIME, NA_DATA_TYPE_STRING,      
"AscendingOrder" },
-       { NA_IPREFS_MAIN_PANED,                       GROUP_NACT,    NA_DATA_TYPE_UINT,        "200" },
-       { NA_IPREFS_MAIN_SAVE_AUTO,                   GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_MAIN_SAVE_PERIOD,                 GROUP_NACT,    NA_DATA_TYPE_UINT,        "5" },
-       { NA_IPREFS_MAIN_TABS_POS,                    GROUP_NACT,    NA_DATA_TYPE_STRING,      "Top" },
-       { NA_IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY,        GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "true" },
-       { NA_IPREFS_MAIN_TOOLBAR_FILE_DISPLAY,        GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "true" },
-       { NA_IPREFS_MAIN_TOOLBAR_HELP_DISPLAY,        GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "true" },
-       { NA_IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY,       GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_MAIN_WINDOW_WSP,                  GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_PREFERENCES_WSP,                  GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_PLUGIN_MENU_LOG,                  GROUP_RUNTIME, NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_RELABEL_DUPLICATE_ACTION,         GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_RELABEL_DUPLICATE_MENU,           GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_RELABEL_DUPLICATE_PROFILE,        GROUP_NACT,    NA_DATA_TYPE_BOOLEAN,     "false" },
-       { NA_IPREFS_SCHEME_ADD_SCHEME_WSP,            GROUP_NACT,    NA_DATA_TYPE_UINT_LIST,   "" },
-       { NA_IPREFS_SCHEME_DEFAULT_LIST,              GROUP_NACT,    NA_DATA_TYPE_STRING_LIST, "" },
-       { NA_IPREFS_TERMINAL_PATTERN,                 GROUP_RUNTIME, NA_DATA_TYPE_STRING,      "" },
-       { NA_IPREFS_IO_PROVIDER_READABLE,             NA_IPREFS_IO_PROVIDER_GROUP, NA_DATA_TYPE_BOOLEAN, 
"true" },
-       { NA_IPREFS_IO_PROVIDER_WRITABLE,             NA_IPREFS_IO_PROVIDER_GROUP, NA_DATA_TYPE_BOOLEAN, 
"true" },
+       { NA_IPREFS_ADMIN_PREFERENCES_LOCKED,         GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_ADMIN_IO_PROVIDERS_LOCKED,        GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_ASSISTANT_ESC_CONFIRM,            GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { NA_IPREFS_ASSISTANT_ESC_QUIT,               GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { NA_IPREFS_CAPABILITY_ADD_CAPABILITY_WSP,    GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_COMMAND_CHOOSER_WSP,              GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_COMMAND_CHOOSER_URI,              GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///bin" 
},
+       { NA_IPREFS_COMMAND_LEGEND_WSP,               GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_CONFIRM_LOGOUT_WSP,               GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_DESKTOP_ENVIRONMENT,              GROUP_RUNTIME, FMA_DATA_TYPE_STRING,      "" },
+       { NA_IPREFS_WORKING_DIR_WSP,                  GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_WORKING_DIR_URI,                  GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///" },
+       { NA_IPREFS_SHOW_IF_RUNNING_WSP,              GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_SHOW_IF_RUNNING_URI,              GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///bin" 
},
+       { NA_IPREFS_TRY_EXEC_WSP,                     GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_TRY_EXEC_URI,                     GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///bin" 
},
+       { NA_IPREFS_EXPORT_ASK_USER_WSP,              GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_EXPORT_ASK_USER_LAST_FORMAT,      GROUP_NACT,    FMA_DATA_TYPE_STRING,      "Desktop1" },
+       { NA_IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_EXPORT_ASSISTANT_WSP,             GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_EXPORT_ASSISTANT_URI,             GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///tmp" 
},
+       { NA_IPREFS_EXPORT_ASSISTANT_PANED,           GROUP_NACT,    FMA_DATA_TYPE_UINT,        "200" },
+       { NA_IPREFS_EXPORT_PREFERRED_FORMAT,          GROUP_NACT,    FMA_DATA_TYPE_STRING,      "Ask" },
+       { NA_IPREFS_FOLDER_CHOOSER_WSP,               GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_FOLDER_CHOOSER_URI,               GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///" },
+       { NA_IPREFS_IMPORT_ASK_USER_WSP,              GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_IMPORT_ASK_USER_LAST_MODE,        GROUP_NACT,    FMA_DATA_TYPE_STRING,      "NoImport" },
+       { NA_IPREFS_IMPORT_ASSISTANT_WSP,             GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_IMPORT_ASSISTANT_URI,             GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///tmp" 
},
+       { NA_IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_IMPORT_PREFERRED_MODE,            GROUP_NACT,    FMA_DATA_TYPE_STRING,      "Ask" },
+       { NA_IPREFS_IO_PROVIDERS_WRITE_ORDER,         GROUP_NACT,    FMA_DATA_TYPE_STRING_LIST, "" },
+       { NA_IPREFS_ICON_CHOOSER_URI,                 GROUP_NACT,    FMA_DATA_TYPE_STRING,      "file:///" },
+       { NA_IPREFS_ICON_CHOOSER_PANED,               GROUP_NACT,    FMA_DATA_TYPE_UINT,        "200" },
+       { NA_IPREFS_ICON_CHOOSER_WSP,                 GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_ITEMS_ADD_ABOUT_ITEM,             GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { NA_IPREFS_ITEMS_CREATE_ROOT_MENU,           GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER,           GROUP_RUNTIME, FMA_DATA_TYPE_STRING_LIST, "" },
+       { NA_IPREFS_ITEMS_LIST_ORDER_MODE,            GROUP_RUNTIME, FMA_DATA_TYPE_STRING,      
"AscendingOrder" },
+       { NA_IPREFS_MAIN_PANED,                       GROUP_NACT,    FMA_DATA_TYPE_UINT,        "200" },
+       { NA_IPREFS_MAIN_SAVE_AUTO,                   GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_MAIN_SAVE_PERIOD,                 GROUP_NACT,    FMA_DATA_TYPE_UINT,        "5" },
+       { NA_IPREFS_MAIN_TABS_POS,                    GROUP_NACT,    FMA_DATA_TYPE_STRING,      "Top" },
+       { NA_IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY,        GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { NA_IPREFS_MAIN_TOOLBAR_FILE_DISPLAY,        GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { NA_IPREFS_MAIN_TOOLBAR_HELP_DISPLAY,        GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "true" },
+       { NA_IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY,       GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_MAIN_WINDOW_WSP,                  GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_PREFERENCES_WSP,                  GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_PLUGIN_MENU_LOG,                  GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_RELABEL_DUPLICATE_ACTION,         GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_RELABEL_DUPLICATE_MENU,           GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_RELABEL_DUPLICATE_PROFILE,        GROUP_NACT,    FMA_DATA_TYPE_BOOLEAN,     "false" },
+       { NA_IPREFS_SCHEME_ADD_SCHEME_WSP,            GROUP_NACT,    FMA_DATA_TYPE_UINT_LIST,   "" },
+       { NA_IPREFS_SCHEME_DEFAULT_LIST,              GROUP_NACT,    FMA_DATA_TYPE_STRING_LIST, "" },
+       { NA_IPREFS_TERMINAL_PATTERN,                 GROUP_RUNTIME, FMA_DATA_TYPE_STRING,      "" },
+       { NA_IPREFS_IO_PROVIDER_READABLE,             NA_IPREFS_IO_PROVIDER_GROUP, FMA_DATA_TYPE_BOOLEAN, 
"true" },
+       { NA_IPREFS_IO_PROVIDER_WRITABLE,             NA_IPREFS_IO_PROVIDER_GROUP, FMA_DATA_TYPE_BOOLEAN, 
"true" },
        { 0 }
 };
 
@@ -1329,11 +1329,11 @@ read_key_value_from_key_file( KeyFile *keyfile, const gchar *group, const gchar
 
        switch( key_def->type ){
 
-               case NA_DATA_TYPE_STRING:
-               case NA_DATA_TYPE_STRING_LIST:
-               case NA_DATA_TYPE_UINT:
-               case NA_DATA_TYPE_UINT_LIST:
-               case NA_DATA_TYPE_BOOLEAN:
+               case FMA_DATA_TYPE_STRING:
+               case FMA_DATA_TYPE_STRING_LIST:
+               case FMA_DATA_TYPE_UINT:
+               case FMA_DATA_TYPE_UINT_LIST:
+               case FMA_DATA_TYPE_BOOLEAN:
                        str = g_key_file_get_string( keyfile->key_file, group, key, &error );
                        if( error ){
                                if( error->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND && error->code != 
G_KEY_FILE_ERROR_GROUP_NOT_FOUND ){
@@ -1347,11 +1347,11 @@ read_key_value_from_key_file( KeyFile *keyfile, const gchar *group, const gchar
                                value->group = g_strdup( group );
                                value->def = key_def;
                                switch( key_def->type ){
-                                       case NA_DATA_TYPE_STRING:
-                                       case NA_DATA_TYPE_UINT:
-                                       case NA_DATA_TYPE_BOOLEAN:
-                                       case NA_DATA_TYPE_STRING_LIST:
-                                       case NA_DATA_TYPE_UINT_LIST:
+                                       case FMA_DATA_TYPE_STRING:
+                                       case FMA_DATA_TYPE_UINT:
+                                       case FMA_DATA_TYPE_BOOLEAN:
+                                       case FMA_DATA_TYPE_STRING_LIST:
+                                       case FMA_DATA_TYPE_UINT_LIST:
                                                value->boxed = fma_boxed_new_from_string( key_def->type, str 
);
                                                break;
                                }
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 453a2c6..8de10c3 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -521,7 +521,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
 
                        switch( def->type ){
 
-                               case NA_DATA_TYPE_LOCALE_STRING:
+                               case FMA_DATA_TYPE_LOCALE_STRING:
                                        str_value = nadp_desktop_file_get_locale_string( nrd->ndf, group, 
def->desktop_entry, &found, def->default_value );
                                        if( found ){
                                                boxed = fma_data_boxed_new( def );
@@ -530,7 +530,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
                                        g_free( str_value );
                                        break;
 
-                               case NA_DATA_TYPE_STRING:
+                               case FMA_DATA_TYPE_STRING:
                                        str_value = nadp_desktop_file_get_string( nrd->ndf, group, 
def->desktop_entry, &found, def->default_value );
                                        if( found ){
                                                boxed = fma_data_boxed_new( def );
@@ -539,7 +539,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
                                        g_free( str_value );
                                        break;
 
-                               case NA_DATA_TYPE_BOOLEAN:
+                               case FMA_DATA_TYPE_BOOLEAN:
                                        bool_value = nadp_desktop_file_get_boolean( nrd->ndf, group, 
def->desktop_entry, &found, fma_core_utils_boolean_from_string( def->default_value ));
                                        if( found ){
                                                boxed = fma_data_boxed_new( def );
@@ -547,7 +547,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
                                        }
                                        break;
 
-                               case NA_DATA_TYPE_STRING_LIST:
+                               case FMA_DATA_TYPE_STRING_LIST:
                                        slist_value = nadp_desktop_file_get_string_list( nrd->ndf, group, 
def->desktop_entry, &found, def->default_value );
                                        if( found ){
                                                boxed = fma_data_boxed_new( def );
@@ -556,7 +556,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
                                        fma_core_utils_slist_free( slist_value );
                                        break;
 
-                               case NA_DATA_TYPE_UINT:
+                               case FMA_DATA_TYPE_UINT:
                                        uint_value = nadp_desktop_file_get_uint( nrd->ndf, group, 
def->desktop_entry, &found, atoi( def->default_value ));
                                        if( found ){
                                                boxed = fma_data_boxed_new( def );
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index a43ab4e..405df76 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -536,7 +536,7 @@ nadp_writer_ifactory_provider_write_data(
 
                        switch( def->type ){
 
-                               case NA_DATA_TYPE_STRING:
+                               case FMA_DATA_TYPE_STRING:
                                        str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
 
                                        if( !strcmp( def->name, NAFO_DATA_PATH )){
@@ -551,24 +551,24 @@ nadp_writer_ifactory_provider_write_data(
                                        g_free( str_value );
                                        break;
 
-                               case NA_DATA_TYPE_LOCALE_STRING:
+                               case FMA_DATA_TYPE_LOCALE_STRING:
                                        str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
                                        nadp_desktop_file_set_locale_string( ndf, group_name, 
def->desktop_entry, str_value );
                                        g_free( str_value );
                                        break;
 
-                               case NA_DATA_TYPE_BOOLEAN:
+                               case FMA_DATA_TYPE_BOOLEAN:
                                        bool_value = GPOINTER_TO_UINT( fma_boxed_get_as_void( FMA_BOXED( 
boxed )));
                                        nadp_desktop_file_set_boolean( ndf, group_name, def->desktop_entry, 
bool_value );
                                        break;
 
-                               case NA_DATA_TYPE_STRING_LIST:
+                               case FMA_DATA_TYPE_STRING_LIST:
                                        slist_value = ( GSList * ) fma_boxed_get_as_void( FMA_BOXED( boxed ));
                                        nadp_desktop_file_set_string_list( ndf, group_name, 
def->desktop_entry, slist_value );
                                        fma_core_utils_slist_free( slist_value );
                                        break;
 
-                               case NA_DATA_TYPE_UINT:
+                               case FMA_DATA_TYPE_UINT:
                                        uint_value = GPOINTER_TO_UINT( fma_boxed_get_as_void( FMA_BOXED( 
boxed )));
                                        nadp_desktop_file_set_uint( ndf, group_name, def->desktop_entry, 
uint_value );
                                        break;
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index df6136f..9aea50d 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -376,25 +376,25 @@ get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, Reade
 
                switch( def->type ){
 
-                       case NA_DATA_TYPE_STRING:
-                       case NA_DATA_TYPE_LOCALE_STRING:
+                       case FMA_DATA_TYPE_STRING:
+                       case FMA_DATA_TYPE_LOCALE_STRING:
                                str_value = fma_gconf_utils_read_string( provider->private->gconf, 
entry_path, TRUE, NULL );
                                fma_boxed_set_from_string( FMA_BOXED( boxed ), str_value );
                                g_free( str_value );
                                break;
 
-                       case NA_DATA_TYPE_BOOLEAN:
+                       case FMA_DATA_TYPE_BOOLEAN:
                                bool_value = fma_gconf_utils_read_bool( provider->private->gconf, entry_path, 
TRUE, FALSE );
                                fma_boxed_set_from_void( FMA_BOXED( boxed ), GUINT_TO_POINTER( bool_value ));
                                break;
 
-                       case NA_DATA_TYPE_STRING_LIST:
+                       case FMA_DATA_TYPE_STRING_LIST:
                                slist_value = fma_gconf_utils_read_string_list( provider->private->gconf, 
entry_path );
                                fma_boxed_set_from_void( FMA_BOXED( boxed ), slist_value );
                                fma_core_utils_slist_free( slist_value );
                                break;
 
-                       case NA_DATA_TYPE_UINT:
+                       case FMA_DATA_TYPE_UINT:
                                int_value = fma_gconf_utils_read_int( provider->private->gconf, entry_path, 
TRUE, 0 );
                                fma_boxed_set_from_void( FMA_BOXED( boxed ), GUINT_TO_POINTER( int_value ));
                                break;
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index 7ca5b03..0f4439d 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -322,7 +322,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
 
                switch( def->type ){
 
-                       case NA_DATA_TYPE_STRING:
+                       case FMA_DATA_TYPE_STRING:
                                str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
                                fma_gconf_utils_write_string( gconf, path, str_value, &msg );
                                if( msg ){
@@ -332,7 +332,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
                                g_free( str_value );
                                break;
 
-                       case NA_DATA_TYPE_LOCALE_STRING:
+                       case FMA_DATA_TYPE_LOCALE_STRING:
                                str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
                                fma_gconf_utils_write_string( gconf, path, str_value, &msg );
                                if( msg ){
@@ -342,7 +342,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
                                g_free( str_value );
                                break;
 
-                       case NA_DATA_TYPE_BOOLEAN:
+                       case FMA_DATA_TYPE_BOOLEAN:
                                bool_value = GPOINTER_TO_UINT( fma_boxed_get_as_void( FMA_BOXED( boxed )));
                                fma_gconf_utils_write_bool( gconf, path, bool_value, &msg );
                                if( msg ){
@@ -351,7 +351,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
                                }
                                break;
 
-                       case NA_DATA_TYPE_STRING_LIST:
+                       case FMA_DATA_TYPE_STRING_LIST:
                                slist_value = ( GSList * ) fma_boxed_get_as_void( FMA_BOXED( boxed ));
                                fma_gconf_utils_write_string_list( gconf, path, slist_value, &msg );
                                if( msg ){
@@ -361,7 +361,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
                                fma_core_utils_slist_free( slist_value );
                                break;
 
-                       case NA_DATA_TYPE_UINT:
+                       case FMA_DATA_TYPE_UINT:
                                uint_value = GPOINTER_TO_UINT( fma_boxed_get_as_void( FMA_BOXED( boxed )));
                                fma_gconf_utils_write_int( gconf, path, uint_value, &msg );
                                if( msg ){
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index 71ec3c8..3ae4bc2 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -1224,14 +1224,14 @@ dump_read_value( NAXMLReader *reader, xmlNode *node, const FMADataDef *def )
        string = NULL;
 
        switch( def->type ){
-               case NA_DATA_TYPE_STRING:
-               case NA_DATA_TYPE_LOCALE_STRING:
-               case NA_DATA_TYPE_UINT:
-               case NA_DATA_TYPE_BOOLEAN:
+               case FMA_DATA_TYPE_STRING:
+               case FMA_DATA_TYPE_LOCALE_STRING:
+               case FMA_DATA_TYPE_UINT:
+               case FMA_DATA_TYPE_BOOLEAN:
                        string = get_value_from_child_child_node( node, NAXML_KEY_DUMP_NODE_VALUE, 
NAXML_KEY_DUMP_NODE_VALUE_TYPE_STRING );
                        break;
 
-               case NA_DATA_TYPE_STRING_LIST:
+               case FMA_DATA_TYPE_STRING_LIST:
                        slist = NULL;
                        value_node = search_for_child_node( node, NAXML_KEY_DUMP_NODE_VALUE );
 
@@ -1257,7 +1257,7 @@ dump_read_value( NAXMLReader *reader, xmlNode *node, const FMADataDef *def )
                        fma_core_utils_slist_free( slist );
                        break;
 
-               case NA_DATA_TYPE_POINTER:
+               case FMA_DATA_TYPE_POINTER:
                default:
                        break;
        }
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index 2e1d4de..ea425d7 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -551,7 +551,7 @@ write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const FMADa
 
        /* boolean value must be lowercase
         */
-       if( def->type == NA_DATA_TYPE_BOOLEAN ){
+       if( def->type == FMA_DATA_TYPE_BOOLEAN ){
                tmp = g_ascii_strdown( value_str, -1 );
                g_free( value_str );
                value_str = tmp;
@@ -560,7 +560,7 @@ write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const FMADa
        /* string or uint list value must be converted to gconf format
         * comma-separated and enclosed within square brackets
         */
-       if( def->type == NA_DATA_TYPE_STRING_LIST || def->type == NA_DATA_TYPE_UINT_LIST ){
+       if( def->type == FMA_DATA_TYPE_STRING_LIST || def->type == FMA_DATA_TYPE_UINT_LIST ){
                tmp = convert_to_gconf_slist( value_str );
                g_free( value_str );
                value_str = tmp;
@@ -605,7 +605,7 @@ write_data_schema_v2_element( NAXMLWriter *writer, const FMADataDef *def, const
        xmlFree( content );
 
        xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_TYPE ), BAD_CAST( 
fma_data_types_get_gconf_dump_key( def->type )));
-       if( def->type == NA_DATA_TYPE_STRING_LIST ){
+       if( def->type == FMA_DATA_TYPE_STRING_LIST ){
                xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LISTTYPE ), 
BAD_CAST( "string" ));
        }
 
@@ -663,7 +663,7 @@ write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const FMADataBox
 
        /* boolean value must be lowercase
         */
-       if( def->type == NA_DATA_TYPE_BOOLEAN ){
+       if( def->type == FMA_DATA_TYPE_BOOLEAN ){
                tmp = g_ascii_strdown( value_str, -1 );
                g_free( value_str );
                value_str = tmp;
@@ -672,7 +672,7 @@ write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const FMADataBox
        /* string or uint list value must be converted to gconf format
         * comma-separated and enclosed within square brackets
         */
-       if( def->type == NA_DATA_TYPE_STRING_LIST || def->type == NA_DATA_TYPE_UINT_LIST ){
+       if( def->type == FMA_DATA_TYPE_STRING_LIST || def->type == FMA_DATA_TYPE_UINT_LIST ){
                tmp = convert_to_gconf_slist( value_str );
                g_free( value_str );
                value_str = tmp;
@@ -707,7 +707,7 @@ write_data_dump_element( NAXMLWriter *writer, const FMADataDef *def, const FMADa
 
        value_node = xmlNewChild( entry_node, NULL, BAD_CAST( NAXML_KEY_DUMP_NODE_VALUE ), NULL );
 
-       if( def->type == NA_DATA_TYPE_STRING_LIST ){
+       if( def->type == FMA_DATA_TYPE_STRING_LIST ){
                value_list_node = xmlNewChild( value_node, NULL, BAD_CAST( NAXML_KEY_DUMP_NODE_VALUE_LIST ), 
NULL );
                xmlNewProp( value_list_node, BAD_CAST( NAXML_KEY_DUMP_NODE_VALUE_LIST_PARM_TYPE ), BAD_CAST( 
NAXML_KEY_DUMP_NODE_VALUE_TYPE_STRING ));
                value_list_value_node = xmlNewChild( value_list_node, NULL, BAD_CAST( 
NAXML_KEY_DUMP_NODE_VALUE ), NULL );
diff --git a/src/utils/na-print-schemas.c b/src/utils/na-print-schemas.c
index 6080d3e..3f3ef4a 100644
--- a/src/utils/na-print-schemas.c
+++ b/src/utils/na-print-schemas.c
@@ -277,7 +277,7 @@ attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const FMADataDef *def )
        xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_OWNER ), BAD_CAST( PACKAGE_TARNAME ));
 
        xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_TYPE ), BAD_CAST( 
fma_data_types_get_gconf_dump_key( def->type )));
-       if( def->type == NA_DATA_TYPE_STRING_LIST ){
+       if( def->type == FMA_DATA_TYPE_STRING_LIST ){
                xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LISTTYPE ), BAD_CAST( 
"string" ));
        }
 


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