[nautilus-actions/file-manager-actions] naxml-keys is renamed to fma-xml-keys
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] naxml-keys is renamed to fma-xml-keys
- Date: Tue, 8 Sep 2015 16:57:20 +0000 (UTC)
commit 7b23ebafc38b2362e14085ae6ca454e77dc428e7
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 17:20:38 2015 +0200
naxml-keys is renamed to fma-xml-keys
src/io-xml/Makefile.am | 4 +-
src/io-xml/{naxml-keys.c => fma-xml-keys.c} | 32 +++++++-------
src/io-xml/{naxml-keys.h => fma-xml-keys.h} | 54 ++++++++++++------------
src/io-xml/naxml-reader.c | 62 +++++++++++++-------------
src/io-xml/naxml-writer.c | 56 ++++++++++++------------
5 files changed, 104 insertions(+), 104 deletions(-)
---
diff --git a/src/io-xml/Makefile.am b/src/io-xml/Makefile.am
index 362aad6..06a7d7d 100644
--- a/src/io-xml/Makefile.am
+++ b/src/io-xml/Makefile.am
@@ -44,8 +44,8 @@ libna_io_xml_la_SOURCES = \
naxml-module.c \
naxml-provider.c \
naxml-provider.h \
- naxml-keys.c \
- naxml-keys.h \
+ fma-xml-keys.c \
+ fma-xml-keys.h \
fma-xml-formats.c \
fma-xml-formats.h \
naxml-reader.c \
diff --git a/src/io-xml/naxml-keys.c b/src/io-xml/fma-xml-keys.c
similarity index 56%
rename from src/io-xml/naxml-keys.c
rename to src/io-xml/fma-xml-keys.c
index 5788b51..e68a143 100644
--- a/src/io-xml/naxml-keys.c
+++ b/src/io-xml/fma-xml-keys.c
@@ -31,28 +31,28 @@
#include <config.h>
#endif
-#include "naxml-keys.h"
+#include "fma-xml-keys.h"
-NAXMLKeyStr naxml_schema_key_schema_str [] = {
- { NAXML_KEY_SCHEMA_NODE_KEY, TRUE, TRUE, FALSE },
- { NAXML_KEY_SCHEMA_NODE_APPLYTO, TRUE, TRUE, FALSE },
- { NAXML_KEY_SCHEMA_NODE_OWNER, TRUE, FALSE, FALSE },
- { NAXML_KEY_SCHEMA_NODE_TYPE, TRUE, TRUE, FALSE },
- { NAXML_KEY_SCHEMA_NODE_LISTTYPE, TRUE, TRUE, FALSE },
- { NAXML_KEY_SCHEMA_NODE_LOCALE, TRUE, TRUE, FALSE },
- { NAXML_KEY_SCHEMA_NODE_DEFAULT, TRUE, TRUE, FALSE },
+FMAXMLKeyStr naxml_schema_key_schema_str [] = {
+ { FMA_XML_KEY_SCHEMA_NODE_KEY, TRUE, TRUE, FALSE },
+ { FMA_XML_KEY_SCHEMA_NODE_APPLYTO, TRUE, TRUE, FALSE },
+ { FMA_XML_KEY_SCHEMA_NODE_OWNER, TRUE, FALSE, FALSE },
+ { FMA_XML_KEY_SCHEMA_NODE_TYPE, TRUE, TRUE, FALSE },
+ { FMA_XML_KEY_SCHEMA_NODE_LISTTYPE, TRUE, TRUE, FALSE },
+ { FMA_XML_KEY_SCHEMA_NODE_LOCALE, TRUE, TRUE, FALSE },
+ { FMA_XML_KEY_SCHEMA_NODE_DEFAULT, TRUE, TRUE, FALSE },
{ NULL }
};
-NAXMLKeyStr naxml_schema_key_locale_str [] = {
- { NAXML_KEY_SCHEMA_NODE_LOCALE_DEFAULT, TRUE, TRUE, FALSE },
- { NAXML_KEY_SCHEMA_NODE_LOCALE_SHORT, TRUE, FALSE, FALSE },
- { NAXML_KEY_SCHEMA_NODE_LOCALE_LONG, TRUE, FALSE, FALSE },
+FMAXMLKeyStr naxml_schema_key_locale_str [] = {
+ { FMA_XML_KEY_SCHEMA_NODE_LOCALE_DEFAULT, TRUE, TRUE, FALSE },
+ { FMA_XML_KEY_SCHEMA_NODE_LOCALE_SHORT, TRUE, FALSE, FALSE },
+ { FMA_XML_KEY_SCHEMA_NODE_LOCALE_LONG, TRUE, FALSE, FALSE },
{ NULL }
};
-NAXMLKeyStr naxml_dump_key_entry_str [] = {
- { NAXML_KEY_DUMP_NODE_KEY, TRUE, TRUE, FALSE },
- { NAXML_KEY_DUMP_NODE_VALUE, TRUE, TRUE, FALSE },
+FMAXMLKeyStr naxml_dump_key_entry_str [] = {
+ { FMA_XML_KEY_DUMP_NODE_KEY, TRUE, TRUE, FALSE },
+ { FMA_XML_KEY_DUMP_NODE_VALUE, TRUE, TRUE, FALSE },
{ NULL }
};
diff --git a/src/io-xml/naxml-keys.h b/src/io-xml/fma-xml-keys.h
similarity index 58%
rename from src/io-xml/naxml-keys.h
rename to src/io-xml/fma-xml-keys.h
index e1a28a0..761704f 100644
--- a/src/io-xml/naxml-keys.h
+++ b/src/io-xml/fma-xml-keys.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAXML_KEYS_H__
-#define __NAXML_KEYS_H__
+#ifndef __IO_XML_FMA_XML_KEYS_H__
+#define __IO_XML_FMA_XML_KEYS_H__
#include <api/fma-data-def.h>
@@ -44,23 +44,23 @@ G_BEGIN_DECLS
* Starting with 1.11, we have introduced a lighter export schema
* (without owner and short and long descriptions)
*/
-#define NAXML_KEY_SCHEMA_ROOT "gconfschemafile"
-#define NAXML_KEY_SCHEMA_LIST "schemalist"
-#define NAXML_KEY_SCHEMA_NODE "schema"
+#define FMA_XML_KEY_SCHEMA_ROOT "gconfschemafile"
+#define FMA_XML_KEY_SCHEMA_LIST "schemalist"
+#define FMA_XML_KEY_SCHEMA_NODE "schema"
-#define NAXML_KEY_SCHEMA_NODE_KEY "key"
-#define NAXML_KEY_SCHEMA_NODE_APPLYTO "applyto"
-#define NAXML_KEY_SCHEMA_NODE_OWNER "owner" /* v1 only */
-#define NAXML_KEY_SCHEMA_NODE_TYPE "type"
-#define NAXML_KEY_SCHEMA_NODE_LISTTYPE "list_type"
-#define NAXML_KEY_SCHEMA_NODE_LOCALE "locale"
-#define NAXML_KEY_SCHEMA_NODE_DEFAULT "default"
+#define FMA_XML_KEY_SCHEMA_NODE_KEY "key"
+#define FMA_XML_KEY_SCHEMA_NODE_APPLYTO "applyto"
+#define FMA_XML_KEY_SCHEMA_NODE_OWNER "owner" /* v1 only */
+#define FMA_XML_KEY_SCHEMA_NODE_TYPE "type"
+#define FMA_XML_KEY_SCHEMA_NODE_LISTTYPE "list_type"
+#define FMA_XML_KEY_SCHEMA_NODE_LOCALE "locale"
+#define FMA_XML_KEY_SCHEMA_NODE_DEFAULT "default"
-#define NAXML_KEY_SCHEMA_NODE_LOCALE_DEFAULT "default"
-#define NAXML_KEY_SCHEMA_NODE_LOCALE_SHORT "short" /* v1 only */
-#define NAXML_KEY_SCHEMA_NODE_LOCALE_LONG "long" /* v1 only */
+#define FMA_XML_KEY_SCHEMA_NODE_LOCALE_DEFAULT "default"
+#define FMA_XML_KEY_SCHEMA_NODE_LOCALE_SHORT "short" /* v1 only */
+#define FMA_XML_KEY_SCHEMA_NODE_LOCALE_LONG "long" /* v1 only */
-/* this structure is statically allocated (cf. naxml-keys.c)
+/* this structure is statically allocated (cf. fma-xml-keys.c)
* and let us check the validity of each element node
*/
typedef struct {
@@ -70,24 +70,24 @@ typedef struct {
gboolean reader_found; /* dynamic data */
}
- NAXMLKeyStr;
+ FMAXMLKeyStr;
/* XML element names (GConf dump)
* used in FORMAT_GCONF_ENTRY
*/
-#define NAXML_KEY_DUMP_ROOT "gconfentryfile"
-#define NAXML_KEY_DUMP_LIST "entrylist"
-#define NAXML_KEY_DUMP_NODE "entry"
+#define FMA_XML_KEY_DUMP_ROOT "gconfentryfile"
+#define FMA_XML_KEY_DUMP_LIST "entrylist"
+#define FMA_XML_KEY_DUMP_NODE "entry"
-#define NAXML_KEY_DUMP_LIST_PARM_BASE "base"
+#define FMA_XML_KEY_DUMP_LIST_PARM_BASE "base"
-#define NAXML_KEY_DUMP_NODE_KEY "key"
-#define NAXML_KEY_DUMP_NODE_VALUE "value"
+#define FMA_XML_KEY_DUMP_NODE_KEY "key"
+#define FMA_XML_KEY_DUMP_NODE_VALUE "value"
-#define NAXML_KEY_DUMP_NODE_VALUE_TYPE_STRING "string"
-#define NAXML_KEY_DUMP_NODE_VALUE_LIST "list"
-#define NAXML_KEY_DUMP_NODE_VALUE_LIST_PARM_TYPE "type"
+#define FMA_XML_KEY_DUMP_NODE_VALUE_TYPE_STRING "string"
+#define FMA_XML_KEY_DUMP_NODE_VALUE_LIST "list"
+#define FMA_XML_KEY_DUMP_NODE_VALUE_LIST_PARM_TYPE "type"
G_END_DECLS
-#endif /* __NAXML_KEYS_H__ */
+#endif /* __IO_XML_FMA_XML_KEYS_H__ */
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index ccd4b6d..cfc3e69 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -43,7 +43,7 @@
#include <io-gconf/fma-gconf-keys.h>
-#include "naxml-keys.h"
+#include "fma-xml-keys.h"
#include "naxml-reader.h"
/* private class data
@@ -94,8 +94,8 @@ struct _NAXMLReaderPrivate {
gboolean node_ok;
};
-extern NAXMLKeyStr naxml_schema_key_schema_str[];
-extern NAXMLKeyStr naxml_dump_key_entry_str[];
+extern FMAXMLKeyStr naxml_schema_key_schema_str[];
+extern FMAXMLKeyStr naxml_dump_key_entry_str[];
static GObjectClass *st_parent_class = NULL;
@@ -119,10 +119,10 @@ static gchar *dump_read_value( NAXMLReader *reader, xmlNode *node, const
static RootNodeStr st_root_node_str[] = {
- { NAXML_KEY_SCHEMA_ROOT,
- NAXML_KEY_SCHEMA_LIST,
- NAXML_KEY_SCHEMA_NODE,
- NAXML_KEY_SCHEMA_NODE_APPLYTO,
+ { FMA_XML_KEY_SCHEMA_ROOT,
+ FMA_XML_KEY_SCHEMA_LIST,
+ FMA_XML_KEY_SCHEMA_NODE,
+ FMA_XML_KEY_SCHEMA_NODE_APPLYTO,
6,
NULL,
NULL,
@@ -130,10 +130,10 @@ static RootNodeStr st_root_node_str[] = {
schema_parse_schema_content,
schema_read_value },
- { NAXML_KEY_DUMP_ROOT,
- NAXML_KEY_DUMP_LIST,
- NAXML_KEY_DUMP_NODE,
- NAXML_KEY_DUMP_NODE_KEY,
+ { FMA_XML_KEY_DUMP_ROOT,
+ FMA_XML_KEY_DUMP_LIST,
+ FMA_XML_KEY_DUMP_NODE,
+ FMA_XML_KEY_DUMP_NODE_KEY,
1,
NULL,
dump_parse_list_parms,
@@ -167,7 +167,7 @@ static guint iter_on_root_children( NAXMLReader *reader, xmlNode *root )
static guint iter_on_list_children( NAXMLReader *reader, xmlNode *first );
static gchar *slist_to_string( GSList *slist );
-static gchar *build_key_node_list( NAXMLKeyStr *strlist );
+static gchar *build_key_node_list( FMAXMLKeyStr *strlist );
static gchar *build_root_node_list( void );
static gchar *get_value_from_child_node( xmlNode *node, const gchar *child );
static gchar *get_value_from_child_child_node( xmlNode *node, const gchar *first, const gchar *second
);
@@ -954,7 +954,7 @@ static guint
schema_parse_schema_content( NAXMLReader *reader, xmlNode *schema )
{
xmlNode *iter;
- NAXMLKeyStr *str;
+ FMAXMLKeyStr *str;
int i;
guint code;
@@ -999,7 +999,7 @@ schema_parse_schema_content( NAXMLReader *reader, xmlNode *schema )
* each item)
* - starting with v 3, only <applyto> key has this id
*/
- if( !strxcmp( iter->name, NAXML_KEY_SCHEMA_NODE_APPLYTO )){
+ if( !strxcmp( iter->name, FMA_XML_KEY_SCHEMA_NODE_APPLYTO )){
schema_check_for_id( reader, iter );
if( !reader->private->node_ok ){
continue;
@@ -1008,7 +1008,7 @@ schema_parse_schema_content( NAXMLReader *reader, xmlNode *schema )
/* search for the type of the item
*/
- if( !strxcmp( iter->name, NAXML_KEY_SCHEMA_NODE_APPLYTO )){
+ if( !strxcmp( iter->name, FMA_XML_KEY_SCHEMA_NODE_APPLYTO )){
schema_check_for_type( reader, iter );
if( !reader->private->node_ok ){
continue;
@@ -1027,7 +1027,7 @@ schema_check_for_id( NAXMLReader *reader, xmlNode *iter )
{
guint idx = 0;
- if( !strxcmp( iter->name, NAXML_KEY_SCHEMA_NODE_KEY )){
+ if( !strxcmp( iter->name, FMA_XML_KEY_SCHEMA_NODE_KEY )){
idx = 1;
}
@@ -1063,7 +1063,7 @@ schema_check_for_type( NAXMLReader *reader, xmlNode *iter )
if( !strcmp( entry, FMA_GCONF_ENTRY_TYPE )){
reader->private->type_found = TRUE;
- gchar *type = get_value_from_child_node( iter->parent, NAXML_KEY_SCHEMA_NODE_DEFAULT );
+ gchar *type = get_value_from_child_node( iter->parent, FMA_XML_KEY_SCHEMA_NODE_DEFAULT );
if( !strcmp( type, FMA_GCONF_VALUE_TYPE_ACTION )){
reader->private->parms->imported = FMA_OBJECT_ITEM( fma_object_action_new());
@@ -1089,9 +1089,9 @@ schema_read_value( NAXMLReader *reader, xmlNode *node, const FMADataDef *def )
gchar *value;
if( def->localizable ){
- value = get_value_from_child_child_node( node, NAXML_KEY_SCHEMA_NODE_LOCALE,
NAXML_KEY_SCHEMA_NODE_LOCALE_DEFAULT );
+ value = get_value_from_child_child_node( node, FMA_XML_KEY_SCHEMA_NODE_LOCALE,
FMA_XML_KEY_SCHEMA_NODE_LOCALE_DEFAULT );
} else {
- value = get_value_from_child_node( node, NAXML_KEY_SCHEMA_NODE_DEFAULT );
+ value = get_value_from_child_node( node, FMA_XML_KEY_SCHEMA_NODE_DEFAULT );
}
/*g_debug( "name=%s, localizable=%s, value=%s", def->name, def->localizable ? "True":"False", value
);*/
@@ -1109,7 +1109,7 @@ dump_parse_list_parms( NAXMLReader *reader, xmlNode *node )
code = IMPORTER_CODE_OK;
- xmlChar *path = xmlGetProp( node, ( const xmlChar * ) NAXML_KEY_DUMP_LIST_PARM_BASE );
+ xmlChar *path = xmlGetProp( node, ( const xmlChar * ) FMA_XML_KEY_DUMP_LIST_PARM_BASE );
reader->private->item_id = g_path_get_basename(( const gchar * ) path );
xmlFree( path );
@@ -1124,7 +1124,7 @@ static guint
dump_parse_entry_content( NAXMLReader *reader, xmlNode *entry )
{
xmlNode *iter;
- NAXMLKeyStr *str;
+ FMAXMLKeyStr *str;
int i;
guint code;
@@ -1165,7 +1165,7 @@ dump_parse_entry_content( NAXMLReader *reader, xmlNode *entry )
/* search for the type of the item
*/
- if( !strxcmp( iter->name, NAXML_KEY_DUMP_NODE_KEY )){
+ if( !strxcmp( iter->name, FMA_XML_KEY_DUMP_NODE_KEY )){
dump_check_for_type( reader, iter );
@@ -1188,7 +1188,7 @@ dump_check_for_type( NAXMLReader *reader, xmlNode *key_node )
if( !strxcmp( key_content, FMA_GCONF_ENTRY_TYPE )){
reader->private->type_found = TRUE;
- gchar *type = get_value_from_child_child_node( key_node->parent, NAXML_KEY_DUMP_NODE_VALUE,
NAXML_KEY_DUMP_NODE_VALUE_TYPE_STRING );
+ gchar *type = get_value_from_child_child_node( key_node->parent, FMA_XML_KEY_DUMP_NODE_VALUE,
FMA_XML_KEY_DUMP_NODE_VALUE_TYPE_STRING );
if( !strcmp( type, FMA_GCONF_VALUE_TYPE_ACTION )){
reader->private->parms->imported = FMA_OBJECT_ITEM( fma_object_action_new());
@@ -1228,23 +1228,23 @@ dump_read_value( NAXMLReader *reader, xmlNode *node, const FMADataDef *def )
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 );
+ string = get_value_from_child_child_node( node, FMA_XML_KEY_DUMP_NODE_VALUE,
FMA_XML_KEY_DUMP_NODE_VALUE_TYPE_STRING );
break;
case FMA_DATA_TYPE_STRING_LIST:
slist = NULL;
- value_node = search_for_child_node( node, NAXML_KEY_DUMP_NODE_VALUE );
+ value_node = search_for_child_node( node, FMA_XML_KEY_DUMP_NODE_VALUE );
if( value_node ){
- list_node = search_for_child_node( value_node, NAXML_KEY_DUMP_NODE_VALUE_LIST
);
+ list_node = search_for_child_node( value_node,
FMA_XML_KEY_DUMP_NODE_VALUE_LIST );
if( list_node ){
- vv_node = search_for_child_node( list_node, NAXML_KEY_DUMP_NODE_VALUE
);
+ vv_node = search_for_child_node( list_node,
FMA_XML_KEY_DUMP_NODE_VALUE );
for( it = vv_node->children ; it ; it = it->next ){
if( it->type == XML_ELEMENT_NODE &&
- !strxcmp( it->name,
NAXML_KEY_DUMP_NODE_VALUE_TYPE_STRING )){
+ !strxcmp( it->name,
FMA_XML_KEY_DUMP_NODE_VALUE_TYPE_STRING )){
text = xmlNodeGetContent( it );
slist = g_slist_append( slist, ( gchar * ) text );
@@ -1288,11 +1288,11 @@ slist_to_string( GSList *slist )
}
static gchar *
-build_key_node_list( NAXMLKeyStr *strlist )
+build_key_node_list( FMAXMLKeyStr *strlist )
{
- NAXMLKeyStr *next;
+ FMAXMLKeyStr *next;
- NAXMLKeyStr *istr = strlist;
+ FMAXMLKeyStr *istr = strlist;
GString *string = g_string_new( "" );
while( istr->key ){
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index 45a8b08..28c7771 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -45,7 +45,7 @@
#include <io-gconf/fma-gconf-keys.h>
#include "fma-xml-formats.h"
-#include "naxml-keys.h"
+#include "fma-xml-keys.h"
#include "naxml-writer.h"
typedef struct ExportFormatFn ExportFormatFn;
@@ -128,26 +128,26 @@ static guint writer_to_buffer( NAXMLWriter *writer );
static ExportFormatFn st_export_format_fn[] = {
{ FMA_XML_FORMAT_GCONF_SCHEMA_V1,
- NAXML_KEY_SCHEMA_ROOT,
- NAXML_KEY_SCHEMA_LIST,
+ FMA_XML_KEY_SCHEMA_ROOT,
+ FMA_XML_KEY_SCHEMA_LIST,
NULL,
- NAXML_KEY_SCHEMA_NODE,
+ FMA_XML_KEY_SCHEMA_NODE,
write_data_schema_v1,
write_type_schema_v1 },
{ FMA_XML_FORMAT_GCONF_SCHEMA_V2,
- NAXML_KEY_SCHEMA_ROOT,
- NAXML_KEY_SCHEMA_LIST,
+ FMA_XML_KEY_SCHEMA_ROOT,
+ FMA_XML_KEY_SCHEMA_LIST,
NULL,
- NAXML_KEY_SCHEMA_NODE,
+ FMA_XML_KEY_SCHEMA_NODE,
write_data_schema_v2,
write_type_schema_v2 },
{ FMA_XML_FORMAT_GCONF_ENTRY,
- NAXML_KEY_DUMP_ROOT,
- NAXML_KEY_DUMP_LIST,
+ FMA_XML_KEY_DUMP_ROOT,
+ FMA_XML_KEY_DUMP_LIST,
write_list_attribs_dump,
- NAXML_KEY_DUMP_NODE,
+ FMA_XML_KEY_DUMP_NODE,
write_data_dump,
write_type_dump },
@@ -514,13 +514,13 @@ static void
write_data_schema_v1_element( NAXMLWriter *writer, const FMADataDef *def )
{
if( !writer->private->locale_node ){
- writer->private->locale_node = xmlNewChild( writer->private->schema_node, NULL, BAD_CAST(
NAXML_KEY_SCHEMA_NODE_LOCALE ), NULL );
+ writer->private->locale_node = xmlNewChild( writer->private->schema_node, NULL, BAD_CAST(
FMA_XML_KEY_SCHEMA_NODE_LOCALE ), NULL );
xmlNewProp( writer->private->locale_node, BAD_CAST( "name" ), BAD_CAST( "C" ));
}
- xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_OWNER ), BAD_CAST(
PACKAGE_TARNAME ));
- xmlNewChild( writer->private->locale_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LOCALE_SHORT ),
BAD_CAST( gettext( def->short_label )));
- xmlNewChild( writer->private->locale_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LOCALE_LONG ),
BAD_CAST( gettext( def->long_label )));
+ xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_OWNER ), BAD_CAST(
PACKAGE_TARNAME ));
+ xmlNewChild( writer->private->locale_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_LOCALE_SHORT ),
BAD_CAST( gettext( def->short_label )));
+ xmlNewChild( writer->private->locale_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_LOCALE_LONG ),
BAD_CAST( gettext( def->long_label )));
}
static void
@@ -594,31 +594,31 @@ write_data_schema_v2_element( NAXMLWriter *writer, const FMADataDef *def, const
xmlChar *content;
xmlNodePtr parent_value_node;
- writer->private->schema_node = xmlNewChild( writer->private->list_node, NULL, BAD_CAST(
NAXML_KEY_SCHEMA_NODE ), NULL );
+ writer->private->schema_node = xmlNewChild( writer->private->list_node, NULL, BAD_CAST(
FMA_XML_KEY_SCHEMA_NODE ), NULL );
content = BAD_CAST( g_build_path( "/", FMA_GCONF_SCHEMAS_PATH, def->gconf_entry, NULL ));
- xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_KEY ), content );
+ xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_KEY ), content );
xmlFree( content );
content = BAD_CAST( g_build_path( "/", FMA_GCONF_CONFIGURATIONS_PATH, object_id, def->gconf_entry,
NULL ));
- xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_APPLYTO ), content );
+ xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_APPLYTO ), content
);
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 )));
+ xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_TYPE ), BAD_CAST(
fma_data_types_get_gconf_dump_key( def->type )));
if( def->type == FMA_DATA_TYPE_STRING_LIST ){
- xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LISTTYPE ),
BAD_CAST( "string" ));
+ xmlNewChild( writer->private->schema_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_LISTTYPE
), BAD_CAST( "string" ));
}
parent_value_node = writer->private->schema_node;
if( def->localizable ){
- writer->private->locale_node = xmlNewChild( writer->private->schema_node, NULL, BAD_CAST(
NAXML_KEY_SCHEMA_NODE_LOCALE ), NULL );
+ writer->private->locale_node = xmlNewChild( writer->private->schema_node, NULL, BAD_CAST(
FMA_XML_KEY_SCHEMA_NODE_LOCALE ), NULL );
xmlNewProp( writer->private->locale_node, BAD_CAST( "name" ), BAD_CAST( "C" ));
parent_value_node = writer->private->locale_node;
}
content = xmlEncodeSpecialChars( writer->private->doc, BAD_CAST( value_str ));
- xmlNewChild( parent_value_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_DEFAULT ), content );
+ xmlNewChild( parent_value_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_DEFAULT ), content );
xmlFree( content );
}
@@ -646,7 +646,7 @@ write_list_attribs_dump( NAXMLWriter *writer, const FMAObjectItem *object )
id = fma_object_get_id( object );
path = g_build_path( "/", FMA_GCONF_CONFIGURATIONS_PATH, id, NULL );
- xmlNewProp( writer->private->list_node, BAD_CAST( NAXML_KEY_DUMP_LIST_PARM_BASE ), BAD_CAST( path ));
+ xmlNewProp( writer->private->list_node, BAD_CAST( FMA_XML_KEY_DUMP_LIST_PARM_BASE ), BAD_CAST( path
));
g_free( path );
g_free( id );
@@ -703,19 +703,19 @@ write_data_dump_element( NAXMLWriter *writer, const FMADataDef *def, const FMADa
entry_node = xmlNewChild( writer->private->list_node, NULL, BAD_CAST(
writer->private->fn_str->element_node ), NULL );
- xmlNewChild( entry_node, NULL, BAD_CAST( NAXML_KEY_DUMP_NODE_KEY ), BAD_CAST( entry ));
+ xmlNewChild( entry_node, NULL, BAD_CAST( FMA_XML_KEY_DUMP_NODE_KEY ), BAD_CAST( entry ));
- value_node = xmlNewChild( entry_node, NULL, BAD_CAST( NAXML_KEY_DUMP_NODE_VALUE ), NULL );
+ value_node = xmlNewChild( entry_node, NULL, BAD_CAST( FMA_XML_KEY_DUMP_NODE_VALUE ), NULL );
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 );
+ value_list_node = xmlNewChild( value_node, NULL, BAD_CAST( FMA_XML_KEY_DUMP_NODE_VALUE_LIST
), NULL );
+ xmlNewProp( value_list_node, BAD_CAST( FMA_XML_KEY_DUMP_NODE_VALUE_LIST_PARM_TYPE ),
BAD_CAST( FMA_XML_KEY_DUMP_NODE_VALUE_TYPE_STRING ));
+ value_list_value_node = xmlNewChild( value_list_node, NULL, BAD_CAST(
FMA_XML_KEY_DUMP_NODE_VALUE ), NULL );
list = ( GSList * ) fma_boxed_get_as_void( FMA_BOXED( boxed ));
for( is = list ; is ; is = is->next ){
encoded_content = xmlEncodeSpecialChars( writer->private->doc, BAD_CAST(( gchar * )
is->data ));
- xmlNewChild( value_list_value_node, NULL, BAD_CAST(
NAXML_KEY_DUMP_NODE_VALUE_TYPE_STRING ), encoded_content );
+ xmlNewChild( value_list_value_node, NULL, BAD_CAST(
FMA_XML_KEY_DUMP_NODE_VALUE_TYPE_STRING ), encoded_content );
xmlFree( encoded_content );
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
