[libgdata/gxml] * change content_to_string to get_content



commit 485aa63f9b7a33f242cdaa8a8d72009909cba434
Author: Richard Schwarting <aquarichy gmail com>
Date:   Sat Jul 23 15:04:40 2011 -0400

    * change content_to_string to get_content

 gdata/exif/gdata-exif-tags.c        |   14 +++++++-------
 gdata/gcontact/gdata-gcontact-jot.c |    2 +-
 gdata/gd/gdata-gd-phone-number.c    |    2 +-
 gdata/gd/gdata-gd-postal-address.c  |    2 +-
 gdata/georss/gdata-georss-where.c   |    2 +-
 gdata/media/gdata-media-category.c  |    2 +-
 gdata/media/gdata-media-credit.c    |    2 +-
 gdata/media/gdata-media-group.c     |    4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gdata/exif/gdata-exif-tags.c b/gdata/exif/gdata-exif-tags.c
index f4cd440..bb49f19 100644
--- a/gdata/exif/gdata-exif-tags.c
+++ b/gdata/exif/gdata-exif-tags.c
@@ -116,12 +116,12 @@ parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *node, gp
 
 	if (g_strcmp0 (node_name, "distance") == 0 ) {
 		/* exif:distance */
-		gchar *distance = gxml_dom_element_content_to_string (elem);
+		gchar *distance = gxml_dom_element_get_content (elem);
 		self->priv->distance = g_ascii_strtod (distance, NULL);
 		g_free (distance);
 	} else if (g_strcmp0 (node_name, "fstop") == 0) {
 		/* exif:fstop */
-		gchar *fstop = gxml_dom_element_content_to_string (elem);
+		gchar *fstop = gxml_dom_element_get_content (elem);
 		self->priv->fstop = g_ascii_strtod (fstop, NULL);
 		g_free (fstop);
 	} else if (gdata_parser_string_from_element (node, "make", P_NONE, &(self->priv->make), &success, error) == TRUE ||
@@ -130,24 +130,24 @@ parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *node, gp
 		return success;
 	} else if (g_strcmp0 (node_name, "exposure") == 0) {
 		/* exif:exposure */
-		gchar *exposure = gxml_dom_element_content_to_string (elem);
+		gchar *exposure = gxml_dom_element_get_content (elem);
 		self->priv->exposure = g_ascii_strtod (exposure, NULL);
 		g_free (exposure);
 	} else if (g_strcmp0 (node_name, "flash") == 0) {
 		/* exif:flash */
-		gchar *flash = gxml_dom_element_content_to_string (elem);
+		gchar *flash = gxml_dom_element_get_content (elem);
 		if (flash == NULL)
 			return gdata_parser_error_required_content_missing (node, error);
 		self->priv->flash = (g_strcmp0 (flash, "true") == 0 ? TRUE : FALSE);
 		g_free (flash);
 	} else if (g_strcmp0 (node_name, "focallength") == 0) {
 		/* exif:focal-length */
-		gchar *focal_length = gxml_dom_element_content_to_string (elem);
+		gchar *focal_length = gxml_dom_element_get_content (elem);
 		self->priv->focal_length = g_ascii_strtod (focal_length, NULL);
 		g_free (focal_length);
 	} else if (g_strcmp0 (node_name, "iso") == 0) {
 		/* exif:iso */
-		gchar *iso = gxml_dom_element_content_to_string (elem);
+		gchar *iso = gxml_dom_element_get_content (elem);
 		self->priv->iso = strtol (iso, NULL, 10);
 		g_free (iso);
 	} else if (g_strcmp0 (node_name, "time") == 0) {
@@ -155,7 +155,7 @@ parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *node, gp
 		gchar *time_str;
 		guint64 milliseconds;
 
-		time_str = gxml_dom_element_content_to_string (elem);
+		time_str = gxml_dom_element_get_content (elem);
 		milliseconds = g_ascii_strtoull (time_str, NULL, 10);
 		g_free (time_str);
 
diff --git a/gdata/gcontact/gdata-gcontact-jot.c b/gdata/gcontact/gdata-gcontact-jot.c
index 004b1d1..4a8d69d 100644
--- a/gdata/gcontact/gdata-gcontact-jot.c
+++ b/gdata/gcontact/gdata-gcontact-jot.c
@@ -179,7 +179,7 @@ pre_parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *root
 		return gdata_parser_error_required_property_missing (root_node, "rel", error);
 	}
 
-	priv->content = gxml_dom_element_content_to_string (root_elem);
+	priv->content = gxml_dom_element_get_content (root_elem);
 	priv->relation_type = (gchar*) rel;
 
 	return TRUE;
