[nautilus-actions] Merge NABoxed and NADataBoxed data type definitions
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Merge NABoxed and NADataBoxed data type definitions
- Date: Mon, 14 Feb 2011 23:52:57 +0000 (UTC)
commit f6f9f459b6443b3b73c2f8c054f327f77c3775b2
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Feb 14 05:50:38 2011 +0100
Merge NABoxed and NADataBoxed data type definitions
+ Data type are remaned as NA_DATA_TYPE.
ChangeLog | 27 +++++++
src/api/na-boxed.h | 43 ------------
src/api/na-data-def.h | 2 +-
src/api/na-data-types.h | 61 ++++++++--------
src/core/na-boxed.c | 31 ++++----
src/core/na-data-boxed.c | 16 ++--
src/core/na-data-types.c | 16 ++--
src/core/na-factory-object.c | 4 +-
src/core/na-icontext-factory.c | 34 +++++-----
src/core/na-ifactory-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 | 127 +++++++++++++++++-----------------
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 | 8 +-
src/utils/na-print-schemas.c | 2 +-
22 files changed, 247 insertions(+), 262 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 280f5e6..09cf99d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2011-02-14 Pierre Wieser <pwieser trychlos org>
+
+ Merge NABoxed and NADataBoxed data type definitions.
+ Data type are remaned as NA_DATA_TYPE.
+
+ * src/api/na-boxed.h:
+ * src/api/na-data-def.h:
+ * src/api/na-data-types.h:
+ * src/core/na-boxed.c:
+ * src/core/na-data-boxed.c:
+ * src/core/na-data-types.c:
+ * src/core/na-factory-object.c:
+ * src/core/na-icontext-factory.c:
+ * src/core/na-ifactory-object.c:
+ * src/core/na-object-action-factory.c:
+ * src/core/na-object-id-factory.c:
+ * src/core/na-object-item-factory.c:
+ * src/core/na-object-profile-factory.c:
+ * src/core/na-settings.c:
+ * src/io-desktop/nadp-reader.c:
+ * src/io-desktop/nadp-writer.c:
+ * src/io-gconf/nagp-reader.c:
+ * src/io-gconf/nagp-writer.c:
+ * src/io-xml/naxml-reader.c:
+ * src/io-xml/naxml-writer.c:
+ * src/utils/na-print-schemas.c: Updated accordingly.
+
2011-02-07 Pierre Wieser <pwieser trychlos org>
* src/api/na-iduplicable.h:
diff --git a/src/api/na-boxed.h b/src/api/na-boxed.h
index edb1cd7..0780201 100644
--- a/src/api/na-boxed.h
+++ b/src/api/na-boxed.h
@@ -47,49 +47,6 @@
G_BEGIN_DECLS
-/**
- * NABoxedType:
- * @NA_BOXED_TYPE_STRING: an ASCII string
- * @NA_BOXED_TYPE_LOCALE_STRING: a localized UTF-8 string
- * @NA_BOXED_TYPE_BOOLEAN: a boolean
- * @NA_BOXED_TYPE_STRING_LIST: a list of ASCII strings
- * @NA_BOXED_TYPE_POINTER: a ( void * ) pointer
- * @NA_BOXED_TYPE_UINT: an unsigned integer
- * @NA_BOXED_TYPE_UINT_LIST: a list of unsigned integers
- *
- * Each #NABoxed structure is typed at creation time with one of these
- * elementary types. A #NABoxed structure as so at least a defined type,
- * even if it does not yet have a value.
- *
- * <note>
- * <para>
- * Please note that this enumeration may be compiled in by the extensions.
- * They must so remain fixed, unless you want see strange effects (e.g.
- * an extension has been compiled with %NA_BOXED_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!
- * </para>
- * </note>
- *
- * Since: 3.1.0
- */
-typedef enum {
- NA_BOXED_TYPE_STRING = 1,
- NA_BOXED_TYPE_LOCALE_STRING,
- NA_BOXED_TYPE_BOOLEAN,
- NA_BOXED_TYPE_STRING_LIST,
- NA_BOXED_TYPE_POINTER,
- NA_BOXED_TYPE_UINT,
- NA_BOXED_TYPE_UINT_LIST,
- /*< private >*/
- /* the count of defined NABoxed types */
- NA_BOXED_TYPE_N
-}
- NABoxedType;
-
typedef struct _NABoxed NABoxed;
int na_boxed_compare ( const NABoxed *a, const NABoxed *b );
diff --git a/src/api/na-data-def.h b/src/api/na-data-def.h
index 51059cc..f5cac00 100644
--- a/src/api/na-data-def.h
+++ b/src/api/na-data-def.h
@@ -68,7 +68,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 NAFD_TYPE_xxx data type.
+ * @type: the elementary NA_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 nautilus-actions-new utility.
diff --git a/src/api/na-data-types.h b/src/api/na-data-types.h
index 6cd034a..8a07031 100644
--- a/src/api/na-data-types.h
+++ b/src/api/na-data-types.h
@@ -28,10 +28,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_FACTORY_DATA_TYPES_H__
-#define __NAUTILUS_ACTIONS_API_NA_FACTORY_DATA_TYPES_H__
-
-#ifndef NA_DISABLE_DEPRECATED
+#ifndef __NAUTILUS_ACTIONS_API_NA_DATA_TYPES_H__
+#define __NAUTILUS_ACTIONS_API_NA_DATA_TYPES_H__
/**
* SECTION: data-type
@@ -45,25 +43,27 @@
G_BEGIN_DECLS
/**
- * NAFactoryDataType:
- * @NAFD_TYPE_STRING: an ASCII string
- * @NAFD_TYPE_LOCALE_STRING: a localized UTF-8 string
- * @NAFD_TYPE_BOOLEAN: a boolean
- * can be initialized with "true" or "false" (case insensitive)
- * @NAFD_TYPE_STRING_LIST: a list of ASCII strings
- * @NAFD_TYPE_POINTER: a ( void * ) pointer
- * should be initialized to NULL
- * @NAFD_TYPE_UINT: an unsigned integer
+ * NADataType:
+ * @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_BOOLEAN: a boolean
+ * can be initialized with "true" or "false" (case insensitive)
+ * @NA_DATA_TYPE_UINT: an unsigned integer
+ * @NA_DATA_TYPE_UINT_LIST: a list of unsigned integers
+ *
+ * Each elementary data which would take advantage of #NABoxed facilities
+ * should be typed at instanciation time.
*
- * Each elementary factory data must be typed as one of these
- * IFactoryProvider implementations should provide a primitive for reading
+ * #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 want see strange effects (e.g.
- * an extension has been compiled with %NAFD_TYPE_STRING = 2, while you
+ * 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...
* </para>
@@ -72,25 +72,24 @@ G_BEGIN_DECLS
* </para>
* </note>
*
- * Starting with version 3.1.0, #NAFactoryDataType is deprecated in favour
- * of #NABoxed structure. New code should only use #NABoxed structure and
- * accessors.
- *
- * Deprecated: 3.1.0
+ * Since: 2.30
*/
typedef enum {
- NAFD_TYPE_STRING = 1,
- NAFD_TYPE_LOCALE_STRING,
- NAFD_TYPE_BOOLEAN,
- NAFD_TYPE_STRING_LIST,
- NAFD_TYPE_POINTER,
- NAFD_TYPE_UINT
+ NA_DATA_TYPE_POINTER = 1,
+ NA_DATA_TYPE_STRING,
+ NA_DATA_TYPE_STRING_LIST,
+ NA_DATA_TYPE_LOCALE_STRING,
+ NA_DATA_TYPE_BOOLEAN,
+ NA_DATA_TYPE_UINT,
+ NA_DATA_TYPE_UINT_LIST,
+ /*< private >*/
+ /* count of defined types */
+ NA_DATA_TYPE_N
}
- NAFactoryDataType;
+ NADataType;
const gchar *na_data_types_get_gconf_dump_key( guint type );
G_END_DECLS
-#endif /* NA_DISABLE_DEPRECATED */
-#endif /* __NAUTILUS_ACTIONS_API_NA_FACTORY_DATA_TYPES_H__ */
+#endif /* __NAUTILUS_ACTIONS_API_NA_DATA_TYPES_H__ */
diff --git a/src/core/na-boxed.c b/src/core/na-boxed.c
index e9ff67a..15bf082 100644
--- a/src/core/na-boxed.c
+++ b/src/core/na-boxed.c
@@ -37,6 +37,7 @@
#include <strings.h>
#include <api/na-boxed.h>
+#include <api/na-data-types.h>
#include <api/na-core-utils.h>
/* private structure data
@@ -119,7 +120,7 @@ static gpointer uint_list_get_pointer( const NABoxed *boxed );
static GList *uint_list_get_uint_list( const NABoxed *boxed );
static BoxedDef st_boxed_def[] = {
- { NA_BOXED_TYPE_STRING,
+ { NA_DATA_TYPE_STRING,
"string",
string_compare,
string_copy,
@@ -134,7 +135,7 @@ static BoxedDef st_boxed_def[] = {
NULL,
NULL
},
- { NA_BOXED_TYPE_STRING_LIST,
+ { NA_DATA_TYPE_STRING_LIST,
"ascii strings list",
string_list_compare,
string_list_copy,
@@ -149,7 +150,7 @@ static BoxedDef st_boxed_def[] = {
NULL,
NULL
},
- { NA_BOXED_TYPE_BOOLEAN,
+ { NA_DATA_TYPE_BOOLEAN,
"boolean",
bool_compare,
bool_copy,
@@ -164,7 +165,7 @@ static BoxedDef st_boxed_def[] = {
NULL,
NULL
},
- { NA_BOXED_TYPE_UINT,
+ { NA_DATA_TYPE_UINT,
"unsigned integer",
uint_compare,
uint_copy,
@@ -179,7 +180,7 @@ static BoxedDef st_boxed_def[] = {
uint_get_uint,
NULL
},
- { NA_BOXED_TYPE_UINT_LIST,
+ { NA_DATA_TYPE_UINT_LIST,
"unsigned integers list",
uint_list_compare,
uint_list_copy,
@@ -500,7 +501,7 @@ na_boxed_new_from_string_with_sep( guint type, const gchar *string, const gchar
* na_boxed_get_boolean:
* @boxed: the #NABoxed structure.
*
- * Returns: the boolean value if @boxed is of %NA_BOXED_TYPE_BOOLEAN type,
+ * Returns: the boolean value if @boxed is of %NA_DATA_TYPE_BOOLEAN type,
* %FALSE else.
*
* Since: 3.1.0
@@ -513,7 +514,7 @@ na_boxed_get_boolean( const NABoxed *boxed )
gboolean value;
value = FALSE;
- if( boxed && boxed->type == NA_BOXED_TYPE_BOOLEAN && boxed->is_set ){
+ if( boxed && boxed->type == NA_DATA_TYPE_BOOLEAN && boxed->is_set ){
def = get_boxed_def( boxed->type );
if( def ){
if( def->get_bool ){
@@ -563,7 +564,7 @@ na_boxed_get_pointer( const NABoxed *boxed )
* na_boxed_get_string:
* @boxed: the #NABoxed structure.
*
- * Returns: a newly allocated string if @boxed is of %NA_BOXED_TYPE_STRING
+ * Returns: a newly allocated string if @boxed is of %NA_DATA_TYPE_STRING
* type, which should be g_free() by the caller, %FALSE else.
*
* Since: 3.1.0
@@ -576,7 +577,7 @@ na_boxed_get_string( const NABoxed *boxed )
gchar *value;
value = NULL;
- if( boxed && boxed->type == NA_BOXED_TYPE_STRING && boxed->is_set ){
+ if( boxed && boxed->type == NA_DATA_TYPE_STRING && boxed->is_set ){
def = get_boxed_def( boxed->type );
if( def ){
if( def->get_string ){
@@ -595,7 +596,7 @@ na_boxed_get_string( const NABoxed *boxed )
* na_boxed_get_string_list:
* @boxed: the #NABoxed structure.
*
- * Returns: a newly allocated string list if @boxed is of %NA_BOXED_TYPE_STRING_LIST
+ * Returns: a newly allocated string list if @boxed is of %NA_DATA_TYPE_STRING_LIST
* type, which should be na_core_utils_slist_free() by the caller, %FALSE else.
*
* Since: 3.1.0
@@ -608,7 +609,7 @@ na_boxed_get_string_list( const NABoxed *boxed )
GSList *value;
value = NULL;
- if( boxed && boxed->type == NA_BOXED_TYPE_STRING_LIST && boxed->is_set ){
+ if( boxed && boxed->type == NA_DATA_TYPE_STRING_LIST && boxed->is_set ){
def = get_boxed_def( boxed->type );
if( def ){
if( def->get_string_list ){
@@ -627,7 +628,7 @@ na_boxed_get_string_list( const NABoxed *boxed )
* na_boxed_get_uint:
* @boxed: the #NABoxed structure.
*
- * Returns: an unsigned integer if @boxed is of %NA_BOXED_TYPE_UINT type.
+ * Returns: an unsigned integer if @boxed is of %NA_DATA_TYPE_UINT type.
*
* Since: 3.1.0
*/
@@ -639,7 +640,7 @@ na_boxed_get_uint( const NABoxed *boxed )
guint value;
value = 0;
- if( boxed && boxed->type == NA_BOXED_TYPE_UINT && boxed->is_set ){
+ if( boxed && boxed->type == NA_DATA_TYPE_UINT && boxed->is_set ){
def = get_boxed_def( boxed->type );
if( def ){
if( def->get_uint ){
@@ -658,7 +659,7 @@ na_boxed_get_uint( const NABoxed *boxed )
* na_boxed_get_uint_list:
* @boxed: the #NABoxed structure.
*
- * Returns: a newly allocated list if @boxed is of %NA_BOXED_TYPE_UINT_LIST
+ * Returns: a newly allocated list if @boxed is of %NA_DATA_TYPE_UINT_LIST
* type, which should be g_list_free() by the caller, %FALSE else.
*
* Since: 3.1.0
@@ -671,7 +672,7 @@ na_boxed_get_uint_list( const NABoxed *boxed )
GList *value;
value = NULL;
- if( boxed && boxed->type == NA_BOXED_TYPE_UINT_LIST && boxed->is_set ){
+ if( boxed && boxed->type == NA_DATA_TYPE_UINT_LIST && boxed->is_set ){
def = get_boxed_def( boxed->type );
if( def ){
if( def->get_uint_list ){
diff --git a/src/core/na-data-boxed.c b/src/core/na-data-boxed.c
index 69c06a9..65889a7 100644
--- a/src/core/na-data-boxed.c
+++ b/src/core/na-data-boxed.c
@@ -165,7 +165,7 @@ static void uint_set_from_value( NADataBoxed *boxed, const GValue *value
static void uint_set_from_void( NADataBoxed *boxed, const void *value );
static DataBoxedFn st_data_boxed_fn[] = {
- { NAFD_TYPE_STRING,
+ { NA_DATA_TYPE_STRING,
string_spec,
string_free,
string_dump,
@@ -180,7 +180,7 @@ static DataBoxedFn st_data_boxed_fn[] = {
string_set_from_value,
string_set_from_void
},
- { NAFD_TYPE_LOCALE_STRING,
+ { NA_DATA_TYPE_LOCALE_STRING,
string_spec,
string_free,
string_dump,
@@ -195,7 +195,7 @@ static DataBoxedFn st_data_boxed_fn[] = {
string_set_from_value,
string_set_from_void
},
- { NAFD_TYPE_STRING_LIST,
+ { NA_DATA_TYPE_STRING_LIST,
slist_spec,
slist_free,
slist_dump,
@@ -210,7 +210,7 @@ static DataBoxedFn st_data_boxed_fn[] = {
slist_set_from_value,
slist_set_from_void
},
- { NAFD_TYPE_BOOLEAN,
+ { NA_DATA_TYPE_BOOLEAN,
bool_spec,
bool_free,
bool_dump,
@@ -225,7 +225,7 @@ static DataBoxedFn st_data_boxed_fn[] = {
bool_set_from_value,
bool_set_from_void
},
- { NAFD_TYPE_POINTER,
+ { NA_DATA_TYPE_POINTER,
pointer_spec,
pointer_free,
pointer_dump,
@@ -240,7 +240,7 @@ static DataBoxedFn st_data_boxed_fn[] = {
pointer_set_from_value,
pointer_set_from_void
},
- { NAFD_TYPE_UINT,
+ { NA_DATA_TYPE_UINT,
uint_spec,
uint_free,
uint_dump,
@@ -682,8 +682,8 @@ na_data_boxed_get_as_string( const NADataBoxed *boxed )
*
* Returns: the content of the @boxed.
*
- * If of type NAFD_TYPE_STRING, NAFD_TYPE_LOCALE_STRING OR
- * NAFD_TYPE_STRING_LIST, then the content is returned in a newly
+ * If of type NA_DATA_TYPE_STRING, NA_DATA_TYPE_LOCALE_STRING OR
+ * NA_DATA_TYPE_STRING_LIST, then the content is returned in a newly
* allocated value, which should be released by the caller.
*
* Since: 2.30
diff --git a/src/core/na-data-types.c b/src/core/na-data-types.c
index 2647358..6fdaa0e 100644
--- a/src/core/na-data-types.c
+++ b/src/core/na-data-types.c
@@ -38,16 +38,18 @@
typedef struct {
guint type;
gchar *gconf_dump_key;
+ gchar *gconf_secondary_key;
}
FactoryType;
static FactoryType st_factory_type[] = {
- { NAFD_TYPE_STRING, "string" },
- { NAFD_TYPE_LOCALE_STRING, "string" },
- { NAFD_TYPE_BOOLEAN, "bool" },
- { NAFD_TYPE_STRING_LIST, "list" },
- { NAFD_TYPE_POINTER, NULL },
- { NAFD_TYPE_UINT, "int" },
+ { 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_BOOLEAN, "bool", NULL },
+ { NA_DATA_TYPE_UINT, "int", NULL },
+ { NA_DATA_TYPE_UINT_LIST, "list", "int" },
{ 0 }
};
@@ -61,8 +63,6 @@ static FactoryType st_factory_type[] = {
* should not be released by the caller.
*
* Since: 2.30
- *
- * Deprecated: 3.1.0
*/
const gchar *
na_data_types_get_gconf_dump_key( guint type )
diff --git a/src/core/na-factory-object.c b/src/core/na-factory-object.c
index f2bfdcd..8100e12 100644
--- a/src/core/na-factory-object.c
+++ b/src/core/na-factory-object.c
@@ -766,8 +766,8 @@ na_factory_object_get_as_value( const NAIFactoryObject *object, const gchar *nam
*
* Returns: the searched value.
*
- * If the type of the value is NAFD_TYPE_STRING, NAFD_TYPE_LOCALE_STRING,
- * or NAFD_TYPE_STRING_LIST, then the returned value is a newly allocated
+ * 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
* one and should be g_free() (resp. na_core_utils_slist_free()) by the
* caller.
*/
diff --git a/src/core/na-icontext-factory.c b/src/core/na-icontext-factory.c
index 0f1b970..b4a51e2 100644
--- a/src/core/na-icontext-factory.c
+++ b/src/core/na-icontext-factory.c
@@ -53,7 +53,7 @@ NADataDef data_def_conditions [] = {
"display.\n" \
"This obviously only applies when there is a selection.\n" \
"Defaults to '*'." ),
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
"[*]",
FALSE,
TRUE,
@@ -87,7 +87,7 @@ NADataDef data_def_conditions [] = {
"then set 'false'.\n" \
"This obviously only applies when there is a selection.\n" \
"Defaults to 'true'." ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"true",
FALSE,
TRUE,
@@ -114,7 +114,7 @@ NADataDef data_def_conditions [] = {
"the mimetype patterns for the action to appear.\n" \
"This obviously only applies when there is a selection.\n" \
"Defaults to '*/*'." ),
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
"[*/*]",
FALSE,
TRUE,
@@ -147,7 +147,7 @@ NADataDef 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",
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"true",
FALSE,
TRUE,
@@ -178,7 +178,7 @@ NADataDef data_def_conditions [] = {
"(your configuration will never appear).\n" \
"This obviously only applies when there is a selection.\n" \
"Defaults to 'true'." ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"true",
FALSE,
TRUE,
@@ -209,7 +209,7 @@ NADataDef data_def_conditions [] = {
"(your configuration will never appear).\n" \
"This obviously only applies when there is a selection.\n" \
"Defaults to 'false'." ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"false",
FALSE,
TRUE,
@@ -238,7 +238,7 @@ NADataDef 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'." ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"false",
FALSE,
FALSE,
@@ -278,7 +278,7 @@ NADataDef 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'." ),
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
"[*]",
FALSE,
TRUE,
@@ -304,7 +304,7 @@ NADataDef 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 '/'." ),
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
"[/]",
FALSE,
TRUE,
@@ -331,7 +331,7 @@ NADataDef data_def_conditions [] = {
"This is a string of the form \"{'<'|'='|'>'} number\".\n" \
"Examples of valid strings are: \"=0\", \"> 1\", \"< 10\".\n" \
"Defaults to \">0\"." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
">0",
FALSE,
TRUE,
@@ -353,7 +353,7 @@ NADataDef data_def_conditions [] = {
TRUE,
N_( "Only show in environment" ),
N_( "Defaults to all." ),
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
NULL,
FALSE,
TRUE,
@@ -375,7 +375,7 @@ NADataDef data_def_conditions [] = {
TRUE,
N_( "Not show in environment" ),
N_( "Defaults to none." ),
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
NULL,
FALSE,
TRUE,
@@ -401,7 +401,7 @@ NADataDef 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." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
TRUE,
@@ -427,7 +427,7 @@ NADataDef 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." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
TRUE,
@@ -453,7 +453,7 @@ NADataDef 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." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
TRUE,
@@ -479,7 +479,7 @@ NADataDef 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." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
TRUE,
@@ -511,7 +511,7 @@ NADataDef data_def_conditions [] = {
"- 'Executable': selected items are executable by user\n" \
"- 'Local': selected items are local.\n" \
"Defaults to empty list." ),
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
NULL,
FALSE,
TRUE,
diff --git a/src/core/na-ifactory-object.c b/src/core/na-ifactory-object.c
index 91833d6..94dab89 100644
--- a/src/core/na-ifactory-object.c
+++ b/src/core/na-ifactory-object.c
@@ -214,8 +214,8 @@ na_ifactory_object_get_data_groups( const NAIFactoryObject *object )
* @object: this #NAIFactoryObject instance.
* @name: the elementary data whose value is to be got.
*
- * If the type of the value is %NAFD_TYPE_STRING, %NAFD_TYPE_LOCALE_STRING,
- * or %NAFD_TYPE_STRING_LIST, then the returned value is a newly allocated
+ * 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
* one and should be g_free() (resp. na_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 1db71e2..6ab95fd 100644
--- a/src/core/na-object-action-factory.c
+++ b/src/core/na-object-action-factory.c
@@ -53,7 +53,7 @@ static NADataDef data_def_action [] = {
TRUE,
"Version of the format",
"The version of the configuration format that will be used to manage backward compatibility.",
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
TRUE,
@@ -79,7 +79,7 @@ static NADataDef 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." ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"true",
FALSE,
TRUE,
@@ -105,7 +105,7 @@ static NADataDef 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" ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"false",
FALSE,
TRUE,
@@ -130,7 +130,7 @@ static NADataDef data_def_action [] = {
"This only applies to current location.\n" \
"Note that menus are never displayed in the toolbar.\n" \
"Defaults to FALSE." ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"false",
FALSE,
TRUE,
@@ -154,7 +154,7 @@ static NADataDef 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."),
- NAFD_TYPE_LOCALE_STRING,
+ NA_DATA_TYPE_LOCALE_STRING,
"",
FALSE,
TRUE,
@@ -181,7 +181,7 @@ static NADataDef 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 ?",
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"true",
FALSE,
TRUE,
@@ -206,7 +206,7 @@ static NADataDef 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.",
- NAFD_TYPE_UINT,
+ NA_DATA_TYPE_UINT,
"0",
FALSE,
TRUE,
@@ -237,7 +237,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Command path",
NULL,
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
FALSE,
@@ -259,7 +259,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Command parameters",
NULL,
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
FALSE,
@@ -281,7 +281,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Basenames",
NULL,
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
NULL,
FALSE,
FALSE,
@@ -303,7 +303,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Case sensitive",
NULL,
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
NULL,
FALSE,
FALSE,
@@ -325,7 +325,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Mimetypes",
NULL,
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
NULL,
FALSE,
FALSE,
@@ -347,7 +347,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Applies to files only",
NULL,
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
NULL,
FALSE,
FALSE,
@@ -369,7 +369,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Applies to directories only",
NULL,
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
NULL,
FALSE,
FALSE,
@@ -391,7 +391,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Multiple selection",
NULL,
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
NULL,
FALSE,
FALSE,
@@ -413,7 +413,7 @@ NADataDef data_def_action_v1 [] = {
FALSE,
"Schemes",
NULL,
- NAFD_TYPE_STRING_LIST,
+ NA_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 c32cd47..1cd99ae 100644
--- a/src/core/na-object-id-factory.c
+++ b/src/core/na-object-id-factory.c
@@ -49,7 +49,7 @@ NADataDef 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).",
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
TRUE,
@@ -73,7 +73,7 @@ NADataDef data_def_id [] = {
TRUE,
"NAObjectId Parent",
"The NAObjectItem which is the parent of this object.",
- NAFD_TYPE_POINTER,
+ NA_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 1e3b227..1716cf1 100644
--- a/src/core/na-object-item-factory.c
+++ b/src/core/na-object-item-factory.c
@@ -60,7 +60,7 @@ NADataDef data_def_item [] = {
"- 'Action',\n" \
"- 'Menu'.\n" \
"The value is case sensitive and must not be localized." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
NULL,
FALSE,
FALSE,
@@ -88,7 +88,7 @@ NADataDef 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." ),
- NAFD_TYPE_LOCALE_STRING,
+ NA_DATA_TYPE_LOCALE_STRING,
"",
FALSE,
TRUE,
@@ -112,7 +112,7 @@ NADataDef 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." ),
- NAFD_TYPE_LOCALE_STRING,
+ NA_DATA_TYPE_LOCALE_STRING,
"",
FALSE,
TRUE,
@@ -137,7 +137,7 @@ NADataDef 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." ),
- NAFD_TYPE_LOCALE_STRING,
+ NA_DATA_TYPE_LOCALE_STRING,
"",
FALSE,
TRUE,
@@ -161,7 +161,7 @@ NADataDef data_def_item [] = {
FALSE,
"Unlocalized icon name or path",
NULL,
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"",
FALSE,
FALSE,
@@ -184,7 +184,7 @@ NADataDef 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." ),
- NAFD_TYPE_LOCALE_STRING,
+ NA_DATA_TYPE_LOCALE_STRING,
"",
FALSE,
TRUE,
@@ -211,7 +211,7 @@ NADataDef 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." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"",
FALSE,
TRUE,
@@ -235,7 +235,7 @@ NADataDef data_def_item [] = {
TRUE,
"Subitems",
"List of subitems objects",
- NAFD_TYPE_POINTER,
+ NA_DATA_TYPE_POINTER,
NULL,
FALSE,
FALSE, /* not copyable */
@@ -263,7 +263,7 @@ NADataDef 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." ),
- NAFD_TYPE_STRING_LIST,
+ NA_DATA_TYPE_STRING_LIST,
NULL,
FALSE,
FALSE,
@@ -287,7 +287,7 @@ NADataDef 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." ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"true",
FALSE,
TRUE,
@@ -317,7 +317,7 @@ NADataDef 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.",
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"false",
FALSE,
TRUE,
@@ -341,7 +341,7 @@ NADataDef data_def_item [] = {
TRUE,
"I/O provider",
"A pointer to the NAIOProvider object.",
- NAFD_TYPE_POINTER,
+ NA_DATA_TYPE_POINTER,
NULL,
FALSE,
TRUE,
@@ -368,7 +368,7 @@ NADataDef data_def_item [] = {
TRUE,
"I/O provider data",
"A pointer to some NAIOProvider specific data.",
- NAFD_TYPE_POINTER,
+ NA_DATA_TYPE_POINTER,
NULL,
FALSE,
FALSE,
@@ -401,7 +401,7 @@ NADataDef data_def_item [] = {
TRUE,
N_( "Version of the format" ),
N_( "The version of the configuration format that will be used to manage backward compatibility." ),
- NAFD_TYPE_UINT,
+ NA_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 8b2c373..b222927 100644
--- a/src/core/na-object-profile-factory.c
+++ b/src/core/na-object-profile-factory.c
@@ -50,7 +50,7 @@ static NADataDef 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." ),
- NAFD_TYPE_LOCALE_STRING,
+ NA_DATA_TYPE_LOCALE_STRING,
"",
FALSE,
TRUE,
@@ -74,7 +74,7 @@ static NADataDef data_def_profile [] = {
FALSE,
"Unlocalized name of the profile",
NULL,
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"",
FALSE,
FALSE,
@@ -101,7 +101,7 @@ static NADataDef 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." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"",
FALSE,
TRUE,
@@ -166,7 +166,7 @@ static NADataDef 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." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"",
FALSE,
TRUE,
@@ -189,7 +189,7 @@ static NADataDef data_def_profile [] = {
N_( "Working directory" ),
N_( "The working directory the command will be started in.\n" \
"Defaults to \"%d\"." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"%d",
FALSE,
TRUE,
@@ -221,7 +221,7 @@ static NADataDef data_def_profile [] = {
"standard streams (stdout, stderr) should be collected and displayed; " \
"an acceptable fallback is Terminal.\n" \
"Defaults to \"Normal\"." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"Normal",
FALSE,
TRUE,
@@ -244,7 +244,7 @@ static NADataDef data_def_profile [] = {
N_( "Startup notify" ),
N_( "Only relevant when ExecutionMode=Normal.\n" \
"Defaults to FALSE." ),
- NAFD_TYPE_BOOLEAN,
+ NA_DATA_TYPE_BOOLEAN,
"false",
FALSE,
TRUE,
@@ -267,7 +267,7 @@ static NADataDef data_def_profile [] = {
N_( "Startup WM Class" ),
N_( "Only relevant when ExecutionMode=Normal.\n" \
"Defaults to empty." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"",
FALSE,
TRUE,
@@ -292,7 +292,7 @@ static NADataDef 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." ),
- NAFD_TYPE_STRING,
+ NA_DATA_TYPE_STRING,
"",
FALSE,
TRUE,
diff --git a/src/core/na-settings.c b/src/core/na-settings.c
index de70ed7..0c6f289 100644
--- a/src/core/na-settings.c
+++ b/src/core/na-settings.c
@@ -38,6 +38,7 @@
#include <strings.h>
#include <api/na-boxed.h>
+#include <api/na-data-types.h>
#include <api/na-core-utils.h>
#include <api/na-timeout.h>
@@ -104,59 +105,59 @@ typedef struct {
KeyDef;
static const KeyDef st_def_keys[] = {
- { NA_IPREFS_ADMIN_PREFERENCES_LOCKED, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_ADMIN_IO_PROVIDERS_LOCKED, GROUP_RUNTIME, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_ASSISTANT_ESC_CONFIRM, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_ASSISTANT_ESC_QUIT, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_CAPABILITY_ADD_CAPABILITY_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_COMMAND_CHOOSER_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_COMMAND_CHOOSER_URI, GROUP_NACT, NA_BOXED_TYPE_STRING, "file:///bin" },
- { NA_IPREFS_COMMAND_LEGEND_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_CONFIRM_LOGOUT_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_WORKING_DIR_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_WORKING_DIR_URI, GROUP_NACT, NA_BOXED_TYPE_STRING, "file:///" },
- { NA_IPREFS_SHOW_IF_RUNNING_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_SHOW_IF_RUNNING_URI, GROUP_NACT, NA_BOXED_TYPE_STRING, "file:///bin" },
- { NA_IPREFS_TRY_EXEC_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_TRY_EXEC_URI, GROUP_NACT, NA_BOXED_TYPE_STRING, "file:///bin" },
- { NA_IPREFS_EXPORT_ASK_USER_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_EXPORT_ASK_USER_LAST_FORMAT, GROUP_NACT, NA_BOXED_TYPE_STRING, NA_IPREFS_DEFAULT_EXPORT_FORMAT },
- { NA_IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_EXPORT_ASSISTANT_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_EXPORT_ASSISTANT_URI, GROUP_NACT, NA_BOXED_TYPE_STRING, "file:///tmp" },
- { NA_IPREFS_EXPORT_PREFERRED_FORMAT, GROUP_NACT, NA_BOXED_TYPE_STRING, NA_IPREFS_DEFAULT_EXPORT_FORMAT },
- { NA_IPREFS_FOLDER_CHOOSER_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_FOLDER_CHOOSER_URI, GROUP_NACT, NA_BOXED_TYPE_STRING, "file:///" },
- { NA_IPREFS_IMPORT_ASK_USER_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_IMPORT_ASK_USER_LAST_MODE, GROUP_NACT, NA_BOXED_TYPE_STRING, NA_IPREFS_DEFAULT_IMPORT_MODE },
- { NA_IPREFS_IMPORT_ASSISTANT_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_IMPORT_ASSISTANT_URI, GROUP_NACT, NA_BOXED_TYPE_STRING, "file:///tmp" },
- { NA_IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_IMPORT_PREFERRED_MODE, GROUP_NACT, NA_BOXED_TYPE_STRING, NA_IPREFS_DEFAULT_IMPORT_MODE },
- { NA_IPREFS_IO_PROVIDERS_WRITE_ORDER, GROUP_NACT, NA_BOXED_TYPE_STRING_LIST, "" },
- { NA_IPREFS_ICON_CHOOSER_URI, GROUP_NACT, NA_BOXED_TYPE_STRING, "file:///" },
- { NA_IPREFS_ICON_CHOOSER_PANED, GROUP_NACT, NA_BOXED_TYPE_UINT, "200" },
- { NA_IPREFS_ICON_CHOOSER_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_ITEMS_ADD_ABOUT_ITEM, GROUP_RUNTIME, NA_BOXED_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_ITEMS_CREATE_ROOT_MENU, GROUP_RUNTIME, NA_BOXED_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER, GROUP_RUNTIME, NA_BOXED_TYPE_STRING_LIST, "" },
- { NA_IPREFS_ITEMS_LIST_ORDER_MODE, GROUP_RUNTIME, NA_BOXED_TYPE_STRING, NA_IPREFS_DEFAULT_LIST_ORDER_MODE },
- { NA_IPREFS_MAIN_PANED, GROUP_NACT, NA_BOXED_TYPE_UINT, "200" },
- { NA_IPREFS_MAIN_SAVE_AUTO, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_MAIN_SAVE_PERIOD, GROUP_NACT, NA_BOXED_TYPE_UINT, "5" },
- { NA_IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_MAIN_TOOLBAR_FILE_DISPLAY, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_MAIN_TOOLBAR_HELP_DISPLAY, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_MAIN_WINDOW_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_PREFERENCES_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_RELABEL_DUPLICATE_ACTION, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_RELABEL_DUPLICATE_MENU, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_RELABEL_DUPLICATE_PROFILE, GROUP_NACT, NA_BOXED_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_SCHEME_ADD_SCHEME_WSP, GROUP_NACT, NA_BOXED_TYPE_UINT_LIST, "" },
- { NA_IPREFS_SCHEME_DEFAULT_LIST, GROUP_NACT, NA_BOXED_TYPE_STRING_LIST, "" },
- { NA_IPREFS_IO_PROVIDER_READABLE, NA_IPREFS_IO_PROVIDER_GROUP, NA_BOXED_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_IO_PROVIDER_WRITABLE, NA_IPREFS_IO_PROVIDER_GROUP, NA_BOXED_TYPE_BOOLEAN, "true" },
+ { 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_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, NA_IPREFS_DEFAULT_EXPORT_FORMAT },
+ { 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_PREFERRED_FORMAT, GROUP_NACT, NA_DATA_TYPE_STRING, NA_IPREFS_DEFAULT_EXPORT_FORMAT },
+ { 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, NA_IPREFS_DEFAULT_IMPORT_MODE },
+ { 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, NA_IPREFS_DEFAULT_IMPORT_MODE },
+ { 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, NA_IPREFS_DEFAULT_LIST_ORDER_MODE },
+ { 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_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_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_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" },
{ 0 }
};
@@ -1249,11 +1250,11 @@ read_key_value_from_key_file( GKeyFile *key_file, const gchar *group, const gcha
switch( key_def->type ){
- case NA_BOXED_TYPE_STRING:
- case NA_BOXED_TYPE_STRING_LIST:
- case NA_BOXED_TYPE_UINT:
- case NA_BOXED_TYPE_UINT_LIST:
- case NA_BOXED_TYPE_BOOLEAN:
+ 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:
str = g_key_file_get_string( 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 ){
@@ -1267,13 +1268,13 @@ read_key_value_from_key_file( GKeyFile *key_file, const gchar *group, const gcha
value->group = g_strdup( group );
value->def = key_def;
switch( key_def->type ){
- case NA_BOXED_TYPE_STRING:
- case NA_BOXED_TYPE_UINT:
- case NA_BOXED_TYPE_BOOLEAN:
+ case NA_DATA_TYPE_STRING:
+ case NA_DATA_TYPE_UINT:
+ case NA_DATA_TYPE_BOOLEAN:
value->boxed = na_boxed_new_from_string( key_def->type, str );
break;
- case NA_BOXED_TYPE_STRING_LIST:
- case NA_BOXED_TYPE_UINT_LIST:
+ case NA_DATA_TYPE_STRING_LIST:
+ case NA_DATA_TYPE_UINT_LIST:
value->boxed = na_boxed_new_from_string_with_sep( key_def->type, str, ";" );
break;
}
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 72580c8..8859ff4 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -519,7 +519,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
switch( def->type ){
- case NAFD_TYPE_LOCALE_STRING:
+ case NA_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 = na_data_boxed_new( def );
@@ -528,7 +528,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
g_free( str_value );
break;
- case NAFD_TYPE_STRING:
+ case NA_DATA_TYPE_STRING:
str_value = nadp_desktop_file_get_string( nrd->ndf, group, def->desktop_entry, &found, def->default_value );
if( found ){
boxed = na_data_boxed_new( def );
@@ -537,7 +537,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
g_free( str_value );
break;
- case NAFD_TYPE_BOOLEAN:
+ case NA_DATA_TYPE_BOOLEAN:
bool_value = nadp_desktop_file_get_boolean( nrd->ndf, group, def->desktop_entry, &found, na_core_utils_boolean_from_string( def->default_value ));
if( found ){
boxed = na_data_boxed_new( def );
@@ -545,7 +545,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
}
break;
- case NAFD_TYPE_STRING_LIST:
+ case NA_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 = na_data_boxed_new( def );
@@ -554,7 +554,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
na_core_utils_slist_free( slist_value );
break;
- case NAFD_TYPE_UINT:
+ case NA_DATA_TYPE_UINT:
uint_value = nadp_desktop_file_get_uint( nrd->ndf, group, def->desktop_entry, &found, atoi( def->default_value ));
if( found ){
boxed = na_data_boxed_new( def );
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 78aa54b..d3e2751 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -514,7 +514,7 @@ nadp_writer_ifactory_provider_write_data(
switch( def->type ){
- case NAFD_TYPE_STRING:
+ case NA_DATA_TYPE_STRING:
str_value = na_data_boxed_get_as_string( boxed );
if( !strcmp( def->name, NAFO_DATA_PATH )){
@@ -529,24 +529,24 @@ nadp_writer_ifactory_provider_write_data(
g_free( str_value );
break;
- case NAFD_TYPE_LOCALE_STRING:
+ case NA_DATA_TYPE_LOCALE_STRING:
str_value = na_data_boxed_get_as_string( boxed );
nadp_desktop_file_set_locale_string( ndf, group_name, def->desktop_entry, str_value );
g_free( str_value );
break;
- case NAFD_TYPE_BOOLEAN:
+ case NA_DATA_TYPE_BOOLEAN:
bool_value = GPOINTER_TO_UINT( na_data_boxed_get_as_void( boxed ));
nadp_desktop_file_set_boolean( ndf, group_name, def->desktop_entry, bool_value );
break;
- case NAFD_TYPE_STRING_LIST:
+ case NA_DATA_TYPE_STRING_LIST:
slist_value = ( GSList * ) na_data_boxed_get_as_void( boxed );
nadp_desktop_file_set_string_list( ndf, group_name, def->desktop_entry, slist_value );
na_core_utils_slist_free( slist_value );
break;
- case NAFD_TYPE_UINT:
+ case NA_DATA_TYPE_UINT:
uint_value = GPOINTER_TO_UINT( na_data_boxed_get_as_void( 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 467ffc0..4bbfa66 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -366,26 +366,26 @@ get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, Reade
switch( def->type ){
- case NAFD_TYPE_STRING:
- case NAFD_TYPE_LOCALE_STRING:
+ case NA_DATA_TYPE_STRING:
+ case NA_DATA_TYPE_LOCALE_STRING:
str_value = na_gconf_utils_read_string( provider->private->gconf, entry_path, TRUE, NULL );
g_debug( "%s: entry=%s, value=%s", thisfn, def->gconf_entry, str_value );
na_data_boxed_set_from_string( boxed, str_value );
g_free( str_value );
break;
- case NAFD_TYPE_BOOLEAN:
+ case NA_DATA_TYPE_BOOLEAN:
bool_value = na_gconf_utils_read_bool( provider->private->gconf, entry_path, TRUE, FALSE );
na_data_boxed_set_from_void( boxed, GUINT_TO_POINTER( bool_value ));
break;
- case NAFD_TYPE_STRING_LIST:
+ case NA_DATA_TYPE_STRING_LIST:
slist_value = na_gconf_utils_read_string_list( provider->private->gconf, entry_path );
na_data_boxed_set_from_void( boxed, slist_value );
na_core_utils_slist_free( slist_value );
break;
- case NAFD_TYPE_UINT:
+ case NA_DATA_TYPE_UINT:
int_value = na_gconf_utils_read_int( provider->private->gconf, entry_path, TRUE, 0 );
na_data_boxed_set_from_void( boxed, GUINT_TO_POINTER( int_value ));
break;
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index 1ba07ff..0029f3f 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -312,7 +312,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
switch( def->type ){
- case NAFD_TYPE_STRING:
+ case NA_DATA_TYPE_STRING:
str_value = na_data_boxed_get_as_string( boxed );
na_gconf_utils_write_string( gconf, path, str_value, &msg );
if( msg ){
@@ -322,7 +322,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
g_free( str_value );
break;
- case NAFD_TYPE_LOCALE_STRING:
+ case NA_DATA_TYPE_LOCALE_STRING:
str_value = na_data_boxed_get_as_string( boxed );
na_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 NAFD_TYPE_BOOLEAN:
+ case NA_DATA_TYPE_BOOLEAN:
bool_value = GPOINTER_TO_UINT( na_data_boxed_get_as_void( boxed ));
na_gconf_utils_write_bool( gconf, path, bool_value, &msg );
if( msg ){
@@ -341,7 +341,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
}
break;
- case NAFD_TYPE_STRING_LIST:
+ case NA_DATA_TYPE_STRING_LIST:
slist_value = ( GSList * ) na_data_boxed_get_as_void( boxed );
na_gconf_utils_write_string_list( gconf, path, slist_value, &msg );
if( msg ){
@@ -351,7 +351,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
na_core_utils_slist_free( slist_value );
break;
- case NAFD_TYPE_UINT:
+ case NA_DATA_TYPE_UINT:
uint_value = GPOINTER_TO_UINT( na_data_boxed_get_as_void( boxed ));
na_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 e897f59..5865c03 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -1198,14 +1198,14 @@ dump_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def )
string = NULL;
switch( def->type ){
- case NAFD_TYPE_STRING:
- case NAFD_TYPE_LOCALE_STRING:
- case NAFD_TYPE_UINT:
- case NAFD_TYPE_BOOLEAN:
+ case NA_DATA_TYPE_STRING:
+ case NA_DATA_TYPE_LOCALE_STRING:
+ case NA_DATA_TYPE_UINT:
+ case NA_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 NAFD_TYPE_STRING_LIST:
+ case NA_DATA_TYPE_STRING_LIST:
slist = NULL;
value_node = search_for_child_node( node, NAXML_KEY_DUMP_NODE_VALUE );
@@ -1231,7 +1231,7 @@ dump_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def )
na_core_utils_slist_free( slist );
break;
- case NAFD_TYPE_POINTER:
+ case NA_DATA_TYPE_POINTER:
default:
break;
}
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index dd0bad3..32129b7 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -525,7 +525,7 @@ write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const NADat
/* boolean value must be lowercase
*/
- if( def->type == NAFD_TYPE_BOOLEAN ){
+ if( def->type == NA_DATA_TYPE_BOOLEAN ){
gchar *tmp = g_ascii_strdown( value_str, -1 );
g_free( value_str );
value_str = tmp;
@@ -570,7 +570,7 @@ write_data_schema_v2_element( NAXMLWriter *writer, const NADataDef *def, const g
xmlFree( content );
xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_TYPE ), BAD_CAST( na_data_types_get_gconf_dump_key( def->type )));
- if( def->type == NAFD_TYPE_STRING_LIST ){
+ if( def->type == NA_DATA_TYPE_STRING_LIST ){
xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LISTTYPE ), BAD_CAST( "string" ));
}
@@ -627,7 +627,7 @@ write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const NADataBoxe
/* boolean value must be lowercase
*/
- if( def->type == NAFD_TYPE_BOOLEAN ){
+ if( def->type == NA_DATA_TYPE_BOOLEAN ){
gchar *tmp = g_ascii_strdown( value_str, -1 );
g_free( value_str );
value_str = tmp;
@@ -662,7 +662,7 @@ write_data_dump_element( NAXMLWriter *writer, const NADataDef *def, const NAData
value_node = xmlNewChild( entry_node, NULL, BAD_CAST( NAXML_KEY_DUMP_NODE_VALUE ), NULL );
- if( def->type == NAFD_TYPE_STRING_LIST ){
+ if( def->type == NA_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 b331c76..bbf1f94 100644
--- a/src/utils/na-print-schemas.c
+++ b/src/utils/na-print-schemas.c
@@ -346,7 +346,7 @@ attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const NADataDef *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( na_data_types_get_gconf_dump_key( def->type )));
- if( def->type == NAFD_TYPE_STRING_LIST ){
+ if( def->type == NA_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]
