[nautilus-actions/file-manager-actions] Rename naxml_schema/dump to fma_xml



commit 79de44fce258f7d4b4ba304f770844bfa8618ecd
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 17:22:11 2015 +0200

    Rename naxml_schema/dump to fma_xml

 src/io-xml/fma-xml-keys.c |    6 +++---
 src/io-xml/naxml-reader.c |   28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/io-xml/fma-xml-keys.c b/src/io-xml/fma-xml-keys.c
index e68a143..06c1021 100644
--- a/src/io-xml/fma-xml-keys.c
+++ b/src/io-xml/fma-xml-keys.c
@@ -33,7 +33,7 @@
 
 #include "fma-xml-keys.h"
 
-FMAXMLKeyStr naxml_schema_key_schema_str [] = {
+FMAXMLKeyStr fma_xml_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 },
@@ -44,14 +44,14 @@ FMAXMLKeyStr naxml_schema_key_schema_str [] = {
                { NULL }
 };
 
-FMAXMLKeyStr naxml_schema_key_locale_str [] = {
+FMAXMLKeyStr fma_xml_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 }
 };
 
-FMAXMLKeyStr naxml_dump_key_entry_str [] = {
+FMAXMLKeyStr fma_xml_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-reader.c b/src/io-xml/naxml-reader.c
index cfc3e69..e17aa6d 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -94,8 +94,8 @@ struct _NAXMLReaderPrivate {
        gboolean                         node_ok;
 };
 
-extern FMAXMLKeyStr naxml_schema_key_schema_str[];
-extern FMAXMLKeyStr naxml_dump_key_entry_str[];
+extern FMAXMLKeyStr fma_xml_schema_key_schema_str[];
+extern FMAXMLKeyStr fma_xml_dump_key_entry_str[];
 
 static GObjectClass *st_parent_class = NULL;
 
@@ -967,14 +967,14 @@ schema_parse_schema_content( NAXMLReader *reader, xmlNode *schema )
                }
 
                str = NULL;
-               for( i = 0 ; naxml_schema_key_schema_str[i].key && !str ; ++i ){
-                       if( !strxcmp( iter->name, naxml_schema_key_schema_str[i].key )){
-                               str = naxml_schema_key_schema_str+i;
+               for( i = 0 ; fma_xml_schema_key_schema_str[i].key && !str ; ++i ){
+                       if( !strxcmp( iter->name, fma_xml_schema_key_schema_str[i].key )){
+                               str = fma_xml_schema_key_schema_str+i;
                        }
                }
 
                if( !str ){
-                       gchar *node_list = build_key_node_list( naxml_schema_key_schema_str );
+                       gchar *node_list = build_key_node_list( fma_xml_schema_key_schema_str );
                        fma_core_utils_slist_add_message( &reader->private->parms->messages,
                                        ERR_NODE_UNKNOWN,
                                        ( const char * ) iter->name, iter->line, node_list );
@@ -1137,14 +1137,14 @@ dump_parse_entry_content( NAXMLReader *reader, xmlNode *entry )
                }
 
                str = NULL;
-               for( i = 0 ; naxml_dump_key_entry_str[i].key && !str ; ++i ){
-                       if( !strxcmp( iter->name, naxml_dump_key_entry_str[i].key )){
-                               str = naxml_dump_key_entry_str+i;
+               for( i = 0 ; fma_xml_dump_key_entry_str[i].key && !str ; ++i ){
+                       if( !strxcmp( iter->name, fma_xml_dump_key_entry_str[i].key )){
+                               str = fma_xml_dump_key_entry_str+i;
                        }
                }
 
                if( !str ){
-                       gchar *node_list = build_key_node_list( naxml_dump_key_entry_str );
+                       gchar *node_list = build_key_node_list( fma_xml_dump_key_entry_str );
                        fma_core_utils_slist_add_message( &reader->private->parms->messages,
                                        ERR_NODE_UNKNOWN,
                                        ( const char * ) iter->name, iter->line, node_list );
@@ -1397,12 +1397,12 @@ reset_node_data( NAXMLReader *reader )
 {
        int i;
 
-       for( i=0 ; naxml_schema_key_schema_str[i].key ; ++i ){
-               naxml_schema_key_schema_str[i].reader_found = FALSE;
+       for( i=0 ; fma_xml_schema_key_schema_str[i].key ; ++i ){
+               fma_xml_schema_key_schema_str[i].reader_found = FALSE;
        }
 
-       for( i=0 ; naxml_dump_key_entry_str[i].key ; ++i ){
-               naxml_dump_key_entry_str[i].reader_found = FALSE;
+       for( i=0 ; fma_xml_dump_key_entry_str[i].key ; ++i ){
+               fma_xml_dump_key_entry_str[i].reader_found = FALSE;
        }
 
        reader->private->node_ok = TRUE;


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