[aravis/dom] gc_feature_node: remove get_content memeber.



commit e5dad1dadea7a95b8353afd3a8b8c0491b2ef89c
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Tue Feb 28 14:40:16 2012 +0100

    gc_feature_node: remove get_content memeber.

 src/arvgccategory.c    |   10 +++++++++-
 src/arvgcfeaturenode.c |    8 --------
 src/arvgcfeaturenode.h |    2 --
 3 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/src/arvgccategory.c b/src/arvgccategory.c
index f38acbf..31012e3 100644
--- a/src/arvgccategory.c
+++ b/src/arvgccategory.c
@@ -26,6 +26,7 @@
  */
 
 #include <arvgccategory.h>
+#include <arvgcpropertynode.h>
 #include <arvgc.h>
 #include <string.h>
 
@@ -39,6 +40,12 @@ arv_gc_category_get_node_name (ArvDomNode *node)
 	return "Category";
 }
 
+static gboolean
+arv_gc_category_can_append_child (ArvDomNode *parent, ArvDomNode *child)
+{
+	return ARV_IS_GC_PROPERTY_NODE (child);
+}
+
 /* ArvGcCategory implementation */
 
 static void
@@ -75,7 +82,7 @@ arv_gc_category_get_features (ArvGcCategory *category)
 	     iter = arv_dom_node_get_next_sibling (iter))
 		if (g_strcmp0 (arv_gc_feature_node_get_name (ARV_GC_FEATURE_NODE (iter)), "pFeature") == 0)
 			category->features = g_slist_append (category->features,
-							     g_strdup (arv_gc_feature_node_get_content (ARV_GC_FEATURE_NODE (iter))));
+							     g_strdup (arv_gc_property_node_get_content (ARV_GC_PROPERTY_NODE (iter))));
 
 	return category->features;
 }
@@ -116,6 +123,7 @@ arv_gc_category_class_init (ArvGcCategoryClass *this_class)
 
 	object_class->finalize = arv_gc_category_finalize;
 	dom_node_class->get_node_name = arv_gc_category_get_node_name;
+	dom_node_class->can_append_child = arv_gc_category_can_append_child;
 }
 
 G_DEFINE_TYPE (ArvGcCategory, arv_gc_category, ARV_TYPE_GC_NODE)
diff --git a/src/arvgcfeaturenode.c b/src/arvgcfeaturenode.c
index d17a359..9906688 100644
--- a/src/arvgcfeaturenode.c
+++ b/src/arvgcfeaturenode.c
@@ -54,14 +54,6 @@ struct _ArvGcFeatureNodePrivate {
 };
 
 const char *
-arv_gc_feature_node_get_content (ArvGcFeatureNode *node)
-{
-	g_assert_not_reached ();
-	return NULL;
-}
-
-
-const char *
 arv_gc_feature_node_get_name (ArvGcFeatureNode *node)
 {
 	g_return_val_if_fail (ARV_IS_GC_NODE (node), NULL);
diff --git a/src/arvgcfeaturenode.h b/src/arvgcfeaturenode.h
index 5c8bd1c..910b7d7 100644
--- a/src/arvgcfeaturenode.h
+++ b/src/arvgcfeaturenode.h
@@ -79,8 +79,6 @@ unsigned int 	arv_gc_feature_node_get_n_childs 		(ArvGcFeatureNode *gc_feature_n
 void 		arv_gc_feature_node_inc_modification_count 	(ArvGcFeatureNode *gc_feature_node);
 gint 		arv_gc_feature_node_get_modification_count 	(ArvGcFeatureNode *gc_feature_node);
 
-const char * 	arv_gc_feature_node_get_content (ArvGcFeatureNode *node);
-
 G_END_DECLS
 
 #endif



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