[nautilus-actions/file-manager-actions] Validate io-xml/

[Pierre Wieser <pwieser src gnome org>]

commit fe451ca245dfc1b439f13f546b81e1fe5675f711
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 17:47:38 2015 +0200

    Validate io-xml/

 src/io-gconf/Makefile.am                        |    6 +++++
 src/io-xml/Makefile.am                          |   10 ++++----
 src/io-xml/{naxml-writer.c => fma-xml-writer.c} |    0
 src/io-xml/{naxml-writer.h => fma-xml-writer.h} |    0
 src/utils/na-print-schemas.c                    |   24 +++++++++++-----------
 5 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index 4837278..a9ec55e 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -27,13 +27,19 @@
 
 if HAVE_GCONF
 
+provider_id = io-gconf
+
 pkglib_LTLIBRARIES = libfma-io-gconf.la
 
+provider_datadir = $(pkgdatadir)/$(provider_id)
+
 AM_CPPFLAGS += \
        -I $(top_srcdir)                                                                        \
        -I $(top_srcdir)/src                                                            \
        $(NAUTILUS_ACTIONS_CFLAGS)                                                      \
        -DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_GCONF}\"                     \
+       -DPROVIDER_ID=\"$(provider_id)\"                                        \
+       -DPROVIDER_DATADIR=\"$(provider_datadir)\"                      \
        $(NULL)
 
 libfma_io_gconf_la_SOURCES = \
diff --git a/src/io-xml/Makefile.am b/src/io-xml/Makefile.am
index 372a03f..cbfe94e 100644
--- a/src/io-xml/Makefile.am
+++ b/src/io-xml/Makefile.am
@@ -25,9 +25,9 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-provider_id = na-xml
+provider_id = io-xml
 
-pkglib_LTLIBRARIES = libna-io-xml.la
+pkglib_LTLIBRARIES = libfma-io-xml.la
 
 provider_datadir = $(pkgdatadir)/$(provider_id)
 
@@ -40,7 +40,7 @@ AM_CPPFLAGS += \
        -DPROVIDER_DATADIR=\"$(provider_datadir)\"                      \
        $(NULL)
 
-libna_io_xml_la_SOURCES = \
+libfma_io_xml_la_SOURCES = \
        fma-xml-formats.c                                                                       \
        fma-xml-formats.h                                                                       \
        fma-xml-keys.c                                                                          \
@@ -54,12 +54,12 @@ libna_io_xml_la_SOURCES = \
        fma-xml-writer.h                                                                        \
        $(NULL)
 
-libna_io_xml_la_LIBADD = \
+libfma_io_xml_la_LIBADD = \
        $(top_builddir)/src/core/libfma-core.la                         \
        $(NAUTILUS_ACTIONS_LIBS)                                                        \
        $(NULL)
 
-libna_io_xml_la_LDFLAGS = \
+libfma_io_xml_la_LDFLAGS = \
        -module                                                                                         \
        -no-undefined                                                                           \
        -avoid-version                                                                          \
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/fma-xml-writer.c
similarity index 100%
rename from src/io-xml/naxml-writer.c
rename to src/io-xml/fma-xml-writer.c
diff --git a/src/io-xml/naxml-writer.h b/src/io-xml/fma-xml-writer.h
similarity index 100%
rename from src/io-xml/naxml-writer.h
rename to src/io-xml/fma-xml-writer.h
diff --git a/src/utils/na-print-schemas.c b/src/utils/na-print-schemas.c
index f842bfd..42041ad 100644
--- a/src/utils/na-print-schemas.c
+++ b/src/utils/na-print-schemas.c
@@ -45,7 +45,7 @@
 
 #include <io-gconf/fma-gconf-keys.h>
 
-#include <io-xml/naxml-keys.h>
+#include <io-xml/fma-xml-keys.h>
 
 #include "console-utils.h"
 
@@ -235,9 +235,9 @@ output_to_stdout( FMADataGroup *groups, GSList **msgs )
 
        doc = xmlNewDoc( BAD_CAST( "1.0" ));
 
-       root_node = xmlNewNode( NULL, BAD_CAST( NAXML_KEY_SCHEMA_ROOT ));
+       root_node = xmlNewNode( NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_ROOT ));
        xmlDocSetRootElement( doc, root_node );
-       list_node = xmlNewChild( root_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_LIST ), NULL );
+       list_node = xmlNewChild( root_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_LIST ), NULL );
 
        for( ig = 0 ; groups[ig].group ; ++ig ){
                for( id = 0 ; groups[ig].def[id].name ; ++id ){
@@ -268,30 +268,30 @@ attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const FMADataDef *def )
        xmlNodePtr parent_value_node;
        xmlNodePtr locale_node;
 
-       schema_node = xmlNewChild( list_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE ), NULL );
+       schema_node = xmlNewChild( 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( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_KEY ), content );
+       xmlNewChild( schema_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_KEY ), content );
        xmlFree( content );
 
-       xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_OWNER ), BAD_CAST( PACKAGE_TARNAME ));
+       xmlNewChild( schema_node, NULL, BAD_CAST( FMA_XML_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 )));
+       xmlNewChild( 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( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LISTTYPE ), BAD_CAST( 
"string" ));
+               xmlNewChild( schema_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_LISTTYPE ), BAD_CAST( 
"string" ));
        }
 
-       locale_node = xmlNewChild( schema_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LOCALE ), NULL );
+       locale_node = xmlNewChild( schema_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_LOCALE ), NULL );
        xmlNewProp( locale_node, BAD_CAST( "name" ), BAD_CAST( "C" ));
 
-       xmlNewChild( locale_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LOCALE_SHORT ), BAD_CAST( gettext( 
def->short_label )));
+       xmlNewChild( locale_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_LOCALE_SHORT ), BAD_CAST( gettext( 
def->short_label )));
 
-       xmlNewChild( locale_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE_LOCALE_LONG ), BAD_CAST( gettext( 
def->long_label )));
+       xmlNewChild( locale_node, NULL, BAD_CAST( FMA_XML_KEY_SCHEMA_NODE_LOCALE_LONG ), BAD_CAST( gettext( 
def->long_label )));
 
        parent_value_node = def->localizable ? locale_node : schema_node;
 
        content = xmlEncodeSpecialChars( doc, BAD_CAST( def->default_value ));
-       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 );
 }