[nautilus-actions] Validate io-gconf/
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Validate io-gconf/
- Date: Wed, 15 Feb 2017 22:51:03 +0000 (UTC)
commit 0ba0aaeea23dca9c19a597d880d1bbaefe8a291b
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 17:13:44 2015 +0200
Validate io-gconf/
src/io-gconf/Makefile.am | 8 ++++----
src/io-xml/naxml-reader.c | 14 +++++++-------
src/io-xml/naxml-writer.c | 10 +++++-----
src/utils/na-print-schemas.c | 4 ++--
4 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index 71e94d2..4837278 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -27,7 +27,7 @@
if HAVE_GCONF
-pkglib_LTLIBRARIES = libna-io-gconf.la
+pkglib_LTLIBRARIES = libfma-io-gconf.la
AM_CPPFLAGS += \
-I $(top_srcdir) \
@@ -36,7 +36,7 @@ AM_CPPFLAGS += \
-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_GCONF}\" \
$(NULL)
-libna_io_gconf_la_SOURCES = \
+libfma_io_gconf_la_SOURCES = \
fma-gconf-provider.c \
fma-gconf-provider.h \
fma-gconf-keys.c \
@@ -48,12 +48,12 @@ libna_io_gconf_la_SOURCES = \
fma-gconf-writer.h \
$(NULL)
-libna_io_gconf_la_LIBADD = \
+libfma_io_gconf_la_LIBADD = \
$(top_builddir)/src/core/libfma-core.la \
$(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
-libna_io_gconf_la_LDFLAGS = \
+libfma_io_gconf_la_LDFLAGS = \
-module \
-no-undefined \
-avoid-version \
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index bd64b44..ccd4b6d 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -41,7 +41,7 @@
#include <api/fma-ifactory-provider.h>
#include <api/fma-object-api.h>
-#include <io-gconf/nagp-keys.h>
+#include <io-gconf/fma-gconf-keys.h>
#include "naxml-keys.h"
#include "naxml-reader.h"
@@ -1061,14 +1061,14 @@ schema_check_for_type( NAXMLReader *reader, xmlNode *iter )
gchar *entry = g_path_get_basename(( const gchar * ) text );
- if( !strcmp( entry, NAGP_ENTRY_TYPE )){
+ 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 );
- if( !strcmp( type, NAGP_VALUE_TYPE_ACTION )){
+ if( !strcmp( type, FMA_GCONF_VALUE_TYPE_ACTION )){
reader->private->parms->imported = FMA_OBJECT_ITEM( fma_object_action_new());
- } else if( !strcmp( type, NAGP_VALUE_TYPE_MENU )){
+ } else if( !strcmp( type, FMA_GCONF_VALUE_TYPE_MENU )){
reader->private->parms->imported = FMA_OBJECT_ITEM( fma_object_menu_new());
} else {
@@ -1186,14 +1186,14 @@ dump_check_for_type( NAXMLReader *reader, xmlNode *key_node )
{
xmlChar *key_content = xmlNodeGetContent( key_node );
- if( !strxcmp( key_content, NAGP_ENTRY_TYPE )){
+ 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 );
- if( !strcmp( type, NAGP_VALUE_TYPE_ACTION )){
+ if( !strcmp( type, FMA_GCONF_VALUE_TYPE_ACTION )){
reader->private->parms->imported = FMA_OBJECT_ITEM( fma_object_action_new());
- } else if( !strcmp( type, NAGP_VALUE_TYPE_MENU )){
+ } else if( !strcmp( type, FMA_GCONF_VALUE_TYPE_MENU )){
reader->private->parms->imported = FMA_OBJECT_ITEM( fma_object_menu_new());
} else {
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index e07977a..dc8c205 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -42,7 +42,7 @@
#include <api/fma-ifactory-provider.h>
#include <api/fma-iio-provider.h>
-#include <io-gconf/nagp-keys.h>
+#include <io-gconf/fma-gconf-keys.h>
#include "naxml-formats.h"
#include "naxml-keys.h"
@@ -447,7 +447,7 @@ write_start_write_type( NAXMLWriter *writer, FMAObjectItem *object, const FMADat
writer->private->schema_node = NULL;
writer->private->locale_node = NULL;
def = fma_data_def_get_data_def( groups, FMA_FACTORY_OBJECT_ITEM_GROUP, FMAFO_DATA_TYPE );
- svalue = FMA_IS_OBJECT_ACTION( object ) ? NAGP_VALUE_TYPE_ACTION : NAGP_VALUE_TYPE_MENU;
+ svalue = FMA_IS_OBJECT_ACTION( object ) ? FMA_GCONF_VALUE_TYPE_ACTION : FMA_GCONF_VALUE_TYPE_MENU;
( *writer->private->fn_str->write_type_fn )( writer, object, def, svalue );
}
@@ -596,11 +596,11 @@ write_data_schema_v2_element( NAXMLWriter *writer, const FMADataDef *def, const
writer->private->schema_node = xmlNewChild( writer->private->list_node, NULL, BAD_CAST(
NAXML_KEY_SCHEMA_NODE ), NULL );
- content = BAD_CAST( g_build_path( "/", NAGP_SCHEMAS_PATH, def->gconf_entry, 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 );
xmlFree( content );
- content = BAD_CAST( g_build_path( "/", NAGP_CONFIGURATIONS_PATH, object_id, def->gconf_entry, NULL ));
+ 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 );
xmlFree( content );
@@ -645,7 +645,7 @@ write_list_attribs_dump( NAXMLWriter *writer, const FMAObjectItem *object )
gchar *path;
id = fma_object_get_id( object );
- path = g_build_path( "/", NAGP_CONFIGURATIONS_PATH, id, NULL );
+ 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 ));
g_free( path );
diff --git a/src/utils/na-print-schemas.c b/src/utils/na-print-schemas.c
index c561edc..f842bfd 100644
--- a/src/utils/na-print-schemas.c
+++ b/src/utils/na-print-schemas.c
@@ -43,7 +43,7 @@
#include <api/fma-data-types.h>
#include <api/fma-ifactory-object-data.h>
-#include <io-gconf/nagp-keys.h>
+#include <io-gconf/fma-gconf-keys.h>
#include <io-xml/naxml-keys.h>
@@ -270,7 +270,7 @@ attach_schema_node( xmlDocPtr doc, xmlNodePtr list_node, const FMADataDef *def )
schema_node = xmlNewChild( list_node, NULL, BAD_CAST( NAXML_KEY_SCHEMA_NODE ), NULL );
- content = BAD_CAST( g_build_path( "/", NAGP_SCHEMAS_PATH, def->gconf_entry, 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 );
xmlFree( content );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]