[libgdata] Renamed GDataGDPhoneNumber->phone_number to ->number for consistency

[Philip Withnall <pwithnall src gnome org>]

commit 057d049176c2c56381716134cd6355feb9fe9785
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Apr 19 21:39:37 2009 +0100

    Renamed GDataGDPhoneNumber->phone_number to ->number for consistency
---
 gdata/gdata-gdata.c                              |   10 +++++-----
 gdata/gdata-gdata.h                              |    8 ++++----
 gdata/services/contacts/gdata-contacts-contact.c |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gdata/gdata-gdata.c b/gdata/gdata-gdata.c
index 208018d..a16b476 100644
--- a/gdata/gdata-gdata.c
+++ b/gdata/gdata-gdata.c
@@ -292,7 +292,7 @@ gdata_gd_im_address_free (GDataGDIMAddress *self)
 
 /**
  * gdata_gd_phone_number_new:
- * @phone_number: the phone number, in human-readable format
+ * @number: the phone number, in human-readable format
  * @rel: the relationship between the phone number and its owner, or %NULL
  * @label: a human-readable label for the phone number, or %NULL
  * @uri: a "tel URI" to represent the number formally (see
@@ -305,14 +305,14 @@ gdata_gd_im_address_free (GDataGDIMAddress *self)
  * Return value: a new #GDataGDPhoneNumber, or %NULL on error
  **/
 GDataGDPhoneNumber *
-gdata_gd_phone_number_new (const gchar *phone_number, const gchar *rel, const gchar *label, const gchar *uri, gboolean primary)
+gdata_gd_phone_number_new (const gchar *number, const gchar *rel, const gchar *label, const gchar *uri, gboolean primary)
 {
 	GDataGDPhoneNumber *self;
 
-	g_return_val_if_fail (phone_number != NULL, NULL);
+	g_return_val_if_fail (number != NULL, NULL);
 
 	self = g_slice_new (GDataGDPhoneNumber);
-	self->phone_number = g_strdup (phone_number);
+	self->number = g_strdup (number);
 	self->rel = g_strdup (rel);
 	self->label = g_strdup (label);
 	self->uri = g_strdup (uri);
@@ -332,7 +332,7 @@ gdata_gd_phone_number_free (GDataGDPhoneNumber *self)
 	if (G_UNLIKELY (self == NULL))
 		return;
 
-	g_free (self->phone_number);
+	g_free (self->number);
 	g_free (self->rel);
 	g_free (self->label);
 	g_free (self->uri);
diff --git a/gdata/gdata-gdata.h b/gdata/gdata-gdata.h
index 02f1181..2e8372e 100644
--- a/gdata/gdata-gdata.h
+++ b/gdata/gdata-gdata.h
@@ -166,28 +166,28 @@ void gdata_gd_im_address_free (GDataGDIMAddress *self);
 
 /**
  * GDataGDPhoneNumber:
- * @phone_number: the phone number, in human-readable format
+ * @number: the phone number, in human-readable format
  * @rel: the relationship between the phone number and its owner, or %NULL
  * @label: a human-readable label for the phone number, or %NULL
  * @uri: a "tel URI" to represent the number formally (see
  * <ulink type="http" url="http://www.ietf.org/rfc/rfc3966.txt";>RFC 3966</ulink>), or %NULL
  * @primary: %TRUE if this phone number is its owner's primary number, %FALSE otherwise
  *
- * A structure fully representing a GData "phoneNumber" element. The @phone_number field is required,
+ * A structure fully representing a GData "phoneNumber" element. The @number field is required,
  * but the others are optional.
  *
  * See the <ulink type="http" url="http://code.google.com/apis/gdata/elements.html#gdPhoneNumber";>GData specification</ulink>
  * for more information.
  **/
 typedef struct {
-	gchar *phone_number;
+	gchar *number;
 	gchar *rel;
 	gchar *label;
 	gchar *uri;
 	gboolean primary;
 } GDataGDPhoneNumber;
 
-GDataGDPhoneNumber *gdata_gd_phone_number_new (const gchar *phone_number, const gchar *rel, const gchar *label, const gchar *uri, gboolean primary);
+GDataGDPhoneNumber *gdata_gd_phone_number_new (const gchar *number, const gchar *rel, const gchar *label, const gchar *uri, gboolean primary);
 void gdata_gd_phone_number_free (GDataGDPhoneNumber *self);
 
 /**
diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c
index 9b50be2..d66e751 100644
--- a/gdata/services/contacts/gdata-contacts-contact.c
+++ b/gdata/services/contacts/gdata-contacts-contact.c
@@ -515,7 +515,7 @@ get_xml (GDataEntry *entry, GString *xml_string)
 			g_string_append (xml_string, " primary='false'>");
 
 		/* Append the phone number itself */
-		g_string_append_printf (xml_string, "%s</gd:phoneNumber>", phone_number->phone_number);
+		g_string_append_printf (xml_string, "%s</gd:phoneNumber>", phone_number->number);
 	}
 
 	/* Postal addresses */