diff --git a/gdata/gd/gdata-gd-phone-number.c b/gdata/gd/gdata-gd-phone-number.c
index 6596b94..62a850f 100644
--- a/gdata/gd/gdata-gd-phone-number.c
+++ b/gdata/gd/gdata-gd-phone-number.c
@@ -268,7 +268,7 @@ pre_parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *root
 	if (gdata_parser_boolean_from_property (root_node, "primary", &primary_bool, 0, error) == FALSE)
 		return FALSE;
 
-	number = gxml_dom_element_content_to_string (root_elem);
+	number = gxml_dom_element_get_content (root_elem);
 	if (number == NULL || *number == '\0') {
 		g_free (number);
 		return gdata_parser_error_required_content_missing (root_node, error);
diff --git a/gdata/gd/gdata-gd-postal-address.c b/gdata/gd/gdata-gd-postal-address.c
index e663df4..4f73d4f 100644
--- a/gdata/gd/gdata-gd-postal-address.c
+++ b/gdata/gd/gdata-gd-postal-address.c
@@ -611,7 +611,7 @@ parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *node, gp
 		} else if (g_strcmp0 (gxml_dom_xnode_get_node_name (node), "country") == 0) {
 			/* gd:country */
 			priv->country_code = gxml_dom_element_get_attribute (elem, "code");
-			priv->country = gxml_dom_element_content_to_string (elem);
+			priv->country = gxml_dom_element_get_content (elem);
 
 			return TRUE;
 		}
diff --git a/gdata/georss/gdata-georss-where.c b/gdata/georss/gdata-georss-where.c
index 7d73338..d8708df 100644
--- a/gdata/georss/gdata-georss-where.c
+++ b/gdata/georss/gdata-georss-where.c
@@ -93,7 +93,7 @@ parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *node, gp
 
 		for (child = gxml_dom_xnode_get_first_child (node); child != NULL; child = gxml_dom_xnode_get_next_sibling (child)) {
 			if (g_strcmp0 (gxml_dom_xnode_get_node_name (child), "pos") == 0) {
-				gchar *pos = gxml_dom_element_content_to_string (GXML_DOM_ELEMENT (child));
+				gchar *pos = gxml_dom_element_get_content (GXML_DOM_ELEMENT (child));
 				gchar *endptr;
 
 				self->priv->latitude = g_ascii_strtod (pos, &endptr);
diff --git a/gdata/media/gdata-media-category.c b/gdata/media/gdata-media-category.c
index 3e17f5c..8826d7e 100644
--- a/gdata/media/gdata-media-category.c
+++ b/gdata/media/gdata-media-category.c
@@ -196,7 +196,7 @@ pre_parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *root
 	gchar *category, *scheme;
 	GXmlDomElement *root_elem = GXML_DOM_ELEMENT (root_node);
 
-	category = gxml_dom_element_content_to_string (root_elem);
+	category = gxml_dom_element_get_content (root_elem);
 	if (category == NULL || *category == '\0') {
 		g_free (category);
 		return gdata_parser_error_required_content_missing (root_node, error);
diff --git a/gdata/media/gdata-media-credit.c b/gdata/media/gdata-media-credit.c
index 548d409..1f08b08 100644
--- a/gdata/media/gdata-media-credit.c
+++ b/gdata/media/gdata-media-credit.c
@@ -172,7 +172,7 @@ pre_parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *root
 	guint i;
 	GXmlDomElement *root_elem = GXML_DOM_ELEMENT (root_node);
 
-	credit = gxml_dom_element_content_to_string (root_elem);
+	credit = gxml_dom_element_get_content (root_elem);
 	if (credit == NULL || *credit == '\0') {
 		g_free (credit);
 		return gdata_parser_error_required_content_missing (root_node, error);
diff --git a/gdata/media/gdata-media-group.c b/gdata/media/gdata-media-group.c
index ad77bc8..4c0f0fd 100644
--- a/gdata/media/gdata-media-group.c
+++ b/gdata/media/gdata-media-group.c
@@ -163,7 +163,7 @@ parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *node, gp
 		} else if (g_strcmp0 (node_name, "keywords") == 0) {
 			/* media:keywords */
 			guint i;
-			gchar *text = gxml_dom_element_content_to_string (elem);
+			gchar *text = gxml_dom_element_get_content (elem);
 
 			g_strfreev (self->priv->keywords);
 			if (text == NULL) {
@@ -246,7 +246,7 @@ parse_xml (GDataParsable *parsable, GXmlDomDocument *doc, GXmlDomXNode *node, gp
 			}
 			g_free (relationship);
 
-			countries = gxml_dom_element_content_to_string (elem);
+			countries = gxml_dom_element_get_content (elem);
 			country_list = g_strsplit (countries, " ", -1);
 			g_free (countries);
 



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