[libgdata] [core] Whitespace fixes



commit 043bbfaf99f6cd4e186d458a1fbfae537d6e1a78
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Apr 12 19:28:17 2010 +0100

    [core] Whitespace fixes
    
    Make indentation and whitespacing consistent throughout the entire project.
    I am so sad.

 HACKING                                            |    3 +-
 gdata/atom/gdata-author.c                          |   28 +-
 gdata/atom/gdata-category.c                        |   33 ++--
 gdata/atom/gdata-generator.c                       |   33 ++--
 gdata/atom/gdata-link.c                            |   48 ++--
 gdata/atom/gdata-link.h                            |    3 +-
 gdata/exif/gdata-exif-tags.c                       |    4 +-
 gdata/gcontact/gdata-gcontact-calendar.c           |   35 ++--
 gdata/gcontact/gdata-gcontact-event.c              |   24 +-
 gdata/gcontact/gdata-gcontact-external-id.c        |   27 +-
 gdata/gcontact/gdata-gcontact-jot.c                |   16 +-
 gdata/gcontact/gdata-gcontact-language.c           |   16 +-
 gdata/gcontact/gdata-gcontact-relation.c           |   24 +-
 gdata/gcontact/gdata-gcontact-website.c            |   32 ++--
 gdata/gd/gdata-gd-email-address.c                  |   42 ++--
 gdata/gd/gdata-gd-email-address.h                  |    2 +-
 gdata/gd/gdata-gd-im-address.c                     |   42 ++--
 gdata/gd/gdata-gd-im-address.h                     |    2 +-
 gdata/gd/gdata-gd-name.c                           |   48 ++--
 gdata/gd/gdata-gd-organization.c                   |   74 +++---
 gdata/gd/gdata-gd-organization.h                   |    2 +-
 gdata/gd/gdata-gd-phone-number.c                   |   44 ++--
 gdata/gd/gdata-gd-phone-number.h                   |    2 +-
 gdata/gd/gdata-gd-postal-address.c                 |  136 ++++++------
 gdata/gd/gdata-gd-reminder.c                       |   34 ++--
 gdata/gd/gdata-gd-reminder.h                       |    3 +-
 gdata/gd/gdata-gd-when.c                           |   32 ++--
 gdata/gd/gdata-gd-where.c                          |   28 +-
 gdata/gd/gdata-gd-who.c                            |   26 +-
 gdata/gdata-access-handler.c                       |   12 +-
 gdata/gdata-access-handler.h                       |   10 +-
 gdata/gdata-access-rule.c                          |   32 ++--
 gdata/gdata-buffer.c                               |    3 +-
 gdata/gdata-download-stream.c                      |   37 ++--
 gdata/gdata-entry.c                                |   80 +++---
 gdata/gdata-feed.c                                 |  145 ++++++------
 gdata/gdata-parsable.c                             |   23 +-
 gdata/gdata-parsable.h                             |    3 +-
 gdata/gdata-parser.c                               |   76 +++---
 gdata/gdata-private.h                              |   20 +-
 gdata/gdata-query.c                                |  104 ++++----
 gdata/gdata-service.c                              |  165 +++++++------
 gdata/gdata-service.h                              |    6 +-
 gdata/gdata-types.c                                |    8 +-
 gdata/gdata-upload-stream.c                        |   44 ++--
 gdata/gdata-upload-stream.h                        |    2 +-
 gdata/georss/gdata-georss-where.c                  |   11 +-
 gdata/media/gdata-media-category.c                 |   24 +-
 gdata/media/gdata-media-content.c                  |  104 ++++----
 gdata/media/gdata-media-credit.c                   |   24 +-
 gdata/media/gdata-media-group.c                    |   14 +-
 gdata/media/gdata-media-thumbnail.c                |   40 ++--
 gdata/services/calendar/gdata-calendar-calendar.c  |   79 +++---
 gdata/services/calendar/gdata-calendar-event.c     |  113 +++++-----
 gdata/services/calendar/gdata-calendar-feed.c      |   16 +-
 gdata/services/calendar/gdata-calendar-query.c     |   92 ++++----
 gdata/services/calendar/gdata-calendar-query.h     |    4 +-
 gdata/services/calendar/gdata-calendar-service.c   |   37 ++--
 gdata/services/calendar/gdata-calendar-service.h   |   22 +-
 gdata/services/contacts/gdata-contacts-contact.c   |  150 ++++++------
 gdata/services/contacts/gdata-contacts-query.c     |   42 ++--
 gdata/services/contacts/gdata-contacts-query.h     |    3 +-
 gdata/services/contacts/gdata-contacts-service.c   |   16 +-
 gdata/services/contacts/gdata-contacts-service.h   |   12 +-
 gdata/services/documents/gdata-documents-entry.c   |   71 +++---
 gdata/services/documents/gdata-documents-feed.c    |   10 +-
 .../documents/gdata-documents-presentation.c       |    7 +-
 .../documents/gdata-documents-presentation.h       |   17 +-
 gdata/services/documents/gdata-documents-query.c   |   68 +++---
 gdata/services/documents/gdata-documents-service.c |   70 +++---
 gdata/services/documents/gdata-documents-service.h |   22 +-
 .../documents/gdata-documents-spreadsheet.c        |   18 +-
 .../documents/gdata-documents-spreadsheet.h        |   19 +-
 gdata/services/documents/gdata-documents-text.c    |   12 +-
 gdata/services/documents/gdata-documents-text.h    |    9 +-
 gdata/services/picasaweb/gdata-picasaweb-album.c   |  126 +++++-----
 gdata/services/picasaweb/gdata-picasaweb-album.h   |    4 +-
 gdata/services/picasaweb/gdata-picasaweb-feed.c    |   71 ++----
 gdata/services/picasaweb/gdata-picasaweb-file.c    |  254 ++++++++++----------
 gdata/services/picasaweb/gdata-picasaweb-file.h    |    3 +-
 gdata/services/picasaweb/gdata-picasaweb-query.c   |   58 +++---
 gdata/services/picasaweb/gdata-picasaweb-query.h   |    2 +-
 gdata/services/picasaweb/gdata-picasaweb-service.c |   62 +++---
 gdata/services/picasaweb/gdata-picasaweb-service.h |   28 +--
 gdata/services/picasaweb/gdata-picasaweb-user.c    |   48 ++--
 gdata/services/youtube/gdata-youtube-content.c     |    8 +-
 gdata/services/youtube/gdata-youtube-control.c     |    4 +-
 gdata/services/youtube/gdata-youtube-credit.c      |    8 +-
 gdata/services/youtube/gdata-youtube-group.c       |    3 +-
 gdata/services/youtube/gdata-youtube-group.h       |    4 +-
 gdata/services/youtube/gdata-youtube-query.c       |  100 ++++----
 gdata/services/youtube/gdata-youtube-service.c     |   90 ++++----
 gdata/services/youtube/gdata-youtube-service.h     |   30 ++--
 gdata/services/youtube/gdata-youtube-state.c       |   48 ++--
 gdata/services/youtube/gdata-youtube-video.c       |  169 +++++++-------
 gdata/services/youtube/gdata-youtube-video.h       |    3 +-
 96 files changed, 1937 insertions(+), 1925 deletions(-)
---
diff --git a/HACKING b/HACKING
index 674ecf2..9fb2ad5 100644
--- a/HACKING
+++ b/HACKING
@@ -42,7 +42,8 @@ additions. Briefly:
 
  - Comparisons to NULL, TRUE and FALSE should always be made explicit, for clarity.
 
- - Code should be wrapped at around 150 columns, such that it doesn't require horizontal scrolling on a decent-sized display. Don't wrap at 80 columns.
+ - Code should be wrapped at the 150th column, such that it doesn't require horizontal scrolling on a decent-sized display.
+   Don't wrap at the 80th column.
 
 Documentation comments
 ======================
diff --git a/gdata/atom/gdata-author.c b/gdata/atom/gdata-author.c
index 64d786a..f8346a5 100644
--- a/gdata/atom/gdata-author.c
+++ b/gdata/atom/gdata-author.c
@@ -85,10 +85,10 @@ gdata_author_class_init (GDataAuthorClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NAME,
-				g_param_spec_string ("name",
-					"Name", "A human-readable name for the person.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("name",
+	                                                      "Name", "A human-readable name for the person.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataAuthor:uri:
@@ -101,10 +101,10 @@ gdata_author_class_init (GDataAuthorClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_URI,
-				g_param_spec_string ("uri",
-					"URI", "An IRI associated with the person.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uri",
+	                                                      "URI", "An IRI associated with the person.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataAuthor:email-address:
@@ -117,10 +117,10 @@ gdata_author_class_init (GDataAuthorClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EMAIL_ADDRESS,
-				g_param_spec_string ("email-address",
-					"E-mail address", "An e-mail address associated with the person.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("email-address",
+	                                                      "E-mail address", "An e-mail address associated with the person.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -192,8 +192,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 	gboolean success;
 	GDataAuthorPrivate *priv = GDATA_AUTHOR (parsable)->priv;
 
-	if (gdata_parser_is_namespace (node, "http://www.w3.org/2005/Atom";) == TRUE && (
-	     gdata_parser_string_from_element (node, "name", P_NO_DUPES | P_REQUIRED | P_NON_EMPTY, &(priv->name), &success, error) == TRUE ||
+	if (gdata_parser_is_namespace (node, "http://www.w3.org/2005/Atom";) == TRUE &&
+	    (gdata_parser_string_from_element (node, "name", P_NO_DUPES | P_REQUIRED | P_NON_EMPTY, &(priv->name), &success, error) == TRUE ||
 	     gdata_parser_string_from_element (node, "uri", P_NO_DUPES | P_REQUIRED | P_NON_EMPTY, &(priv->uri), &success, error) == TRUE ||
 	     gdata_parser_string_from_element (node, "email", P_NO_DUPES | P_REQUIRED | P_NON_EMPTY, &(priv->email_address), &success, error) == TRUE
 	    )) {
diff --git a/gdata/atom/gdata-category.c b/gdata/atom/gdata-category.c
index 889560f..3a32cee 100644
--- a/gdata/atom/gdata-category.c
+++ b/gdata/atom/gdata-category.c
@@ -78,15 +78,16 @@ gdata_category_class_init (GDataCategoryClass *klass)
 	 * Identifies the category to which the entry or feed belongs.
 	 *
 	 * For more information, see the
-	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.category";>Atom specification</ulink>.
+	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.category";>
+	 * Atom specification</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TERM,
-				g_param_spec_string ("term",
-					"Term", "Identifies the category to which the entry or feed belongs.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("term",
+	                                                      "Term", "Identifies the category to which the entry or feed belongs.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCategory:scheme:
@@ -94,15 +95,16 @@ gdata_category_class_init (GDataCategoryClass *klass)
 	 * An IRI that identifies a categorization scheme.
 	 *
 	 * For more information, see the
-	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.category";>Atom specification</ulink>.
+	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.category";>
+	 * Atom specification</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SCHEME,
-				g_param_spec_string ("scheme",
-					"Scheme", "An IRI that identifies a categorization scheme.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("scheme",
+	                                                      "Scheme", "An IRI that identifies a categorization scheme.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCategory:label:
@@ -110,15 +112,16 @@ gdata_category_class_init (GDataCategoryClass *klass)
 	 * A human-readable label for display in end-user applications.
 	 *
 	 * For more information, see the
-	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.category";>Atom specification</ulink>.
+	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.category";>
+	 * Atom specification</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A human-readable label for display in end-user applications.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A human-readable label for display in end-user applications.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/atom/gdata-generator.c b/gdata/atom/gdata-generator.c
index 3631590..7fc7bdb 100644
--- a/gdata/atom/gdata-generator.c
+++ b/gdata/atom/gdata-generator.c
@@ -74,15 +74,16 @@ gdata_generator_class_init (GDataGeneratorClass *klass)
 	 * A human-readable name for the generating agent.
 	 *
 	 * For more information, see the
-	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.generator";>Atom specification</ulink>.
+	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.generator";>
+	 * Atom specification</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NAME,
-				g_param_spec_string ("name",
-					"Name", "A human-readable name for the generating agent.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("name",
+	                                                      "Name", "A human-readable name for the generating agent.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGenerator:uri:
@@ -90,15 +91,16 @@ gdata_generator_class_init (GDataGeneratorClass *klass)
 	 * An IRI reference that is relevant to the agent.
 	 *
 	 * For more information, see the
-	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.generator";>Atom specification</ulink>.
+	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.generator";>
+	 * Atom specification</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_URI,
-				g_param_spec_string ("uri",
-					"URI", "An IRI reference that is relevant to the agent.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uri",
+	                                                      "URI", "An IRI reference that is relevant to the agent.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGenerator:version:
@@ -106,15 +108,16 @@ gdata_generator_class_init (GDataGeneratorClass *klass)
 	 * Indicates the version of the generating agent.
 	 *
 	 * For more information, see the
-	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.generator";>Atom specification</ulink>.
+	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.generator";>
+	 * Atom specification</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VERSION,
-				g_param_spec_string ("version",
-					"Version", "Indicates the version of the generating agent.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("version",
+	                                                      "Version", "Indicates the version of the generating agent.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/atom/gdata-link.c b/gdata/atom/gdata-link.c
index 3d954ca..85b91d0 100644
--- a/gdata/atom/gdata-link.c
+++ b/gdata/atom/gdata-link.c
@@ -90,10 +90,10 @@ gdata_link_class_init (GDataLinkClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_URI,
-				g_param_spec_string ("uri",
-					"URI", "The link's IRI.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uri",
+	                                                      "URI", "The link's IRI.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataLink:relation-type:
@@ -106,10 +106,10 @@ gdata_link_class_init (GDataLinkClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "The link relation type.",
-					GDATA_LINK_ALTERNATE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "The link relation type.",
+	                                                      GDATA_LINK_ALTERNATE,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataLink:content-type:
@@ -123,10 +123,10 @@ gdata_link_class_init (GDataLinkClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CONTENT_TYPE,
-				g_param_spec_string ("content-type",
-					"Content type", "An advisory media type.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("content-type",
+	                                                      "Content type", "An advisory media type.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataLink:language:
@@ -139,10 +139,10 @@ gdata_link_class_init (GDataLinkClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LANGUAGE,
-				g_param_spec_string ("language",
-					"Language", "Describes the language of the resource pointed to by the #GDataLink:uri property.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("language",
+	                                                      "Language", "Describes the language of the resource pointed to by the uri property.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataLink:title:
@@ -155,10 +155,10 @@ gdata_link_class_init (GDataLinkClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TITLE,
-				g_param_spec_string ("title",
-					"Title", "Conveys human-readable information about the link.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("title",
+	                                                      "Title", "Conveys human-readable information about the link.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataLink:length:
@@ -171,10 +171,10 @@ gdata_link_class_init (GDataLinkClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LENGTH,
-				g_param_spec_int ("length",
-					"Length", "Indicates an advisory length of the linked content in octets.",
-					-1, G_MAXINT, -1,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_int ("length",
+	                                                   "Length", "Indicates an advisory length of the linked content in octets.",
+	                                                   -1, G_MAXINT, -1,
+	                                                   G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/atom/gdata-link.h b/gdata/atom/gdata-link.h
index c4fa0d6..3036a21 100644
--- a/gdata/atom/gdata-link.h
+++ b/gdata/atom/gdata-link.h
@@ -104,7 +104,8 @@ G_BEGIN_DECLS
  *
  * The relation type URI of the edit location for media resources attached to this resource.
  *
- * For more information, see the <ulink type="http" url="http://www.atomenabled.org/developers/protocol/atom-protocol-spec.php#new-media-link-relation";>
+ * For more information, see the
+ * <ulink type="http" url="http://www.atomenabled.org/developers/protocol/atom-protocol-spec.php#new-media-link-relation";>
  * Atom Publishing Protocol specification</ulink>.
  *
  * Since: 0.4.0
diff --git a/gdata/exif/gdata-exif-tags.c b/gdata/exif/gdata-exif-tags.c
index 3f51c86..92d7947 100644
--- a/gdata/exif/gdata-exif-tags.c
+++ b/gdata/exif/gdata-exif-tags.c
@@ -122,8 +122,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 		self->priv->fstop = g_ascii_strtod ((gchar*) fstop, NULL);
 		xmlFree (fstop);
 	} else if (gdata_parser_string_from_element (node, "make", P_NONE, &(self->priv->make), &success, error) == TRUE ||
-		   gdata_parser_string_from_element (node, "model", P_NONE, &(self->priv->model), &success, error) == TRUE ||
-		   gdata_parser_string_from_element (node, "imageUniqueID", P_NONE, &(self->priv->image_unique_id), &success, error) == TRUE) {
+	           gdata_parser_string_from_element (node, "model", P_NONE, &(self->priv->model), &success, error) == TRUE ||
+	           gdata_parser_string_from_element (node, "imageUniqueID", P_NONE, &(self->priv->image_unique_id), &success, error) == TRUE) {
 		return success;
 	} else if (xmlStrcmp (node->name, (xmlChar*) "exposure") == 0) {
 		/* exif:exposure */
diff --git a/gdata/gcontact/gdata-gcontact-calendar.c b/gdata/gcontact/gdata-gcontact-calendar.c
index a93fbfe..1cb6c20 100644
--- a/gdata/gcontact/gdata-gcontact-calendar.c
+++ b/gdata/gcontact/gdata-gcontact-calendar.c
@@ -88,10 +88,10 @@ gdata_gcontact_calendar_class_init (GDataGContactCalendarClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_URI,
-				g_param_spec_string ("uri",
-					"URI", "The URI of the calendar.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uri",
+	                                                      "URI", "The URI of the calendar.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactCalendar:relation-type:
@@ -105,10 +105,10 @@ gdata_gcontact_calendar_class_init (GDataGContactCalendarClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of calendar.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of calendar.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactCalendar:label:
@@ -121,10 +121,10 @@ gdata_gcontact_calendar_class_init (GDataGContactCalendarClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A free-form string that identifies the type of calendar.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A free-form string that identifies the type of calendar.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactCalendar:is-primary:
@@ -137,10 +137,10 @@ gdata_gcontact_calendar_class_init (GDataGContactCalendarClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_PRIMARY,
-				g_param_spec_boolean ("is-primary",
-					"Primary?", "Indicates which calendar out of a group is primary.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-primary",
+	                                                       "Primary?", "Indicates which calendar out of a group is primary.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -301,7 +301,8 @@ gdata_gcontact_calendar_new (const gchar *uri, const gchar *relation_type, const
 	g_return_val_if_fail ((relation_type != NULL && *relation_type != '\0' && label == NULL) ||
 	                      (relation_type == NULL && label != NULL && *label != '\0'), NULL);
 
-	return g_object_new (GDATA_TYPE_GCONTACT_CALENDAR, "uri", uri, "relation-type", relation_type, "label", label, "is-primary", is_primary, NULL);
+	return g_object_new (GDATA_TYPE_GCONTACT_CALENDAR,
+	                     "uri", uri, "relation-type", relation_type, "label", label, "is-primary", is_primary, NULL);
 }
 
 /**
diff --git a/gdata/gcontact/gdata-gcontact-event.c b/gdata/gcontact/gdata-gcontact-event.c
index 0d9ae02..62c9305 100644
--- a/gdata/gcontact/gdata-gcontact-event.c
+++ b/gdata/gcontact/gdata-gcontact-event.c
@@ -93,10 +93,10 @@ gdata_gcontact_event_class_init (GDataGContactEventClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DATE,
-				g_param_spec_boxed ("date",
-					"Date", "The date of the event.",
-					G_TYPE_DATE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("date",
+	                                                     "Date", "The date of the event.",
+	                                                     G_TYPE_DATE,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactEvent:relation-type:
@@ -110,10 +110,10 @@ gdata_gcontact_event_class_init (GDataGContactEventClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of website.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of website.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactEvent:label:
@@ -127,10 +127,10 @@ gdata_gcontact_event_class_init (GDataGContactEventClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A simple string value used to name this event.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A simple string value used to name this event.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gcontact/gdata-gcontact-external-id.c b/gdata/gcontact/gdata-gcontact-external-id.c
index 6698a39..e54c75e 100644
--- a/gdata/gcontact/gdata-gcontact-external-id.c
+++ b/gdata/gcontact/gdata-gcontact-external-id.c
@@ -86,10 +86,10 @@ gdata_gcontact_external_id_class_init (GDataGContactExternalIDClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VALUE,
-				g_param_spec_string ("value",
-					"Value", "The value of the external ID.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("value",
+	                                                      "Value", "The value of the external ID.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactExternalID:relation-type:
@@ -103,10 +103,10 @@ gdata_gcontact_external_id_class_init (GDataGContactExternalIDClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of external ID.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of external ID.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactExternalID:label:
@@ -119,10 +119,10 @@ gdata_gcontact_external_id_class_init (GDataGContactExternalIDClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A free-form string that identifies the type of external ID.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A free-form string that identifies the type of external ID.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -277,7 +277,8 @@ gdata_gcontact_external_id_new (const gchar *value, const gchar *relation_type,
  * <code class="literal">0</code> returned if both @a and @b are %NULL, <code class="literal">-1</code> if @a is %NULL
  * and <code class="literal">1</code> if @b is %NULL.
  *
- * The comparison of non-%NULL values is done on the basis of the @value, @relation_type and @label properties of the #GDataGContactExternalID<!-- -->s.
+ * The comparison of non-%NULL values is done on the basis of the @value, @relation_type and @label properties of
+ * the #GDataGContactExternalID<!-- -->s.
  *
  * Return value: <code class="literal">0</code> if @a equals @b, <code class="literal">-1</code> or <code class="literal">1</code> as
  * appropriate otherwise
diff --git a/gdata/gcontact/gdata-gcontact-jot.c b/gdata/gcontact/gdata-gcontact-jot.c
index 075856f..d8faa89 100644
--- a/gdata/gcontact/gdata-gcontact-jot.c
+++ b/gdata/gcontact/gdata-gcontact-jot.c
@@ -88,10 +88,10 @@ gdata_gcontact_jot_class_init (GDataGContactJotClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CONTENT,
-				g_param_spec_string ("content",
-					"Content", "The content of the jot.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("content",
+	                                                      "Content", "The content of the jot.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactJot:relation-type:
@@ -104,10 +104,10 @@ gdata_gcontact_jot_class_init (GDataGContactJotClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of jot.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of jot.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gcontact/gdata-gcontact-language.c b/gdata/gcontact/gdata-gcontact-language.c
index 3e7bfe8..1866c1c 100644
--- a/gdata/gcontact/gdata-gcontact-language.c
+++ b/gdata/gcontact/gdata-gcontact-language.c
@@ -84,10 +84,10 @@ gdata_gcontact_language_class_init (GDataGContactLanguageClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CODE,
-				g_param_spec_string ("code",
-					"Code", "A code identifying the language, conforming to the IETF BCP 47 specification.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("code",
+	                                                      "Code", "A code identifying the language, conforming to the IETF BCP 47 specification.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactLanguage:label:
@@ -100,10 +100,10 @@ gdata_gcontact_language_class_init (GDataGContactLanguageClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A free-form string that identifies the language.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A free-form string that identifies the language.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gcontact/gdata-gcontact-relation.c b/gdata/gcontact/gdata-gcontact-relation.c
index 024e63f..950c706 100644
--- a/gdata/gcontact/gdata-gcontact-relation.c
+++ b/gdata/gcontact/gdata-gcontact-relation.c
@@ -90,10 +90,10 @@ gdata_gcontact_relation_class_init (GDataGContactRelationClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NAME,
-				g_param_spec_string ("name",
-					"Name", "The name of the relation.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("name",
+	                                                      "Name", "The name of the relation.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactRelation:relation-type:
@@ -107,10 +107,10 @@ gdata_gcontact_relation_class_init (GDataGContactRelationClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of relation.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of relation.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactRelation:label:
@@ -123,10 +123,10 @@ gdata_gcontact_relation_class_init (GDataGContactRelationClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A free-form string that identifies the type of relation.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A free-form string that identifies the type of relation.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gcontact/gdata-gcontact-website.c b/gdata/gcontact/gdata-gcontact-website.c
index 422dc84..d4cb0b7 100644
--- a/gdata/gcontact/gdata-gcontact-website.c
+++ b/gdata/gcontact/gdata-gcontact-website.c
@@ -88,10 +88,10 @@ gdata_gcontact_website_class_init (GDataGContactWebsiteClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_URI,
-				g_param_spec_string ("uri",
-					"URI", "The URI of the website.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uri",
+	                                                      "URI", "The URI of the website.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactWebsite:relation-type:
@@ -104,10 +104,10 @@ gdata_gcontact_website_class_init (GDataGContactWebsiteClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of website.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of website.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactWebsite:label:
@@ -120,10 +120,10 @@ gdata_gcontact_website_class_init (GDataGContactWebsiteClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A simple string value used to name this website.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A simple string value used to name this website.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGContactWebsite:is-primary:
@@ -136,10 +136,10 @@ gdata_gcontact_website_class_init (GDataGContactWebsiteClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_PRIMARY,
-				g_param_spec_boolean ("is-primary",
-					"Primary?", "Indicates which website out of a group is primary.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-primary",
+	                                                       "Primary?", "Indicates which website out of a group is primary.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gd/gdata-gd-email-address.c b/gdata/gd/gdata-gd-email-address.c
index 4a1d9bc..8c1f49f 100644
--- a/gdata/gd/gdata-gd-email-address.c
+++ b/gdata/gd/gdata-gd-email-address.c
@@ -90,10 +90,10 @@ gdata_gd_email_address_class_init (GDataGDEmailAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ADDRESS,
-				g_param_spec_string ("address",
-					"Address", "The e-mail address itself.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("address",
+	                                                      "Address", "The e-mail address itself.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDEmailAddress:relation-type:
@@ -106,10 +106,10 @@ gdata_gd_email_address_class_init (GDataGDEmailAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of e-mail address.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of e-mail address.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDEmailAddress:label:
@@ -122,10 +122,10 @@ gdata_gd_email_address_class_init (GDataGDEmailAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A simple string value used to name this e-mail address.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A simple string value used to name this e-mail address.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDEmailAddress:is-primary:
@@ -138,10 +138,10 @@ gdata_gd_email_address_class_init (GDataGDEmailAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_PRIMARY,
-				g_param_spec_boolean ("is-primary",
-					"Primary?", "Indicates which e-mail address out of a group is primary.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-primary",
+	                                                       "Primary?", "Indicates which e-mail address out of a group is primary.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDEmailAddress:display-name:
@@ -154,10 +154,10 @@ gdata_gd_email_address_class_init (GDataGDEmailAddressClass *klass)
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DISPLAY_NAME,
-				g_param_spec_string ("display-name",
-					"Display name", "A display name of the entity (e.g. a person) the e-mail address belongs to.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("display-name",
+	                                                      "Display name", "A display name of the entity the e-mail address belongs to.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -314,7 +314,7 @@ gdata_gd_email_address_new (const gchar *address, const gchar *relation_type, co
 	g_return_val_if_fail (address != NULL && *address != '\0', NULL);
 	g_return_val_if_fail (relation_type == NULL || *relation_type != '\0', NULL);
 	return g_object_new (GDATA_TYPE_GD_EMAIL_ADDRESS, "address", address, "relation-type", relation_type,
-			     "label", label, "is-primary", is_primary, NULL);
+	                     "label", label, "is-primary", is_primary, NULL);
 }
 
 /**
diff --git a/gdata/gd/gdata-gd-email-address.h b/gdata/gd/gdata-gd-email-address.h
index 038e70d..7f85335 100644
--- a/gdata/gd/gdata-gd-email-address.h
+++ b/gdata/gd/gdata-gd-email-address.h
@@ -90,7 +90,7 @@ typedef struct {
 GType gdata_gd_email_address_get_type (void) G_GNUC_CONST;
 
 GDataGDEmailAddress *gdata_gd_email_address_new (const gchar *address, const gchar *relation_type,
-						 const gchar *label, gboolean is_primary) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                 const gchar *label, gboolean is_primary) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gint gdata_gd_email_address_compare (const GDataGDEmailAddress *a, const GDataGDEmailAddress *b);
 
 const gchar *gdata_gd_email_address_get_address (GDataGDEmailAddress *self);
diff --git a/gdata/gd/gdata-gd-im-address.c b/gdata/gd/gdata-gd-im-address.c
index 960c163..a47c52c 100644
--- a/gdata/gd/gdata-gd-im-address.c
+++ b/gdata/gd/gdata-gd-im-address.c
@@ -90,10 +90,10 @@ gdata_gd_im_address_class_init (GDataGDIMAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ADDRESS,
-				g_param_spec_string ("address",
-					"Address", "The IM address itself.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("address",
+	                                                      "Address", "The IM address itself.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDIMAddress:protocol:
@@ -106,10 +106,10 @@ gdata_gd_im_address_class_init (GDataGDIMAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PROTOCOL,
-				g_param_spec_string ("protocol",
-					"Protocol", "Identifies the IM network.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("protocol",
+	                                                      "Protocol", "Identifies the IM network.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDIMAddress:relation-type:
@@ -122,10 +122,10 @@ gdata_gd_im_address_class_init (GDataGDIMAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of IM address.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of IM address.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDIMAddress:label:
@@ -138,10 +138,10 @@ gdata_gd_im_address_class_init (GDataGDIMAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A simple string value used to name this IM address.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A simple string value used to name this IM address.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDIMAddress:is-primary:
@@ -154,10 +154,10 @@ gdata_gd_im_address_class_init (GDataGDIMAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_PRIMARY,
-				g_param_spec_boolean ("is-primary",
-					"Primary?", "Indicates which IM address out of a group is primary.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-primary",
+	                                                       "Primary?", "Indicates which IM address out of a group is primary.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -318,7 +318,7 @@ gdata_gd_im_address_new (const gchar *address, const gchar *protocol, const gcha
 	g_return_val_if_fail (protocol != NULL && *protocol != '\0', NULL);
 	g_return_val_if_fail (relation_type == NULL || *relation_type != '\0', NULL);
 	return g_object_new (GDATA_TYPE_GD_IM_ADDRESS, "address", address, "protocol", protocol, "relation-type", relation_type,
-			     "label", label, "is-primary", is_primary, NULL);
+	                     "label", label, "is-primary", is_primary, NULL);
 }
 
 /**
diff --git a/gdata/gd/gdata-gd-im-address.h b/gdata/gd/gdata-gd-im-address.h
index 4146443..18aad26 100644
--- a/gdata/gd/gdata-gd-im-address.h
+++ b/gdata/gd/gdata-gd-im-address.h
@@ -171,7 +171,7 @@ typedef struct {
 GType gdata_gd_im_address_get_type (void) G_GNUC_CONST;
 
 GDataGDIMAddress *gdata_gd_im_address_new (const gchar *address, const gchar *protocol, const gchar *relation_type, const gchar *label,
-					   gboolean is_primary) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                           gboolean is_primary) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gint gdata_gd_im_address_compare (const GDataGDIMAddress *a, const GDataGDIMAddress *b);
 
 const gchar *gdata_gd_im_address_get_address (GDataGDIMAddress *self);
diff --git a/gdata/gd/gdata-gd-name.c b/gdata/gd/gdata-gd-name.c
index 85f608f..b400279 100644
--- a/gdata/gd/gdata-gd-name.c
+++ b/gdata/gd/gdata-gd-name.c
@@ -102,10 +102,10 @@ gdata_gd_name_class_init (GDataGDNameClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_GIVEN_NAME,
-				g_param_spec_string ("given-name",
-					"Given name", "The person's given name.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("given-name",
+	                                                      "Given name", "The person's given name.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDName:additional-name:
@@ -118,10 +118,10 @@ gdata_gd_name_class_init (GDataGDNameClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ADDITIONAL_NAME,
-				g_param_spec_string ("additional-name",
-					"Additional name", "An additional name for the person (e.g. a middle name).",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("additional-name",
+	                                                      "Additional name", "An additional name for the person (e.g. a middle name).",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDName:family-name:
@@ -134,10 +134,10 @@ gdata_gd_name_class_init (GDataGDNameClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FAMILY_NAME,
-				g_param_spec_string ("family-name",
-					"Family name", "The person's family name.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("family-name",
+	                                                      "Family name", "The person's family name.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDName:prefix:
@@ -150,10 +150,10 @@ gdata_gd_name_class_init (GDataGDNameClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PREFIX,
-				g_param_spec_string ("prefix",
-					"Prefix", "An honorific prefix.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("prefix",
+	                                                      "Prefix", "An honorific prefix.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDName:suffix:
@@ -166,10 +166,10 @@ gdata_gd_name_class_init (GDataGDNameClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SUFFIX,
-				g_param_spec_string ("suffix",
-					"Suffix", "An honorific suffix.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("suffix",
+	                                                      "Suffix", "An honorific suffix.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDName:full-name:
@@ -183,10 +183,10 @@ gdata_gd_name_class_init (GDataGDNameClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FULL_NAME,
-				g_param_spec_string ("full-name",
-					"Full name", "An unstructured representation of the person's full name.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("full-name",
+	                                                      "Full name", "An unstructured representation of the person's full name.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gd/gdata-gd-organization.c b/gdata/gd/gdata-gd-organization.c
index 6a5126f..0abb5de 100644
--- a/gdata/gd/gdata-gd-organization.c
+++ b/gdata/gd/gdata-gd-organization.c
@@ -106,10 +106,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NAME,
-				g_param_spec_string ("name",
-					"Name", "The name of the organization.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("name",
+	                                                      "Name", "The name of the organization.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDOrganization:title:
@@ -122,10 +122,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TITLE,
-				g_param_spec_string ("title",
-					"Title", "The title of a person within the organization.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("title",
+	                                                      "Title", "The title of a person within the organization.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDOrganization:relation-type:
@@ -138,10 +138,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of organization.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of organization.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDOrganization:label:
@@ -155,10 +155,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A simple string value used to name this organization.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A simple string value used to name this organization.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDOrganization:is-primary:
@@ -171,10 +171,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_PRIMARY,
-				g_param_spec_boolean ("is-primary",
-					"Primary?", "Indicates which organization out of a group is primary.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-primary",
+	                                                       "Primary?", "Indicates which organization out of a group is primary.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDOrganization:department:
@@ -187,10 +187,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DEPARTMENT,
-				g_param_spec_string ("department",
-					"Department", "Specifies a department within the organization.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("department",
+	                                                      "Department", "Specifies a department within the organization.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDOrganization:job-description:
@@ -203,10 +203,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_JOB_DESCRIPTION,
-				g_param_spec_string ("job-description",
-					"Job description", "Description of a job within the organization.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("job-description",
+	                                                      "Job description", "Description of a job within the organization.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDOrganization:symbol:
@@ -219,10 +219,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SYMBOL,
-				g_param_spec_string ("symbol",
-					"Symbol", "Symbol of the organization.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("symbol",
+	                                                      "Symbol", "Symbol of the organization.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDOrganization:location:
@@ -235,10 +235,10 @@ gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LOCATION,
-				g_param_spec_object ("location",
-					"Location", "A place associated with the organization, e.g. office location.",
-					GDATA_TYPE_GD_WHERE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("location",
+	                                                      "Location", "A place associated with the organization, e.g. office location.",
+	                                                      GDATA_TYPE_GD_WHERE,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -461,7 +461,7 @@ gdata_gd_organization_new (const gchar *name, const gchar *title, const gchar *r
 {
 	g_return_val_if_fail (relation_type == NULL || *relation_type != '\0', NULL);
 	return g_object_new (GDATA_TYPE_GD_ORGANIZATION, "name", name, "title", title, "relation-type", relation_type,
-			     "label", label, "is-primary", is_primary, NULL);
+	                     "label", label, "is-primary", is_primary, NULL);
 }
 
 /**
diff --git a/gdata/gd/gdata-gd-organization.h b/gdata/gd/gdata-gd-organization.h
index 0e07245..aa0e953 100644
--- a/gdata/gd/gdata-gd-organization.h
+++ b/gdata/gd/gdata-gd-organization.h
@@ -82,7 +82,7 @@ typedef struct {
 GType gdata_gd_organization_get_type (void) G_GNUC_CONST;
 
 GDataGDOrganization *gdata_gd_organization_new (const gchar *name, const gchar *title, const gchar *relation_type,
-						const gchar *label, gboolean is_primary) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                const gchar *label, gboolean is_primary) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gint gdata_gd_organization_compare (const GDataGDOrganization *a, const GDataGDOrganization *b);
 
 const gchar *gdata_gd_organization_get_name (GDataGDOrganization *self);
diff --git a/gdata/gd/gdata-gd-phone-number.c b/gdata/gd/gdata-gd-phone-number.c
index 14eb5e8..55a32c0 100644
--- a/gdata/gd/gdata-gd-phone-number.c
+++ b/gdata/gd/gdata-gd-phone-number.c
@@ -95,15 +95,15 @@ gdata_gd_phone_number_class_init (GDataGDPhoneNumberClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NUMBER,
-				g_param_spec_string ("number",
-					"Number", "Human-readable phone number; may be in any telephone number format.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("number",
+	                                                      "Number", "Human-readable phone number; may be in any telephone number format.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPhoneNumber:uri:
 	 *
-	 * An optional "tel URI" used to represent the number in a formal way, useful for programmatic access, such as a VoIP/PSTN bridge.
+	 * An optional "tel URI" used to represent the number in a formal way. Useful for programmatic access, such as a VoIP/PSTN bridge.
 	 *
 	 * For more information, see the
 	 * <ulink type="http" url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdPhoneNumber";>GData specification</ulink>.
@@ -111,10 +111,10 @@ gdata_gd_phone_number_class_init (GDataGDPhoneNumberClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_URI,
-				g_param_spec_string ("uri",
-					"URI", "An optional \"tel URI\" used to represent the number in a formal way, useful for programmatic access.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uri",
+	                                                      "URI", "An optional \"tel URI\" used to represent the number in a formal way.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPhoneNumber:relation-type:
@@ -127,10 +127,10 @@ gdata_gd_phone_number_class_init (GDataGDPhoneNumberClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of phone number.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of phone number.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPhoneNumber:label:
@@ -143,10 +143,10 @@ gdata_gd_phone_number_class_init (GDataGDPhoneNumberClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A simple string value used to name this phone number.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A simple string value used to name this phone number.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPhoneNumber:is-primary:
@@ -159,10 +159,10 @@ gdata_gd_phone_number_class_init (GDataGDPhoneNumberClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_PRIMARY,
-				g_param_spec_boolean ("is-primary",
-					"Primary?", "Indicates which phone number out of a group is primary.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-primary",
+	                                                       "Primary?", "Indicates which phone number out of a group is primary.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -338,7 +338,7 @@ gdata_gd_phone_number_new (const gchar *number, const gchar *relation_type, cons
 	g_return_val_if_fail (number != NULL && *number != '\0', NULL);
 	g_return_val_if_fail (relation_type == NULL || *relation_type != '\0', NULL);
 	return g_object_new (GDATA_TYPE_GD_PHONE_NUMBER, "number", number, "uri", uri, "relation-type", relation_type,
-			     "label", label, "is-primary", is_primary, NULL);
+	                     "label", label, "is-primary", is_primary, NULL);
 }
 
 /**
diff --git a/gdata/gd/gdata-gd-phone-number.h b/gdata/gd/gdata-gd-phone-number.h
index 235b35f..e4c47f9 100644
--- a/gdata/gd/gdata-gd-phone-number.h
+++ b/gdata/gd/gdata-gd-phone-number.h
@@ -243,7 +243,7 @@ typedef struct {
 GType gdata_gd_phone_number_get_type (void) G_GNUC_CONST;
 
 GDataGDPhoneNumber *gdata_gd_phone_number_new (const gchar *number, const gchar *relation_type, const gchar *label, const gchar *uri,
-					       gboolean is_primary) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                               gboolean is_primary) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gint gdata_gd_phone_number_compare (const GDataGDPhoneNumber *a, const GDataGDPhoneNumber *b);
 
 const gchar *gdata_gd_phone_number_get_number (GDataGDPhoneNumber *self);
diff --git a/gdata/gd/gdata-gd-postal-address.c b/gdata/gd/gdata-gd-postal-address.c
index 56c2ee4..98e1410 100644
--- a/gdata/gd/gdata-gd-postal-address.c
+++ b/gdata/gd/gdata-gd-postal-address.c
@@ -120,10 +120,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FORMATTED_ADDRESS,
-				g_param_spec_string ("address",
-					"Address", "The postal address itself.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("address",
+	                                                      "Address", "The postal address itself.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:relation-type:
@@ -137,10 +137,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "A programmatic value that identifies the type of postal address.",
-					GDATA_GD_POSTAL_ADDRESS_WORK,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "A programmatic value that identifies the type of postal address.",
+	                                                      GDATA_GD_POSTAL_ADDRESS_WORK,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:label:
@@ -153,10 +153,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A simple string value used to name this postal address.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A simple string value used to name this postal address.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:is-primary:
@@ -169,10 +169,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_PRIMARY,
-				g_param_spec_boolean ("is-primary",
-					"Primary?", "Indicates which postal address out of a group is primary.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-primary",
+	                                                       "Primary?", "Indicates which postal address out of a group is primary.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:mail-class:
@@ -185,10 +185,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MAIL_CLASS,
-				g_param_spec_string ("mail-class",
-					"Mail class", "Classes of mail accepted at this address.",
-					GDATA_GD_MAIL_CLASS_BOTH,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("mail-class",
+	                                                      "Mail class", "Classes of mail accepted at this address.",
+	                                                      GDATA_GD_MAIL_CLASS_BOTH,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:usage:
@@ -201,10 +201,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_USAGE,
-				g_param_spec_string ("usage",
-					"Usage", "The context in which this addess can be used.",
-					GDATA_GD_ADDRESS_USAGE_GENERAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("usage",
+	                                                      "Usage", "The context in which this addess can be used.",
+	                                                      GDATA_GD_ADDRESS_USAGE_GENERAL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:agent:
@@ -217,10 +217,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_AGENT,
-				g_param_spec_string ("agent",
-					"Agent", "The agent who actually receives the mail.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("agent",
+	                                                      "Agent", "The agent who actually receives the mail.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:house-name:
@@ -233,10 +233,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_HOUSE_NAME,
-				g_param_spec_string ("house-name",
-					"House name", "Used in places where houses or buildings have names (and not necessarily numbers).",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("house-name",
+	                                                      "House name", "Used in places where houses or buildings have names (and not numbers).",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:street:
@@ -249,10 +249,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_STREET,
-				g_param_spec_string ("street",
-					"Street", "Can be street, avenue, road, etc.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("street",
+	                                                      "Street", "Can be street, avenue, road, etc.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:po-box:
@@ -265,10 +265,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PO_BOX,
-				g_param_spec_string ("po-box",
-					"PO box", "Covers actual P.O. boxes, drawers, locked bags, etc.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("po-box",
+	                                                      "PO box", "Covers actual P.O. boxes, drawers, locked bags, etc.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:neighborhood:
@@ -282,10 +282,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NEIGHBORHOOD,
-				g_param_spec_string ("neighborhood",
-					"Neighborhood", "This is used to disambiguate a street address.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("neighborhood",
+	                                                      "Neighborhood", "This is used to disambiguate a street address.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:city:
@@ -298,10 +298,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CITY,
-				g_param_spec_string ("city",
-					"City", "Can be city, village, town, borough, etc.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("city",
+	                                                      "City", "Can be city, village, town, borough, etc.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:subregion:
@@ -315,10 +315,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SUBREGION,
-				g_param_spec_string ("subregion",
-					"Subregion", "Handles administrative districts such as U.S. or U.K. counties.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("subregion",
+	                                                      "Subregion", "Handles administrative districts such as U.S. or U.K. counties.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:region:
@@ -331,10 +331,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_REGION,
-				g_param_spec_string ("region",
-					"Region", "A state, province, county (in Ireland), Land (in Germany), departement (in France), etc.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("region",
+	                                                      "Region", "A state, province, county, Land, departement, etc.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:postcode:
@@ -347,10 +347,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_POSTCODE,
-				g_param_spec_string ("postcode",
-					"Postcode", "Postal code.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("postcode",
+	                                                      "Postcode", "Postal code.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:country:
@@ -364,10 +364,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_COUNTRY,
-				g_param_spec_string ("country",
-					"Country", "The name of the country.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("country",
+	                                                      "Country", "The name of the country.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDPostalAddress:country-code:
@@ -382,10 +382,10 @@ gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_COUNTRY_CODE,
-				g_param_spec_string ("country-code",
-					"Country code", "The ISO 3166-1 alpha-2 country code for the country.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("country-code",
+	                                                      "Country code", "The ISO 3166-1 alpha-2 country code for the country.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gd/gdata-gd-reminder.c b/gdata/gd/gdata-gd-reminder.c
index 0623de8..c069b62 100644
--- a/gdata/gd/gdata-gd-reminder.c
+++ b/gdata/gd/gdata-gd-reminder.c
@@ -88,10 +88,10 @@ gdata_gd_reminder_class_init (GDataGDReminderClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_METHOD,
-				g_param_spec_string ("method",
-					"Method", "The notification method the reminder should use.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("method",
+	                                                      "Method", "The notification method the reminder should use.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDReminder:absolute-time:
@@ -104,15 +104,15 @@ gdata_gd_reminder_class_init (GDataGDReminderClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ABSOLUTE_TIME,
-				g_param_spec_boxed ("absolute-time",
-					"Absolute time", "Absolute time at which the reminder should be issued.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("absolute-time",
+	                                                     "Absolute time", "Absolute time at which the reminder should be issued.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDReminder:is-absolute-time:
 	 *
-	 * Whether the reminder is specified in terms of an absolute or relative time.
+	 * Whether the reminder is specified as an absolute or relative time.
 	 *
 	 * For more information, see the
 	 * <ulink type="http" url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdReminder";>GData specification</ulink>.
@@ -120,10 +120,10 @@ gdata_gd_reminder_class_init (GDataGDReminderClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_ABSOLUTE_TIME,
-				g_param_spec_boolean ("is-absolute-time",
-					"Absolute time?", "Whether the reminder is specified in terms of an absolute or relative time.",
-					FALSE,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-absolute-time",
+	                                                       "Absolute time?", "Whether the reminder is specified as an absolute or relative time.",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDReminder:relative-time:
@@ -136,10 +136,10 @@ gdata_gd_reminder_class_init (GDataGDReminderClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATIVE_TIME,
-				g_param_spec_int ("relative-time",
-					"Relative time", "Time at which the reminder should be issued, in minutes.",
-					-1, G_MAXINT, -1,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_int ("relative-time",
+	                                                   "Relative time", "Time at which the reminder should be issued, in minutes.",
+	                                                   -1, G_MAXINT, -1,
+	                                                   G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gd/gdata-gd-reminder.h b/gdata/gd/gdata-gd-reminder.h
index 2a677de..4292163 100644
--- a/gdata/gd/gdata-gd-reminder.h
+++ b/gdata/gd/gdata-gd-reminder.h
@@ -89,7 +89,8 @@ typedef struct {
 
 GType gdata_gd_reminder_get_type (void) G_GNUC_CONST;
 
-GDataGDReminder *gdata_gd_reminder_new (const gchar *method, const GTimeVal *absolute_time, gint relative_time) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+GDataGDReminder *gdata_gd_reminder_new (const gchar *method, const GTimeVal *absolute_time,
+                                        gint relative_time) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gint gdata_gd_reminder_compare (const GDataGDReminder *a, const GDataGDReminder *b);
 
 const gchar *gdata_gd_reminder_get_method (GDataGDReminder *self);
diff --git a/gdata/gd/gdata-gd-when.c b/gdata/gd/gdata-gd-when.c
index 0ce516d..c06eb65 100644
--- a/gdata/gd/gdata-gd-when.c
+++ b/gdata/gd/gdata-gd-when.c
@@ -100,10 +100,10 @@ gdata_gd_when_class_init (GDataGDWhenClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_START_TIME,
-				g_param_spec_boxed ("start-time",
-					"Start time", "The name of the when.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("start-time",
+	                                                     "Start time", "The name of the when.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDWhen:end-time:
@@ -116,10 +116,10 @@ gdata_gd_when_class_init (GDataGDWhenClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_END_TIME,
-				g_param_spec_boxed ("end-time",
-					"End time", "The title of a person within the when.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("end-time",
+	                                                     "End time", "The title of a person within the when.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDWhen:is-date:
@@ -132,10 +132,10 @@ gdata_gd_when_class_init (GDataGDWhenClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_DATE,
-				g_param_spec_boolean ("is-date",
-					"Date?", "A programmatic value that identifies the type of when.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-date",
+	                                                       "Date?", "A programmatic value that identifies the type of when.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDWhen:value-string:
@@ -149,10 +149,10 @@ gdata_gd_when_class_init (GDataGDWhenClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VALUE_STRING,
-				g_param_spec_string ("value-string",
-					"Value string", "A simple string value used to name this when.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("value-string",
+	                                                      "Value string", "A simple string value used to name this when.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gd/gdata-gd-where.c b/gdata/gd/gdata-gd-where.c
index 911f60d..24172f1 100644
--- a/gdata/gd/gdata-gd-where.c
+++ b/gdata/gd/gdata-gd-where.c
@@ -91,15 +91,15 @@ gdata_gd_where_class_init (GDataGDWhereClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "Specifies the relationship between the containing entity and the contained location.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "Specifies the relationship between the container and the containee.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDWhere:value-string:
 	 *
-	 * A simple string value that can be used as a representation of this location.
+	 * A simple string representation of this location.
 	 *
 	 * For more information, see the
 	 * <ulink type="http" url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdWhere";>GData specification</ulink>.
@@ -107,15 +107,15 @@ gdata_gd_where_class_init (GDataGDWhereClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VALUE_STRING,
-				g_param_spec_string ("value-string",
-					"Value string", "A simple string value that can be used as a representation of this location.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("value-string",
+	                                                      "Value string", "A simple string representation of this location.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDWhere:label:
 	 *
-	 * Specifies a user-readable label to distinguish this location from other locations.
+	 * Specifies a user-readable label to distinguish this location from others.
 	 *
 	 * For more information, see the
 	 * <ulink type="http" url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdWhere";>GData specification</ulink>.
@@ -123,10 +123,10 @@ gdata_gd_where_class_init (GDataGDWhereClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "Specifies a user-readable label to distinguish this location from other locations.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "Specifies a user-readable label to distinguish this location from others.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gd/gdata-gd-who.c b/gdata/gd/gdata-gd-who.c
index 263f784..8ccbe55 100644
--- a/gdata/gd/gdata-gd-who.c
+++ b/gdata/gd/gdata-gd-who.c
@@ -91,15 +91,15 @@ gdata_gd_who_class_init (GDataGDWhoClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RELATION_TYPE,
-				g_param_spec_string ("relation-type",
-					"Relation type", "Specifies the relationship between the containing entity and the contained person.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("relation-type",
+	                                                      "Relation type", "Specifies the relationship between the container and the containee.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDWho:value-string:
 	 *
-	 * A simple string value that can be used as a representation of this person.
+	 * A simple string representation of this person.
 	 *
 	 * For more information, see the
 	 * <ulink type="http" url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdWho";>GData specification</ulink>.
@@ -107,10 +107,10 @@ gdata_gd_who_class_init (GDataGDWhoClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VALUE_STRING,
-				g_param_spec_string ("value-string",
-					"Value string", "A simple string value that can be used as a representation of this person.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("value-string",
+	                                                      "Value string", "A simple string representation of this person.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataGDWho:email-address:
@@ -123,10 +123,10 @@ gdata_gd_who_class_init (GDataGDWhoClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EMAIL_ADDRESS,
-				g_param_spec_string ("email-address",
-					"E-mail address", "The e-mail address of the person represented by the #GDataGDWho.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("email-address",
+	                                                      "E-mail address", "The e-mail address of the person represented by the #GDataGDWho.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gdata-access-handler.c b/gdata/gdata-access-handler.c
index 705b691..e6b0c03 100644
--- a/gdata/gdata-access-handler.c
+++ b/gdata/gdata-access-handler.c
@@ -48,8 +48,8 @@ gdata_access_handler_get_type (void)
 
 	if (!access_handler_type) {
 		access_handler_type = g_type_register_static_simple (G_TYPE_INTERFACE, "GDataAccessHandler",
-								     sizeof (GDataAccessHandlerIface),
-								     NULL, 0, NULL, 0);
+		                                                     sizeof (GDataAccessHandlerIface),
+		                                                     NULL, 0, NULL, 0);
 		g_type_interface_add_prerequisite (access_handler_type, GDATA_TYPE_ENTRY);
 	}
 
@@ -167,7 +167,7 @@ gdata_access_handler_insert_rule (GDataAccessHandler *self, GDataService *servic
 
 	if (gdata_entry_is_inserted (GDATA_ENTRY (rule)) == TRUE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED,
-				     _("The rule has already been inserted."));
+		                     _("The rule has already been inserted."));
 		return NULL;
 	}
 
@@ -201,7 +201,7 @@ gdata_access_handler_insert_rule (GDataAccessHandler *self, GDataService *servic
 	/* Parse the XML; create and return a new GDataEntry of the same type as @entry */
 	g_assert (message->response_body->data != NULL);
 	updated_rule = GDATA_ACCESS_RULE (gdata_parsable_new_from_xml (G_OBJECT_TYPE (rule), message->response_body->data,
-								       message->response_body->length, error));
+	                                                               message->response_body->length, error));
 	g_object_unref (message);
 
 	return updated_rule;
@@ -303,7 +303,7 @@ gdata_access_handler_update_rule (GDataAccessHandler *self, GDataService *servic
 	/* Parse the XML; create and return a new GDataEntry of the same type as @entry */
 	g_assert (message->response_body->data != NULL);
 	updated_rule = GDATA_ACCESS_RULE (gdata_parsable_new_from_xml (G_OBJECT_TYPE (rule), message->response_body->data,
-								       message->response_body->length, error));
+	                                                               message->response_body->length, error));
 	g_object_unref (message);
 
 	return updated_rule;
@@ -347,7 +347,7 @@ gdata_access_handler_delete_rule (GDataAccessHandler *self, GDataService *servic
 	g_assert (iface->is_owner_rule != NULL);
 	if (iface->is_owner_rule (rule) == TRUE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_FORBIDDEN,
-				     _("The owner's rule may not be deleted."));
+		                     _("The owner's rule may not be deleted."));
 		return FALSE;
 	}
 
diff --git a/gdata/gdata-access-handler.h b/gdata/gdata-access-handler.h
index 6ab160c..a38d543 100644
--- a/gdata/gdata-access-handler.h
+++ b/gdata/gdata-access-handler.h
@@ -62,14 +62,14 @@ typedef struct {
 GType gdata_access_handler_get_type (void) G_GNUC_CONST;
 
 GDataFeed *gdata_access_handler_get_rules (GDataAccessHandler *self, GDataService *service, GCancellable *cancellable,
-					   GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					   GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                           GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                           GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 GDataAccessRule *gdata_access_handler_insert_rule (GDataAccessHandler *self, GDataService *service, GDataAccessRule *rule,
-						   GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                   GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 GDataAccessRule *gdata_access_handler_update_rule (GDataAccessHandler *self, GDataService *service, GDataAccessRule *rule,
-						   GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                   GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gboolean gdata_access_handler_delete_rule (GDataAccessHandler *self, GDataService *service, GDataAccessRule *rule,
-					   GCancellable *cancellable, GError **error);
+                                           GCancellable *cancellable, GError **error);
 
 G_END_DECLS
 
diff --git a/gdata/gdata-access-rule.c b/gdata/gdata-access-rule.c
index af70824..d67e5b9 100644
--- a/gdata/gdata-access-rule.c
+++ b/gdata/gdata-access-rule.c
@@ -89,10 +89,10 @@ gdata_access_rule_class_init (GDataAccessRuleClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ROLE,
-				g_param_spec_string ("role",
-					"Role", "The role of the person concerned by this ACL.",
-					GDATA_ACCESS_ROLE_NONE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("role",
+	                                                      "Role", "The role of the person concerned by this ACL.",
+	                                                      GDATA_ACCESS_ROLE_NONE,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataAccessRule:scope-type:
@@ -102,10 +102,10 @@ gdata_access_rule_class_init (GDataAccessRuleClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SCOPE_TYPE,
-				g_param_spec_string ("scope-type",
-					"Scope type", "Specifies to whom this access rule applies.",
-					GDATA_ACCESS_SCOPE_DEFAULT,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("scope-type",
+	                                                      "Scope type", "Specifies to whom this access rule applies.",
+	                                                      GDATA_ACCESS_SCOPE_DEFAULT,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataAccessRule:scope-value:
@@ -116,10 +116,10 @@ gdata_access_rule_class_init (GDataAccessRuleClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SCOPE_VALUE,
-				g_param_spec_string ("scope-value",
-					"Scope value", "The scope value for this access rule.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("scope-value",
+	                                                      "Scope value", "The scope value for this access rule.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataAccessRule:edited:
@@ -132,10 +132,10 @@ gdata_access_rule_class_init (GDataAccessRuleClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EDITED,
-				g_param_spec_boxed ("edited",
-					"Edited", "The last time the access rule was edited.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("edited",
+	                                                     "Edited", "The last time the access rule was edited.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/gdata-buffer.c b/gdata/gdata-buffer.c
index 25fe84b..dc0ab83 100644
--- a/gdata/gdata-buffer.c
+++ b/gdata/gdata-buffer.c
@@ -209,8 +209,7 @@ gdata_buffer_pop_data (GDataBuffer *self, guint8 *data, gsize length_requested,
 	 *  - length_requested is a whole number of chunks: remove those chunks, return length_requested
 	 *  - length_requested is less than one chunk: remove no chunks, return length_requested, set head_read_offset
 	 *  - length_requested is a fraction of multiple chunks: remove whole chunks, return length_requested, set head_read_offset
-	 *    for remaining fraction
-	 */
+	 *    for remaining fraction */
 
 	g_static_mutex_lock (&(self->mutex));
 
diff --git a/gdata/gdata-download-stream.c b/gdata/gdata-download-stream.c
index b604b0d..da5f7e4 100644
--- a/gdata/gdata-download-stream.c
+++ b/gdata/gdata-download-stream.c
@@ -85,7 +85,7 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (GDataDownloadStream, gdata_download_stream, G_TYPE_INPUT_STREAM,
-			 G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, gdata_download_stream_seekable_iface_init))
+                         G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, gdata_download_stream_seekable_iface_init))
 
 static void
 gdata_download_stream_class_init (GDataDownloadStreamClass *klass)
@@ -113,10 +113,10 @@ gdata_download_stream_class_init (GDataDownloadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SERVICE,
-					 g_param_spec_object ("service",
-							      "Service", "The service which is used to authenticate the download.",
-							      GDATA_TYPE_SERVICE,
-							      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("service",
+	                                                      "Service", "The service which is used to authenticate the download.",
+	                                                      GDATA_TYPE_SERVICE,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDownloadStream:download-uri:
@@ -126,10 +126,10 @@ gdata_download_stream_class_init (GDataDownloadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DOWNLOAD_URI,
-					 g_param_spec_string ("download-uri",
-							      "Download URI", "The URI of the file to download.",
-							      NULL,
-							      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("download-uri",
+	                                                      "Download URI", "The URI of the file to download.",
+	                                                      NULL,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDownloadStream:content-type:
@@ -139,10 +139,10 @@ gdata_download_stream_class_init (GDataDownloadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CONTENT_TYPE,
-					 g_param_spec_string ("content-type",
-							      "Content type", "The content type of the file being downloaded.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("content-type",
+	                                                      "Content type", "The content type of the file being downloaded.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDownloadStream:content-length:
@@ -152,10 +152,10 @@ gdata_download_stream_class_init (GDataDownloadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CONTENT_LENGTH,
-					 g_param_spec_long ("content-length",
-							    "Content length", "The length (in bytes) of the file being downloaded.",
-							    -1, G_MAXSSIZE, -1,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_long ("content-length",
+	                                                    "Content length", "The length (in bytes) of the file being downloaded.",
+	                                                    -1, G_MAXSSIZE, -1,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -589,7 +589,8 @@ gdata_download_stream_get_content_length (GDataDownloadStream *self)
  * Since: 0.6.0
  **/
 GFileOutputStream *
-_gdata_download_stream_find_destination (const gchar *default_filename, GFile *target_dest_file, GFile **actual_dest_file, gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
+_gdata_download_stream_find_destination (const gchar *default_filename, GFile *target_dest_file, GFile **actual_dest_file,
+                                         gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
 {
 	GFileInfo *target_dest_info;
 	GFileOutputStream *dest_stream;
diff --git a/gdata/gdata-entry.c b/gdata/gdata-entry.c
index c883ae3..1c018c3 100644
--- a/gdata/gdata-entry.c
+++ b/gdata/gdata-entry.c
@@ -114,10 +114,10 @@ gdata_entry_class_init (GDataEntryClass *klass)
 	 * Atom specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TITLE,
-				g_param_spec_string ("title",
-					"Title", "A human-readable title for the entry.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("title",
+	                                                      "Title", "A human-readable title for the entry.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataEntry:summary:
@@ -130,10 +130,10 @@ gdata_entry_class_init (GDataEntryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SUMMARY,
-				g_param_spec_string ("summary",
-					"Summary", "A short summary, abstract, or excerpt of the entry.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("summary",
+	                                                      "Summary", "A short summary, abstract, or excerpt of the entry.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataEntry:id:
@@ -144,10 +144,10 @@ gdata_entry_class_init (GDataEntryClass *klass)
 	 * Atom specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ID,
-				g_param_spec_string ("id",
-					"ID", "A permanent, universally unique identifier for the entry, in IRI form.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("id",
+	                                                      "ID", "A permanent, universally unique identifier for the entry, in IRI form.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataEntry:etag:
@@ -161,24 +161,24 @@ gdata_entry_class_init (GDataEntryClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ETAG,
-				g_param_spec_string ("etag",
-					"ETag", "An identifier for a particular version of the entry.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("etag",
+	                                                      "ETag", "An identifier for a particular version of the entry.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataEntry:updated:
 	 *
-	 * The date and time the entry was most recently updated in a significant way.
+	 * The date and time when the entry was most recently updated significantly.
 	 *
 	 * For more information, see the <ulink type="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.updated";>
 	 * Atom specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_UPDATED,
-				g_param_spec_boxed ("updated",
-					"Updated", "The date and time the entry was most recently updated in a significant way.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("updated",
+	                                                     "Updated", "The date and time when the entry was most recently updated significantly.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataEntry:published:
@@ -189,10 +189,10 @@ gdata_entry_class_init (GDataEntryClass *klass)
 	 * Atom specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PUBLISHED,
-				g_param_spec_boxed ("published",
-					"Published", "The date and time the entry was first published or made available.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("published",
+	                                                     "Published", "The date and time the entry was first published or made available.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataEntry:content:
@@ -203,10 +203,10 @@ gdata_entry_class_init (GDataEntryClass *klass)
 	 * Atom specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CONTENT,
-				g_param_spec_string ("content",
-					"Content", "The content of the entry.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("content",
+	                                                      "Content", "The content of the entry.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataEntry:is-inserted:
@@ -215,10 +215,10 @@ gdata_entry_class_init (GDataEntryClass *klass)
 	 * %TRUE for entries returned from the server by queries. It is set to %TRUE when an entry is inserted using gdata_service_insert_entry().
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_INSERTED,
-				g_param_spec_boolean ("is-inserted",
-					"Inserted?", "Whether the entry has been inserted on the server.",
-					FALSE,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-inserted",
+	                                                       "Inserted?", "Whether the entry has been inserted on the server.",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataEntry:rights:
@@ -231,10 +231,10 @@ gdata_entry_class_init (GDataEntryClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RIGHTS,
-					 g_param_spec_string ("rights",
-							      "Rights", "The ownership rights pertaining to the entry.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("rights",
+	                                                      "Rights", "The ownership rights pertaining to the entry.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -382,11 +382,11 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 		    gdata_parser_time_val_from_element (node, "updated", P_REQUIRED | P_NO_DUPES, &(priv->updated), &success, error) == TRUE ||
 		    gdata_parser_time_val_from_element (node, "published", P_REQUIRED | P_NO_DUPES, &(priv->published), &success, error) == TRUE ||
 		    gdata_parser_object_from_element_setter (node, "category", P_REQUIRED, GDATA_TYPE_CATEGORY,
-			                                     gdata_entry_add_category, parsable, &success, error) == TRUE ||
+		                                             gdata_entry_add_category, parsable, &success, error) == TRUE ||
 		    gdata_parser_object_from_element_setter (node, "link", P_REQUIRED, GDATA_TYPE_LINK,
-			                                     gdata_entry_add_link, parsable, &success, error) == TRUE ||
+		                                             gdata_entry_add_link, parsable, &success, error) == TRUE ||
 		    gdata_parser_object_from_element_setter (node, "author", P_REQUIRED, GDATA_TYPE_AUTHOR,
-			                                     gdata_entry_add_author, parsable, &success, error) == TRUE) {
+		                                             gdata_entry_add_author, parsable, &success, error) == TRUE) {
 			return success;
 		} else if (xmlStrcmp (node->name, (xmlChar*) "content") == 0) {
 			/* atom:content */
diff --git a/gdata/gdata-feed.c b/gdata/gdata-feed.c
index dc56e1b..8d6294a 100644
--- a/gdata/gdata-feed.c
+++ b/gdata/gdata-feed.c
@@ -113,13 +113,14 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 *
 	 * The title of the feed.
 	 *
-	 * API reference: <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_title";>atom:title</ulink>
+	 * API reference:
+	 * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_title";>atom:title</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TITLE,
-				g_param_spec_string ("title",
-					"Title", "The title of the feed.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("title",
+	                                                      "Title", "The title of the feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:subtitle:
@@ -129,10 +130,10 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * API reference: <ulink type="http" url="http://atomenabled.org/developers/syndication/";>atom:subtitle</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SUBTITLE,
-				g_param_spec_string ("subtitle",
-					"Subtitle", "The subtitle of the feed.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("subtitle",
+	                                                      "Subtitle", "The subtitle of the feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:id:
@@ -142,10 +143,10 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * API reference: <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_id";>atom:id</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ID,
-				g_param_spec_string ("id",
-					"ID", "The unique and permanent URN ID for the feed.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("id",
+	                                                      "ID", "The unique and permanent URN ID for the feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:etag:
@@ -157,10 +158,10 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ETAG,
-				g_param_spec_string ("etag",
-					"ETag", "The unique ETag for this version of the feed.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("etag",
+	                                                      "ETag", "The unique ETag for this version of the feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:updated:
@@ -171,10 +172,10 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * atom:updated</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_UPDATED,
-				g_param_spec_boxed ("updated",
-					"Updated", "The time the feed was last updated.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("updated",
+	                                                     "Updated", "The time the feed was last updated.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:logo:
@@ -184,25 +185,26 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * API reference: <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_logo";>atom:logo</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LOGO,
-				g_param_spec_string ("logo",
-					"Logo", "The URI of a logo for the feed.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("logo",
+	                                                      "Logo", "The URI of a logo for the feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:icon:
 	 *
 	 * The URI of an icon for the feed.
 	 *
-	 * API reference: <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.icon";>atom:icon</ulink>
+	 * API reference:
+	 * <ulink type="http" url="http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.icon";>atom:icon</ulink>
 	 *
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ICON,
-					 g_param_spec_string ("icon",
-							      "Icon", "The URI of an icon for the feed.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("icon",
+	                                                      "Icon", "The URI of an icon for the feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:generator:
@@ -213,10 +215,10 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * atom:generator</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_GENERATOR,
-				g_param_spec_object ("generator",
-					"Generator", "Details of the software used to generate the feed.",
-					GDATA_TYPE_GENERATOR,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("generator",
+	                                                      "Generator", "Details of the software used to generate the feed.",
+	                                                      GDATA_TYPE_GENERATOR,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:rights:
@@ -229,24 +231,25 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RIGHTS,
-					 g_param_spec_string ("rights",
-							      "Rights", "The ownership rights pertaining to the entire feed.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("rights",
+	                                                      "Rights", "The ownership rights pertaining to the entire feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:items-per-page:
 	 *
 	 * The number of items per results page feed.
 	 *
-	 * API reference: <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_openSearch:itemsPerPage";>
+	 * API reference:
+	 * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_openSearch:itemsPerPage";>
 	 * openSearch:itemsPerPage</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ITEMS_PER_PAGE,
-				g_param_spec_uint ("items-per-page",
-					"Items per page", "The number of items per results page feed.",
-					0, G_MAXINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("items-per-page",
+	                                                    "Items per page", "The number of items per results page feed.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:start-index:
@@ -260,10 +263,10 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * openSearch:startIndex</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_START_INDEX,
-				g_param_spec_uint ("start-index",
-					"Start index", "The one-based index of the first item in the results feed.",
-					1, G_MAXINT, 1,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("start-index",
+	                                                    "Start index", "The one-based index of the first item in the results feed.",
+	                                                    1, G_MAXUINT, 1,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataFeed:total-results:
@@ -273,14 +276,15 @@ gdata_feed_class_init (GDataFeedClass *klass)
 	 * This should <emphasis>not</emphasis> be used manually for pagination. Instead, use a #GDataQuery and call its gdata_query_next_page()
 	 * or gdata_query_previous_page() functions before making the query to the service.
 	 *
-	 * API reference: <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_openSearch:totalResults";>
+	 * API reference:
+	 * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_openSearch:totalResults";>
 	 * openSearch:totalResults</ulink>
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TOTAL_RESULTS,
-				g_param_spec_uint ("total-results",
-					"Total results", "The total number of results in the feed.",
-					0, 1000000, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("total-results",
+	                                                    "Total results", "The total number of results in the feed.",
+	                                                    0, 1000000, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -404,7 +408,6 @@ pre_parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *root_node, gpointe
 {
 	/* Extract the ETag */
 	GDATA_FEED (parsable)->priv->etag = (gchar*) xmlGetProp (root_node, (xmlChar*) "etag");
-
 	return TRUE;
 }
 
@@ -429,8 +432,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 			GDataEntry *entry;
 			GType entry_type;
 
-			/* Allow @data to be %NULL, and assume we're parsing a vanilla feed, so that we can test #GDataFeed in tests/general.c. A little hacky,
-			 * but not too much so, and valuable for testing. */
+			/* Allow @data to be %NULL, and assume we're parsing a vanilla feed, so that we can test #GDataFeed in tests/general.c.
+			 * A little hacky, but not too much so, and valuable for testing. */
 			entry_type = (data != NULL) ? data->entry_type : GDATA_TYPE_ENTRY;
 			entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (entry_type, doc, node, NULL, error));
 			if (entry == NULL)
@@ -441,21 +444,21 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 				_gdata_feed_call_progress_callback (self, data, entry);
 			_gdata_feed_add_entry (self, entry);
 		} else if (gdata_parser_string_from_element (node, "title", P_NO_DUPES, &(self->priv->title), &success, error) == TRUE ||
-			   gdata_parser_string_from_element (node, "subtitle", P_NO_DUPES, &(self->priv->subtitle), &success, error) == TRUE ||
-			   gdata_parser_string_from_element (node, "id", P_NO_DUPES, &(self->priv->id), &success, error) == TRUE ||
-			   gdata_parser_string_from_element (node, "logo", P_NO_DUPES, &(self->priv->logo), &success, error) == TRUE ||
-			   gdata_parser_string_from_element (node, "icon", P_NO_DUPES, &(self->priv->icon), &success, error) == TRUE ||
-			   gdata_parser_object_from_element_setter (node, "category", P_REQUIRED, GDATA_TYPE_CATEGORY,
-			                                            _gdata_feed_add_category, self, &success, error) == TRUE ||
-			   gdata_parser_object_from_element_setter (node, "link", P_REQUIRED, GDATA_TYPE_LINK,
-			                                            _gdata_feed_add_link, self, &success, error) == TRUE ||
-			   gdata_parser_object_from_element_setter (node, "author", P_REQUIRED, GDATA_TYPE_AUTHOR,
-			                                            _gdata_feed_add_author, self, &success, error) == TRUE ||
-			   gdata_parser_object_from_element (node, "generator", P_REQUIRED | P_NO_DUPES, GDATA_TYPE_GENERATOR,
-			                                     &(self->priv->generator), &success, error) == TRUE ||
-			   gdata_parser_time_val_from_element (node, "updated", P_REQUIRED | P_NO_DUPES,
-			                                       &(self->priv->updated), &success, error) == TRUE ||
-			   gdata_parser_string_from_element (node, "rights", P_NONE, &(self->priv->rights), &success, error) == TRUE) {
+		           gdata_parser_string_from_element (node, "subtitle", P_NO_DUPES, &(self->priv->subtitle), &success, error) == TRUE ||
+		           gdata_parser_string_from_element (node, "id", P_NO_DUPES, &(self->priv->id), &success, error) == TRUE ||
+		           gdata_parser_string_from_element (node, "logo", P_NO_DUPES, &(self->priv->logo), &success, error) == TRUE ||
+		           gdata_parser_string_from_element (node, "icon", P_NO_DUPES, &(self->priv->icon), &success, error) == TRUE ||
+		           gdata_parser_object_from_element_setter (node, "category", P_REQUIRED, GDATA_TYPE_CATEGORY,
+		                                                    _gdata_feed_add_category, self, &success, error) == TRUE ||
+		           gdata_parser_object_from_element_setter (node, "link", P_REQUIRED, GDATA_TYPE_LINK,
+		                                                    _gdata_feed_add_link, self, &success, error) == TRUE ||
+		           gdata_parser_object_from_element_setter (node, "author", P_REQUIRED, GDATA_TYPE_AUTHOR,
+		                                                    _gdata_feed_add_author, self, &success, error) == TRUE ||
+		           gdata_parser_object_from_element (node, "generator", P_REQUIRED | P_NO_DUPES, GDATA_TYPE_GENERATOR,
+		                                             &(self->priv->generator), &success, error) == TRUE ||
+		           gdata_parser_time_val_from_element (node, "updated", P_REQUIRED | P_NO_DUPES,
+		                                               &(self->priv->updated), &success, error) == TRUE ||
+		           gdata_parser_string_from_element (node, "rights", P_NONE, &(self->priv->rights), &success, error) == TRUE) {
 			return success;
 		} else {
 			return GDATA_PARSABLE_CLASS (gdata_feed_parent_class)->parse_xml (parsable, doc, node, user_data, error);
@@ -673,7 +676,7 @@ gdata_feed_look_up_link (GDataFeed *self, const gchar *rel)
 static void
 _gdata_feed_add_link (GDataFeed *self, GDataLink *link)
 {
-		self->priv->links = g_list_prepend (self->priv->links, g_object_ref (link));
+	self->priv->links = g_list_prepend (self->priv->links, g_object_ref (link));
 }
 
 /**
diff --git a/gdata/gdata-parsable.c b/gdata/gdata-parsable.c
index 8d4ccd8..2015ef9 100644
--- a/gdata/gdata-parsable.c
+++ b/gdata/gdata-parsable.c
@@ -130,8 +130,8 @@ real_parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer us
  *
  * An object of the given @parsable_type is created, and its <function>pre_parse_xml</function>, <function>parse_xml</function> and
  * <function>post_parse_xml</function> class functions called on the XML tree obtained from @xml. <function>pre_parse_xml</function> and
- * <function>post_parse_xml</function> are called once each on the root node of the tree, while <function>parse_xml</function> is called for each of the
- * child nodes of the root node.
+ * <function>post_parse_xml</function> are called once each on the root node of the tree, while <function>parse_xml</function> is called for
+ * each of the child nodes of the root node.
  *
  * If @length is -1, @xml will be assumed to be null-terminated.
  *
@@ -182,9 +182,9 @@ _gdata_parsable_new_from_xml (GType parsable_type, const gchar *xml, gint length
 	if (doc == NULL) {
 		xmlError *xml_error = xmlGetLastError ();
 		g_set_error (error, GDATA_PARSER_ERROR, GDATA_PARSER_ERROR_PARSING_STRING,
-			     /* Translators: the parameter is an error message */
-			     _("Error parsing XML: %s"),
-			     (xml_error != NULL) ? xml_error->message : NULL);
+		             /* Translators: the parameter is an error message */
+		             _("Error parsing XML: %s"),
+		             (xml_error != NULL) ? xml_error->message : NULL);
 		return NULL;
 	}
 
@@ -194,9 +194,9 @@ _gdata_parsable_new_from_xml (GType parsable_type, const gchar *xml, gint length
 		/* XML document's empty */
 		xmlFreeDoc (doc);
 		g_set_error (error, GDATA_PARSER_ERROR, GDATA_PARSER_ERROR_EMPTY_DOCUMENT,
-			     _("Error parsing XML: %s"),
-			     /* Translators: this is a dummy error message to be substituted into "Error parsing XML: %s". */
-			     _("Empty document."));
+		             _("Error parsing XML: %s"),
+		             /* Translators: this is a dummy error message to be substituted into "Error parsing XML: %s". */
+		             _("Empty document."));
 		return NULL;
 	}
 
@@ -277,8 +277,8 @@ filter_namespaces_cb (gchar *prefix, gchar *href, GHashTable *canonical_namespac
  * gdata_parsable_get_xml:
  * @self: a #GDataParsable
  *
- * Builds an XML representation of the #GDataParsable in its current state, such that it could be inserted on the server. The XML is guaranteed to have
- * all its namespaces declared properly in a self-contained fashion, and is valid for stand-alone use.
+ * Builds an XML representation of the #GDataParsable in its current state, such that it could be inserted on the server. The XML is guaranteed
+ * to have all its namespaces declared properly in a self-contained fashion, and is valid for stand-alone use.
  *
  * Return value: the object's XML; free with g_free()
  *
@@ -300,7 +300,8 @@ gdata_parsable_get_xml (GDataParsable *self)
  * _gdata_parsable_get_xml:
  * @self: a #GDataParsable
  * @xml_string: a #GString to build the XML in
- * @declare_namespaces: %TRUE if all the namespaces used in the outputted XML should be declared in the opening tag of the root element, %FALSE otherwise
+ * @declare_namespaces: %TRUE if all the namespaces used in the outputted XML should be declared in the opening tag of the root element,
+ * %FALSE otherwise
  *
  * Builds an XML representation of the #GDataParsable in its current state, such that it could be inserted on the server. If @declare_namespaces is
  * %TRUE, the XML is guaranteed to have all its namespaces declared properly in a self-contained fashion, and is valid for stand-alone use. If
diff --git a/gdata/gdata-parsable.h b/gdata/gdata-parsable.h
index c072a49..ed0dc72 100644
--- a/gdata/gdata-parsable.h
+++ b/gdata/gdata-parsable.h
@@ -97,7 +97,8 @@ typedef struct {
 
 GType gdata_parsable_get_type (void) G_GNUC_CONST;
 
-GDataParsable *gdata_parsable_new_from_xml (GType parsable_type, const gchar *xml, gint length, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+GDataParsable *gdata_parsable_new_from_xml (GType parsable_type, const gchar *xml, gint length,
+                                            GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gchar *gdata_parsable_get_xml (GDataParsable *self) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 G_END_DECLS
diff --git a/gdata/gdata-parser.c b/gdata/gdata-parser.c
index 4d6c8b1..9bc0ff9 100644
--- a/gdata/gdata-parser.c
+++ b/gdata/gdata-parser.c
@@ -32,7 +32,7 @@ static gchar *
 print_element (xmlNode *node)
 {
 	gboolean node_has_ns = (node->ns == NULL || node->ns->prefix == NULL ||
-				xmlStrcmp (node->ns->href, (xmlChar*) "http://www.w3.org/2005/Atom";) == 0) ? FALSE : TRUE;
+	                        xmlStrcmp (node->ns->href, (xmlChar*) "http://www.w3.org/2005/Atom";) == 0) ? FALSE : TRUE;
 
 	if (node->parent == NULL) {
 		/* No parent node */
@@ -43,7 +43,7 @@ print_element (xmlNode *node)
 	} else {
 		/* We have a parent node, which makes things a lot more complex */
 		gboolean parent_has_ns = (node->parent->type == XML_DOCUMENT_NODE || node->parent->ns == NULL || node->parent->ns->prefix == NULL ||
-					  xmlStrcmp (node->parent->ns->href, (xmlChar*) "http://www.w3.org/2005/Atom";) == 0) ? FALSE : TRUE;
+		                          xmlStrcmp (node->parent->ns->href, (xmlChar*) "http://www.w3.org/2005/Atom";) == 0) ? FALSE : TRUE;
 
 		if (parent_has_ns == TRUE && node_has_ns == TRUE)
 			return g_strdup_printf ("<%s:%s/%s:%s>", node->parent->ns->prefix, node->parent->name, node->ns->prefix, node->name);
@@ -74,12 +74,12 @@ gdata_parser_error_not_iso8601_format (xmlNode *element, const gchar *actual_val
 {
 	gchar *element_string = print_element (element);
 	g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-		     /* Translators: the first parameter is the name of an XML element (including the angle brackets ("<" and ">")),
-		      * and the second parameter is the erroneous value (which was not in ISO 8601 format).
-		      *
-		      * For example:
-		      *  The content of a <media:group/media:uploaded> element ("2009-05-06 26:30Z") was not in ISO 8601 format. */
-		     _("The content of a %s element (\"%s\") was not in ISO 8601 format."), element_string, actual_value);
+	             /* Translators: the first parameter is the name of an XML element (including the angle brackets ("<" and ">")),
+	              * and the second parameter is the erroneous value (which was not in ISO 8601 format).
+	              *
+	              * For example:
+	              *  The content of a <media:group/media:uploaded> element ("2009-05-06 26:30Z") was not in ISO 8601 format. */
+	             _("The content of a %s element (\"%s\") was not in ISO 8601 format."), element_string, actual_value);
 	g_free (element_string);
 
 	return FALSE;
@@ -94,12 +94,12 @@ gdata_parser_error_unknown_property_value (xmlNode *element, const gchar *proper
 	element_string = print_element (element);
 
 	g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-		     /* Translators: the first parameter is the name of an XML property, the second is the name of an XML element
-		      * (including the angle brackets ("<" and ">")) to which the property belongs, and the third is the unknown value.
-		      *
-		      * For example:
-		      *  The value of the @time property of a <media:group/media:thumbnail> element ("00:01:42.500") was unknown. */
-		     _("The value of the %s property of a %s element (\"%s\") was unknown."), property_string, element_string, actual_value);
+	             /* Translators: the first parameter is the name of an XML property, the second is the name of an XML element
+	              * (including the angle brackets ("<" and ">")) to which the property belongs, and the third is the unknown value.
+	              *
+	              * For example:
+	              *  The value of the @time property of a <media:group/media:thumbnail> element ("00:01:42.500") was unknown. */
+	             _("The value of the %s property of a %s element (\"%s\") was unknown."), property_string, element_string, actual_value);
 	g_free (property_string);
 	g_free (element_string);
 
@@ -112,12 +112,12 @@ gdata_parser_error_unknown_content (xmlNode *element, const gchar *actual_conten
 	gchar *element_string = print_element (element);
 
 	g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-		     /* Translators: the first parameter is the name of an XML element (including the angle brackets ("<" and ">")),
-		      * and the second parameter is the unknown content of that element.
-		      *
-		      * For example:
-		      *  The content of a <gphoto:access> element ("protected") was unknown. */
-		     _("The content of a %s element (\"%s\") was unknown."), element_string, actual_content);
+	             /* Translators: the first parameter is the name of an XML element (including the angle brackets ("<" and ">")),
+	              * and the second parameter is the unknown content of that element.
+	              *
+	              * For example:
+	              *  The content of a <gphoto:access> element ("protected") was unknown. */
+	             _("The content of a %s element (\"%s\") was unknown."), element_string, actual_content);
 	g_free (element_string);
 
 	return FALSE;
@@ -132,12 +132,12 @@ gdata_parser_error_required_property_missing (xmlNode *element, const gchar *pro
 	element_string = print_element (element);
 
 	g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-		     /* Translators: the first parameter is the name of an XML element (including the angle brackets ("<" and ">")),
-		      * and the second is the name of an XML property which it should have contained.
-		      *
-		      * For example:
-		      *  A required property of a <entry/gAcl:role> element (@value) was not present. */
-		     _("A required property of a %s element (%s) was not present."), element_string, property_string);
+	             /* Translators: the first parameter is the name of an XML element (including the angle brackets ("<" and ">")),
+	              * and the second is the name of an XML property which it should have contained.
+	              *
+	              * For example:
+	              *  A required property of a <entry/gAcl:role> element (@value) was not present. */
+	             _("A required property of a %s element (%s) was not present."), element_string, property_string);
 	g_free (property_string);
 	g_free (element_string);
 
@@ -242,7 +242,8 @@ gdata_parser_date_from_time_val (const GTimeVal *_time)
  * The boolean value should be of the form: "<element property_name='[true|false]'/>".
  * A %GDATA_SERVICE_ERROR_PROTOCOL_ERROR error will be returned in @error if parsing fails, and @output will not be set.
  *
- * If no property with the name @property_name exists in @element and @default_output is <code class="literal">0</code>, @output will be set to %FALSE.
+ * If no property with the name @property_name exists in @element and @default_output is <code class="literal">0</code>,
+ * @output will be set to %FALSE.
  * If @default_output is <code class="literal">1</code>, @output will be set to %TRUE. If @default_output is <code class="literal">-1</code>,
  * a %GDATA_SERVICE_ERROR_PROTOCOL_ERROR will be returned in @error.
  *
@@ -437,10 +438,10 @@ gdata_parser_time_val_from_element (xmlNode *element, const gchar *element_name,
  * and undefined if @element didn't match @element_name
  * @error: a #GError, or %NULL
  *
- * Gets the object content of @element if its name is @element_name, subject to various checks specified by @options. If @element matches @element_name,
- * @element will be parsed as an @object_type, which must extend #GDataParsable. If parsing is successful, @_setter will be called with its first
- * parameter as @_parent_parsable, and its second as the parsed object of type @object_type. @_setter must reference the parsed object it's passed if
- * it wants to keep it, as gdata_parser_object_from_element_setter will unreference it before returning.
+ * Gets the object content of @element if its name is @element_name, subject to various checks specified by @options. If @element matches
+ * @element_name, @element will be parsed as an @object_type, which must extend #GDataParsable. If parsing is successful, @_setter will be called
+ * with its first parameter as @_parent_parsable, and its second as the parsed object of type @object_type. @_setter must reference the parsed object
+ * it's passed if it wants to keep it, as gdata_parser_object_from_element_setter will unreference it before returning.
  *
  * If @element doesn't match @element_name, %FALSE will be returned, @error will be unset and @success will be unset.
  *
@@ -455,8 +456,8 @@ gdata_parser_time_val_from_element (xmlNode *element, const gchar *element_name,
  * a given @element. If any of the calls to gdata_parser_object_from_element_setter() return %TRUE, the value of @success can be examined.
  *
  * @_setter and @_parent_parsable are both #gpointer<!-- -->s to avoid casts having to be put into calls to gdata_parser_object_from_element_setter().
- * @_setter is actually of type #GDataParserSetterFunc, and @_parent_parsable should be a subclass of #GDataParsable. Neither parameter should be %NULL.
- * No checks are implemented against these conditions (for efficiency reasons), so calling code must be correct.
+ * @_setter is actually of type #GDataParserSetterFunc, and @_parent_parsable should be a subclass of #GDataParsable.
+ * Neither parameter should be %NULL. No checks are implemented against these conditions (for efficiency reasons), so calling code must be correct.
  *
  * Return value: %TRUE if @element matched @element_name, %FALSE otherwise
  *
@@ -505,9 +506,9 @@ gdata_parser_object_from_element_setter (xmlNode *element, const gchar *element_
  * and undefined if @element didn't match @element_name
  * @error: a #GError, or %NULL
  *
- * Gets the object content of @element if its name is @element_name, subject to various checks specified by @options. If @element matches @element_name,
- * @element will be parsed as an @object_type, which must extend #GDataParsable. If parsing is successful, the parsed object will be returned in
- * @_output, which must be of type #GDataParsable (or a subclass). Ownership of the parsed object will pass to the calling code.
+ * Gets the object content of @element if its name is @element_name, subject to various checks specified by @options. If @element matches
+ * @element_name, @element will be parsed as an @object_type, which must extend #GDataParsable. If parsing is successful, the parsed object will be
+ * returned in @_output, which must be of type #GDataParsable (or a subclass). Ownership of the parsed object will pass to the calling code.
  *
  * If @element doesn't match @element_name, %FALSE will be returned, @error will be unset and @success will be unset.
  *
@@ -587,8 +588,7 @@ gdata_parser_string_append_escaped (GString *xml_string, const gchar *pre, const
 
 	/* Loop through the string to be escaped. Code adapted from GLib's g_markup_escape_text() function.
 	 *  Copyright 2000, 2003 Red Hat, Inc.
-	 *  Copyright 2007, 2008 Ryan Lortie <desrt desrt ca>
-	 */
+	 *  Copyright 2007, 2008 Ryan Lortie <desrt desrt ca> */
 	p = element_content;
 	while (p != NULL && *p != '\0') {
 		const gchar *next = g_utf8_next_char (p);
diff --git a/gdata/gdata-private.h b/gdata/gdata-private.h
index 4483bd7..aa7af28 100644
--- a/gdata/gdata-private.h
+++ b/gdata/gdata-private.h
@@ -50,11 +50,11 @@ void _gdata_service_set_authenticated (GDataService *self, gboolean authenticate
 SoupMessage *_gdata_service_build_message (GDataService *self, const gchar *method, const gchar *uri, const gchar *etag, gboolean etag_if_match);
 guint _gdata_service_send_message (GDataService *self, SoupMessage *message, GCancellable *cancellable, GError **error);
 SoupMessage *_gdata_service_query (GDataService *self, const gchar *feed_uri, GDataQuery *query, GCancellable *cancellable,
-				   GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-				   GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                   GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                   GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void _gdata_service_query_async (GDataService *self, const gchar *feed_uri, GDataQuery *query, GType entry_type, GCancellable *cancellable,
-				 GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-				 GAsyncReadyCallback callback, gpointer user_data, GSimpleAsyncThreadFunc query_thread);
+                                 GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                 GAsyncReadyCallback callback, gpointer user_data, GSimpleAsyncThreadFunc query_thread);
 const gchar *_gdata_service_get_scheme (void);
 GDataLogLevel _gdata_service_get_log_level (void);
 
@@ -64,16 +64,16 @@ void _gdata_query_set_previous_uri (GDataQuery *self, const gchar *previous_uri)
 
 #include "gdata-parsable.h"
 GDataParsable *_gdata_parsable_new_from_xml (GType parsable_type, const gchar *xml, gint length, gpointer user_data,
-					     GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                             GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 GDataParsable *_gdata_parsable_new_from_xml_node (GType parsable_type, xmlDoc *doc, xmlNode *node, gpointer user_data,
-						  GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                  GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void _gdata_parsable_get_xml (GDataParsable *self, GString *xml_string, gboolean declare_namespaces);
 void _gdata_parsable_string_append_escaped (GString *xml_string, const gchar *pre, const gchar *element_content, const gchar *post);
 
 #include "gdata-feed.h"
 GDataFeed *_gdata_feed_new_from_xml (GType feed_type, const gchar *xml, gint length, GType entry_type,
-				     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-				     GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                     GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void _gdata_feed_add_entry (GDataFeed *self, GDataEntry *entry);
 gpointer _gdata_feed_parse_data_new(GType entry_type, GDataQueryProgressCallback progress_callback, gpointer progress_user_data);
 void _gdata_feed_parse_data_free (gpointer data);
@@ -81,8 +81,8 @@ void _gdata_feed_call_progress_callback (GDataFeed *self, gpointer user_data, GD
 
 #include "gdata/services/documents/gdata-documents-entry.h"
 GFile *_gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataService *service, gchar **content_type, const gchar *download_uri,
-						 GFile *destination_directory, const gchar *file_extension, gboolean replace_file_if_exists,
-						 GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                 GFile *destination_directory, const gchar *file_extension, gboolean replace_file_if_exists,
+                                                 GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void _gdata_documents_entry_init_edited (GDataDocumentsEntry *self);
 
 #include "gdata/services/documents/gdata-documents-service.h"
diff --git a/gdata/gdata-query.c b/gdata/gdata-query.c
index 9e50289..55e4af5 100644
--- a/gdata/gdata-query.c
+++ b/gdata/gdata-query.c
@@ -139,10 +139,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * word "Austen", use the following query: <userinput>"Elizabeth Bennet" Darcy -Austen</userinput>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_Q,
-				g_param_spec_string ("q",
-					"Query terms", "Query terms for which to search.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("q",
+	                                                      "Query terms", "Query terms for which to search.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:categories:
@@ -156,9 +156,9 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * To do an OR between terms, use a pipe character (<literal>|</literal>). For example: <userinput>Fritz\%7CLaurie</userinput> returns
 	 * entries that match either category.
 	 *
-	 * An entry matches a specified category if the entry is in a category that has a matching term or label, as defined in the Atom specification.
-	 * (Roughly, the "term" is the internal string used by the software to identify the category, while the "label" is the human-readable string
-	 * presented to a user in a user interface.)
+	 * An entry matches a specified category if the entry is in a category that has a matching term or label, as defined in the Atom
+	 * specification. (Roughly, the "term" is the internal string used by the software to identify the category, while the "label" is the
+	 * human-readable string presented to a user in a user interface.)
 	 *
 	 * To exclude entries that match a given category, use the form <userinput>-categoryname</userinput>.
 	 *
@@ -169,10 +169,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * The above features can be combined. For example: <userinput>A|-{urn:google.com}B/-C</userinput> means (A OR (NOT B)) AND (NOT C).
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CATEGORIES,
-				g_param_spec_string ("categories",
-					"Category string", "Category search string.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("categories",
+	                                                      "Category string", "Category search string.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:author:
@@ -180,10 +180,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * An entry author. The service returns entries where the author name and/or e-mail address match your query string.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_AUTHOR,
-				g_param_spec_string ("author",
-					"Author", "Author search string.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("author",
+	                                                      "Author", "Author search string.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:updated-min:
@@ -191,10 +191,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * Lower bound on the entry update date, inclusive.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_UPDATED_MIN,
-				g_param_spec_boxed ("updated-min",
-					"Minimum update date", "Minimum date for updates on returned entries.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("updated-min",
+	                                                     "Minimum update date", "Minimum date for updates on returned entries.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:updated-max:
@@ -202,10 +202,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * Upper bound on the entry update date, exclusive.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_UPDATED_MAX,
-				g_param_spec_boxed ("updated-max",
-					"Maximum update date", "Maximum date for updates on returned entries.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("updated-max",
+	                                                     "Maximum update date", "Maximum date for updates on returned entries.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:published-min:
@@ -213,10 +213,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * Lower bound on the entry publish date, inclusive.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PUBLISHED_MIN,
-				g_param_spec_boxed ("published-min",
-					"Minimum publish date", "Minimum date for returned entries to be published.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("published-min",
+	                                                     "Minimum publish date", "Minimum date for returned entries to be published.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:published-max:
@@ -224,10 +224,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * Upper bound on the entry publish date, exclusive.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PUBLISHED_MAX,
-				g_param_spec_boxed ("published-max",
-					"Maximum publish date", "Maximum date for returned entries to be published.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("published-max",
+	                                                     "Maximum publish date", "Maximum date for returned entries to be published.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:start-index:
@@ -238,10 +238,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * Use <code class="literal">0</code> to not specify a start index.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_START_INDEX,
-				g_param_spec_uint ("start-index",
-					"Start index", "One-based result start index.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("start-index",
+	                                                    "Start index", "One-based result start index.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:is-strict:
@@ -252,10 +252,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_STRICT,
-				g_param_spec_boolean ("is-strict",
-					"Strict?", "Should the server be strict about the query?",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-strict",
+	                                                       "Strict?", "Should the server be strict about the query?",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:max-results:
@@ -266,10 +266,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * Use <code class="literal">0</code> to not specify a maximum number of results.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MAX_RESULTS,
-				g_param_spec_uint ("max-results",
-					"Maximum number of results", "The maximum number of entries to return.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("max-results",
+	                                                    "Maximum number of results", "The maximum number of entries to return.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataQuery:etag:
@@ -283,10 +283,10 @@ gdata_query_class_init (GDataQueryClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ETAG,
-				g_param_spec_string ("etag",
-					"ETag", "An ETag against which to check.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("etag",
+	                                                      "ETag", "An ETag against which to check.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -303,10 +303,8 @@ gdata_query_finalize (GObject *object)
 	g_free (priv->q);
 	g_free (priv->categories);
 	g_free (priv->author);
-
 	g_free (priv->next_uri);
 	g_free (priv->previous_uri);
-
 	g_free (priv->etag);
 
 	/* Chain up to the parent class */
@@ -523,10 +521,10 @@ GDataQuery *
 gdata_query_new_with_limits (const gchar *q, guint start_index, guint max_results)
 {
 	return g_object_new (GDATA_TYPE_QUERY,
-			     "q", q,
-			     "start-index", start_index,
-			     "max-results", max_results,
-			     NULL);
+	                     "q", q,
+	                     "start-index", start_index,
+	                     "max-results", max_results,
+	                     NULL);
 }
 
 /**
diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
index 71c68a3..8514af4 100644
--- a/gdata/gdata-service.c
+++ b/gdata/gdata-service.c
@@ -125,10 +125,10 @@ gdata_service_class_init (GDataServiceClass *klass)
 	 * YouTube reference documentation</ulink>).
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CLIENT_ID,
-				g_param_spec_string ("client-id",
-					"Client ID", "A client ID for your application.",
-					NULL,
-					G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("client-id",
+	                                                      "Client ID", "A client ID for your application.",
+	                                                      NULL,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataService:username:
@@ -136,10 +136,10 @@ gdata_service_class_init (GDataServiceClass *klass)
 	 * The user's Google or YouTube username for authentication. This will always be a full e-mail address.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_USERNAME,
-				g_param_spec_string ("username",
-					"Username", "The user's Google or YouTube username for authentication.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("username",
+	                                                      "Username", "The user's Google or YouTube username for authentication.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataService:password:
@@ -147,10 +147,10 @@ gdata_service_class_init (GDataServiceClass *klass)
 	 * The user's account password for authentication.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PASSWORD,
-				g_param_spec_string ("password",
-					"Password", "The user's account password for authentication.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("password",
+	                                                      "Password", "The user's account password for authentication.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataService:authenticated:
@@ -158,10 +158,10 @@ gdata_service_class_init (GDataServiceClass *klass)
 	 * Whether the user is authenticated (logged in) with the service.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_AUTHENTICATED,
-				g_param_spec_boolean ("authenticated",
-					"Authenticated", "Whether the user is authenticated (logged in) with the service.",
-					FALSE,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("authenticated",
+	                                                       "Authenticated", "Whether the user is authenticated (logged in) with the service.",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataService:proxy-uri:
@@ -171,10 +171,10 @@ gdata_service_class_init (GDataServiceClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PROXY_URI,
-				g_param_spec_boxed ("proxy-uri",
-					"Proxy URI", "The proxy URI used internally for all Internet requests.",
-					SOUP_TYPE_URI,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("proxy-uri",
+	                                                     "Proxy URI", "The proxy URI used internally for all Internet requests.",
+	                                                     SOUP_TYPE_URI,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataService::captcha-challenge:
@@ -189,11 +189,11 @@ gdata_service_class_init (GDataServiceClass *klass)
 	 * Return value: the text in the CAPTCHA image
 	 **/
 	service_signals[SIGNAL_CAPTCHA_CHALLENGE] = g_signal_new ("captcha-challenge",
-				G_TYPE_FROM_CLASS (klass),
-				G_SIGNAL_RUN_LAST,
-				0, NULL, NULL,
-				gdata_marshal_STRING__OBJECT_STRING,
-				G_TYPE_STRING, 1, G_TYPE_STRING);
+	                                                          G_TYPE_FROM_CLASS (klass),
+	                                                          G_SIGNAL_RUN_LAST,
+	                                                          0, NULL, NULL,
+	                                                          gdata_marshal_STRING__OBJECT_STRING,
+	                                                          G_TYPE_STRING, 1, G_TYPE_STRING);
 }
 
 static void
@@ -334,7 +334,7 @@ real_parse_authentication_response (GDataService *self, guint status, const gcha
 
 protocol_error:
 	g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-			     _("The server returned a malformed response."));
+	                     _("The server returned a malformed response."));
 	return FALSE;
 }
 
@@ -357,8 +357,8 @@ real_append_query_headers (GDataService *self, SoupMessage *message)
 }
 
 static void
-real_parse_error_response (GDataService *self, GDataOperationType operation_type, guint status, const gchar *reason_phrase, const gchar *response_body,
-			   gint length, GError **error)
+real_parse_error_response (GDataService *self, GDataOperationType operation_type, guint status, const gchar *reason_phrase,
+                           const gchar *response_body, gint length, GError **error)
 {
 	/* See: http://code.google.com/apis/gdata/docs/2.0/reference.html#HTTPStatusCodes */
 	switch (status) {
@@ -377,25 +377,25 @@ real_parse_error_response (GDataService *self, GDataOperationType operation_type
 		case SOUP_STATUS_MALFORMED:
 		case SOUP_STATUS_BAD_REQUEST: /* 400 */
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     /* Translators: the parameter is an error message returned by the server. */
-				     _("Invalid request URI or header, or unsupported nonstandard parameter: %s"), response_body);
+			             /* Translators: the parameter is an error message returned by the server. */
+			             _("Invalid request URI or header, or unsupported nonstandard parameter: %s"), response_body);
 			return;
 		case SOUP_STATUS_UNAUTHORIZED: /* 401 */
 		case SOUP_STATUS_FORBIDDEN: /* 403 */
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     /* Translators: the parameter is an error message returned by the server. */
-				     _("Authentication required: %s"), response_body);
+			             /* Translators: the parameter is an error message returned by the server. */
+			             _("Authentication required: %s"), response_body);
 			return;
 		case SOUP_STATUS_NOT_FOUND: /* 404 */
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_NOT_FOUND,
-				     /* Translators: the parameter is an error message returned by the server. */
-				     _("The requested resource was not found: %s"), response_body);
+			             /* Translators: the parameter is an error message returned by the server. */
+			             _("The requested resource was not found: %s"), response_body);
 			return;
 		case SOUP_STATUS_CONFLICT: /* 409 */
 		case SOUP_STATUS_PRECONDITION_FAILED: /* 412 */
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_CONFLICT,
-				     /* Translators: the parameter is an error message returned by the server. */
-				     _("The entry has been modified since it was downloaded: %s"), response_body);
+			             /* Translators: the parameter is an error message returned by the server. */
+			             _("The entry has been modified since it was downloaded: %s"), response_body);
 			return;
 		case SOUP_STATUS_INTERNAL_SERVER_ERROR: /* 500 */
 		default:
@@ -407,38 +407,45 @@ real_parse_error_response (GDataService *self, GDataOperationType operation_type
 	switch (operation_type) {
 		case GDATA_OPERATION_AUTHENTICATION:
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-			             /* Translators: the first parameter is an HTTP status, and the second is an error message returned by the server. */
+			             /* Translators: the first parameter is an HTTP status,
+			              * and the second is an error message returned by the server. */
 			             _("Error code %u when authenticating: %s"), status, response_body);
 			break;
 		case GDATA_OPERATION_QUERY:
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     /* Translators: the first parameter is an HTTP status, and the second is an error message returned by the server. */
-				     _("Error code %u when querying: %s"), status, response_body);
+			             /* Translators: the first parameter is an HTTP status,
+			              * and the second is an error message returned by the server. */
+			             _("Error code %u when querying: %s"), status, response_body);
 			break;
 		case GDATA_OPERATION_INSERTION:
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     /* Translators: the first parameter is an HTTP status, and the second is an error message returned by the server. */
-				     _("Error code %u when inserting an entry: %s"), status, response_body);
+			             /* Translators: the first parameter is an HTTP status,
+			              * and the second is an error message returned by the server. */
+			             _("Error code %u when inserting an entry: %s"), status, response_body);
 			break;
 		case GDATA_OPERATION_UPDATE:
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     /* Translators: the first parameter is an HTTP status, and the second is an error message returned by the server. */
-				     _("Error code %u when updating an entry: %s"), status, response_body);
+			             /* Translators: the first parameter is an HTTP status,
+			              * and the second is an error message returned by the server. */
+			             _("Error code %u when updating an entry: %s"), status, response_body);
 			break;
 		case GDATA_OPERATION_DELETION:
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     /* Translators: the first parameter is an HTTP status, and the second is an error message returned by the server. */
-				     _("Error code %u when deleting an entry: %s"), status, response_body);
+			             /* Translators: the first parameter is an HTTP status,
+			              * and the second is an error message returned by the server. */
+			             _("Error code %u when deleting an entry: %s"), status, response_body);
 			break;
 		case GDATA_OPERATION_DOWNLOAD:
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     /* Translators: the first parameter is an HTTP status, and the second is an error message returned by the server. */
-				     _("Error code %u when downloading: %s"), status, response_body);
+			             /* Translators: the first parameter is an HTTP status,
+			              * and the second is an error message returned by the server. */
+			             _("Error code %u when downloading: %s"), status, response_body);
 			break;
 		case GDATA_OPERATION_UPLOAD:
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     /* Translators: the first parameter is an HTTP status, and the second is an error message returned by the server. */
-				     _("Error code %u when uploading: %s"), status, response_body);
+			             /* Translators: the first parameter is an HTTP status,
+			              * and the second is an error message returned by the server. */
+			             _("Error code %u when uploading: %s"), status, response_body);
 			break;
 		default:
 			/* We should not be called with anything other than the above operation types */
@@ -542,7 +549,7 @@ authenticate_thread (GSimpleAsyncResult *result, GDataService *service, GCancell
  **/
 void
 gdata_service_authenticate_async (GDataService *self, const gchar *username, const gchar *password,
-				  GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+                                  GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	GSimpleAsyncResult *result;
 	AuthenticateAsyncData *data;
@@ -597,7 +604,7 @@ gdata_service_authenticate_finish (GDataService *self, GAsyncResult *async_resul
 
 static gboolean
 authenticate (GDataService *self, const gchar *username, const gchar *password, gchar *captcha_token, gchar *captcha_answer,
-	      GCancellable *cancellable, GError **error)
+              GCancellable *cancellable, GError **error)
 {
 	GDataServicePrivate *priv = self->priv;
 	GDataServiceClass *klass;
@@ -609,13 +616,13 @@ authenticate (GDataService *self, const gchar *username, const gchar *password,
 	/* Prepare the request */
 	klass = GDATA_SERVICE_GET_CLASS (self);
 	request_body = soup_form_encode ("accountType", "HOSTED_OR_GOOGLE",
-					 "Email", username,
-					 "Passwd", password,
-					 "service", klass->service_name,
-					 "source", priv->client_id,
-					 (captcha_token == NULL) ? NULL : "logintoken", captcha_token,
-					 "loginanswer", captcha_answer,
-					 NULL);
+	                                 "Email", username,
+	                                 "Passwd", password,
+	                                 "service", klass->service_name,
+	                                 "source", priv->client_id,
+	                                 (captcha_token == NULL) ? NULL : "logintoken", captcha_token,
+	                                 "loginanswer", captcha_answer,
+	                                 NULL);
 
 	/* Free the CAPTCHA token and answer if necessary */
 	g_free (captcha_token);
@@ -682,7 +689,7 @@ authenticate (GDataService *self, const gchar *username, const gchar *password,
 			if (new_captcha_answer == NULL || *new_captcha_answer == '\0') {
 				/* Translators: see http://en.wikipedia.org/wiki/CAPTCHA for information about CAPTCHAs */
 				g_set_error_literal (error, GDATA_AUTHENTICATION_ERROR, GDATA_AUTHENTICATION_ERROR_CAPTCHA_REQUIRED,
-						     _("A CAPTCHA must be filled out to log in."));
+				                     _("A CAPTCHA must be filled out to log in."));
 				goto login_error;
 			}
 
@@ -700,13 +707,13 @@ authenticate (GDataService *self, const gchar *username, const gchar *password,
 			g_object_unref (message);
 
 			return authenticate (self, username, password, g_strndup (captcha_start, captcha_end - captcha_start), new_captcha_answer,
-					     cancellable, error);
+			                     cancellable, error);
 		} else if (strncmp (error_start, "Unknown", error_end - error_start) == 0) {
 			goto protocol_error;
 		} else if (strncmp (error_start, "BadAuthentication", error_end - error_start) == 0) {
 			/* Looks like Error=BadAuthentication errors don't return a URI */
 			g_set_error_literal (error, GDATA_AUTHENTICATION_ERROR, GDATA_AUTHENTICATION_ERROR_BAD_AUTHENTICATION,
-					     _("Your username or password were incorrect."));
+			                     _("Your username or password were incorrect."));
 			goto login_error;
 		}
 
@@ -724,33 +731,33 @@ authenticate (GDataService *self, const gchar *username, const gchar *password,
 
 		if (strncmp (error_start, "NotVerified", error_end - error_start) == 0) {
 			g_set_error (error, GDATA_AUTHENTICATION_ERROR, GDATA_AUTHENTICATION_ERROR_NOT_VERIFIED,
-				     /* Translators: the parameter is a URI for further information. */
-				     _("Your account's e-mail address has not been verified. (%s)"), uri);
+			             /* Translators: the parameter is a URI for further information. */
+			             _("Your account's e-mail address has not been verified. (%s)"), uri);
 			goto login_error;
 		} else if (strncmp (error_start, "TermsNotAgreed", error_end - error_start) == 0) {
 			g_set_error (error, GDATA_AUTHENTICATION_ERROR, GDATA_AUTHENTICATION_ERROR_TERMS_NOT_AGREED,
-				     /* Translators: the parameter is a URI for further information. */
-				     _("You have not agreed to the service's terms and conditions. (%s)"), uri);
+			             /* Translators: the parameter is a URI for further information. */
+			             _("You have not agreed to the service's terms and conditions. (%s)"), uri);
 			goto login_error;
 		} else if (strncmp (error_start, "AccountDeleted", error_end - error_start) == 0) {
 			g_set_error (error, GDATA_AUTHENTICATION_ERROR, GDATA_AUTHENTICATION_ERROR_ACCOUNT_DELETED,
-				     /* Translators: the parameter is a URI for further information. */
-				     _("This account has been deleted. (%s)"), uri);
+			             /* Translators: the parameter is a URI for further information. */
+			             _("This account has been deleted. (%s)"), uri);
 			goto login_error;
 		} else if (strncmp (error_start, "AccountDisabled", error_end - error_start) == 0) {
 			g_set_error (error, GDATA_AUTHENTICATION_ERROR, GDATA_AUTHENTICATION_ERROR_ACCOUNT_DISABLED,
-				     /* Translators: the parameter is a URI for further information. */
-				     _("This account has been disabled. (%s)"), uri);
+			             /* Translators: the parameter is a URI for further information. */
+			             _("This account has been disabled. (%s)"), uri);
 			goto login_error;
 		} else if (strncmp (error_start, "ServiceDisabled", error_end - error_start) == 0) {
 			g_set_error (error, GDATA_AUTHENTICATION_ERROR, GDATA_AUTHENTICATION_ERROR_SERVICE_DISABLED,
-				     /* Translators: the parameter is a URI for further information. */
-				     _("This account's access to this service has been disabled. (%s)"), uri);
+			             /* Translators: the parameter is a URI for further information. */
+			             _("This account's access to this service has been disabled. (%s)"), uri);
 			goto login_error;
 		} else if (strncmp (error_start, "ServiceUnavailable", error_end - error_start) == 0) {
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_UNAVAILABLE,
-				     /* Translators: the parameter is a URI for further information. */
-				     _("This service is not available at the moment. (%s)"), uri);
+			             /* Translators: the parameter is a URI for further information. */
+			             _("This service is not available at the moment. (%s)"), uri);
 			goto login_error;
 		}
 
@@ -909,8 +916,8 @@ _gdata_service_send_message (GDataService *self, SoupMessage *message, GCancella
 		if (new_uri == NULL) {
 			gchar *uri_string = soup_uri_to_string (new_uri, FALSE);
 			g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     /* Translators: the parameter is the URI which is invalid. */
-				     _("Invalid redirect URI: %s"), uri_string);
+			             /* Translators: the parameter is the URI which is invalid. */
+			             _("Invalid redirect URI: %s"), uri_string);
 			g_free (uri_string);
 			return SOUP_STATUS_NONE;
 		}
@@ -1406,7 +1413,7 @@ insert_entry_thread (GSimpleAsyncResult *result, GDataService *service, GCancell
  **/
 void
 gdata_service_insert_entry_async (GDataService *self, const gchar *upload_uri, GDataEntry *entry, GCancellable *cancellable,
-				  GAsyncReadyCallback callback, gpointer user_data)
+                                  GAsyncReadyCallback callback, gpointer user_data)
 {
 	GSimpleAsyncResult *result;
 	InsertEntryAsyncData *data;
@@ -1501,7 +1508,7 @@ gdata_service_insert_entry (GDataService *self, const gchar *upload_uri, GDataEn
 
 	if (gdata_entry_is_inserted (entry) == TRUE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED,
-				     _("The entry has already been inserted."));
+		                     _("The entry has already been inserted."));
 		return NULL;
 	}
 
@@ -1531,7 +1538,7 @@ gdata_service_insert_entry (GDataService *self, const gchar *upload_uri, GDataEn
 	/* Parse the XML; create and return a new GDataEntry of the same type as @entry */
 	g_assert (message->response_body->data != NULL);
 	updated_entry = GDATA_ENTRY (gdata_parsable_new_from_xml (G_OBJECT_TYPE (entry), message->response_body->data, message->response_body->length,
-								  error));
+	                                                          error));
 	g_object_unref (message);
 
 	return updated_entry;
@@ -1688,7 +1695,7 @@ gdata_service_update_entry (GDataService *self, GDataEntry *entry, GCancellable
 	/* Parse the XML; create and return a new GDataEntry of the same type as @entry */
 	g_assert (message->response_body->data != NULL);
 	updated_entry = GDATA_ENTRY (gdata_parsable_new_from_xml (G_OBJECT_TYPE (entry), message->response_body->data, message->response_body->length,
-								  error));
+	                                                          error));
 	g_object_unref (message);
 
 	return updated_entry;
diff --git a/gdata/gdata-service.h b/gdata/gdata-service.h
index bac6f35..1e9cbdf 100644
--- a/gdata/gdata-service.h
+++ b/gdata/gdata-service.h
@@ -208,13 +208,15 @@ GDataEntry *gdata_service_insert_entry (GDataService *self, const gchar *upload_
                                         GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_service_insert_entry_async (GDataService *self, const gchar *upload_uri, GDataEntry *entry, GCancellable *cancellable,
                                        GAsyncReadyCallback callback, gpointer user_data);
-GDataEntry *gdata_service_insert_entry_finish (GDataService *self, GAsyncResult *async_result, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+GDataEntry *gdata_service_insert_entry_finish (GDataService *self, GAsyncResult *async_result,
+                                               GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 GDataEntry *gdata_service_update_entry (GDataService *self, GDataEntry *entry,
                                         GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_service_update_entry_async (GDataService *self, GDataEntry *entry, GCancellable *cancellable,
                                        GAsyncReadyCallback callback, gpointer user_data);
-GDataEntry *gdata_service_update_entry_finish (GDataService *self, GAsyncResult *async_result, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+GDataEntry *gdata_service_update_entry_finish (GDataService *self, GAsyncResult *async_result,
+                                               GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 gboolean gdata_service_delete_entry (GDataService *self, GDataEntry *entry, GCancellable *cancellable, GError **error);
 void gdata_service_delete_entry_async (GDataService *self, GDataEntry *entry, GCancellable *cancellable,
diff --git a/gdata/gdata-types.c b/gdata/gdata-types.c
index c9e1a37..954a0b4 100644
--- a/gdata/gdata-types.c
+++ b/gdata/gdata-types.c
@@ -48,8 +48,8 @@ gdata_g_time_val_get_type (void)
 
 	if (type_id == 0) {
 		type_id = g_boxed_type_register_static (g_intern_static_string ("GTimeVal"),
-							(GBoxedCopyFunc) gdata_g_time_val_copy,
-							(GBoxedFreeFunc) g_free);
+		                                        (GBoxedCopyFunc) gdata_g_time_val_copy,
+		                                        (GBoxedFreeFunc) g_free);
 	}
 
 	return type_id;
@@ -68,8 +68,8 @@ gdata_color_get_type (void)
 
 	if (type_id == 0) {
 		type_id = g_boxed_type_register_static (g_intern_static_string ("GDataColor"),
-							(GBoxedCopyFunc) gdata_color_copy,
-							(GBoxedFreeFunc) g_free);
+		                                        (GBoxedCopyFunc) gdata_color_copy,
+		                                        (GBoxedFreeFunc) g_free);
 	}
 
 	return type_id;
diff --git a/gdata/gdata-upload-stream.c b/gdata/gdata-upload-stream.c
index 71314ac..cddb29d 100644
--- a/gdata/gdata-upload-stream.c
+++ b/gdata/gdata-upload-stream.c
@@ -135,10 +135,10 @@ gdata_upload_stream_class_init (GDataUploadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SERVICE,
-					 g_param_spec_object ("service",
-							      "Service", "The service which is used to authenticate the upload.",
-							      GDATA_TYPE_SERVICE,
-							      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("service",
+	                                                      "Service", "The service which is used to authenticate the upload.",
+	                                                      GDATA_TYPE_SERVICE,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataUploadStream:upload-uri:
@@ -148,10 +148,10 @@ gdata_upload_stream_class_init (GDataUploadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_UPLOAD_URI,
-					 g_param_spec_string ("upload-uri",
-							      "Upload URI", "The URI of the file to upload.",
-							      NULL,
-							      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("upload-uri",
+	                                                      "Upload URI", "The URI of the file to upload.",
+	                                                      NULL,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataUploadStream:entry:
@@ -161,10 +161,10 @@ gdata_upload_stream_class_init (GDataUploadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ENTRY,
-					 g_param_spec_object ("entry",
-						      "Entry", "The entry used for metadata to upload.",
-							      GDATA_TYPE_ENTRY,
-							      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("entry",
+	                                                      "Entry", "The entry used for metadata to upload.",
+	                                                      GDATA_TYPE_ENTRY,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataUploadStream:slug:
@@ -174,10 +174,10 @@ gdata_upload_stream_class_init (GDataUploadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SLUG,
-					 g_param_spec_string ("slug",
-							      "Slug", "The slug of the file being uploaded.",
-							      NULL,
-							      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("slug",
+	                                                      "Slug", "The slug of the file being uploaded.",
+	                                                      NULL,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataUploadStream:content-type:
@@ -187,10 +187,10 @@ gdata_upload_stream_class_init (GDataUploadStreamClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CONTENT_TYPE,
-					 g_param_spec_string ("content-type",
-							      "Content type", "The content type of the file being uploaded.",
-							      NULL,
-							      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("content-type",
+	                                                      "Content type", "The content type of the file being uploaded.",
+	                                                      NULL,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -354,7 +354,7 @@ gdata_upload_stream_write (GOutputStream *stream, const void *buffer, gsize coun
 		first_part_header = "--" BOUNDARY_STRING "\nContent-Type: application/atom+xml; charset=UTF-8\n\n<?xml version='1.0'?>";
 		entry_xml = gdata_parsable_get_xml (GDATA_PARSABLE (priv->entry));
 		second_part_header = g_strdup_printf ("\n--" BOUNDARY_STRING "\nContent-Type: %s\nContent-Transfer-Encoding: binary\n\n",
-						      priv->content_type);
+		                                      priv->content_type);
 
 		/* Push the message parts onto the message body; we can skip the buffer, since the network thread hasn't yet been created,
 		 * so we're the sole thread accessing the SoupMessage. */
@@ -615,7 +615,7 @@ gdata_upload_stream_new (GDataService *service, const gchar *method, const gchar
 
 	/* Create the upload stream */
 	upload_stream = g_object_new (GDATA_TYPE_UPLOAD_STREAM, "upload-uri", upload_uri, "service", service, "entry", entry,
-				      "slug", slug, "content-type", content_type, NULL);
+	                              "slug", slug, "content-type", content_type, NULL);
 	upload_stream->priv->message = message;
 
 	/* Uploading doesn't actually start until the first call to write() */
diff --git a/gdata/gdata-upload-stream.h b/gdata/gdata-upload-stream.h
index 216f779..af64c8d 100644
--- a/gdata/gdata-upload-stream.h
+++ b/gdata/gdata-upload-stream.h
@@ -65,7 +65,7 @@ typedef struct {
 GType gdata_upload_stream_get_type (void) G_GNUC_CONST;
 
 GOutputStream *gdata_upload_stream_new (GDataService *service, const gchar *method, const gchar *upload_uri, GDataEntry *entry,
-					const gchar *slug, const gchar *content_type) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                        const gchar *slug, const gchar *content_type) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 const gchar *gdata_upload_stream_get_response (GDataUploadStream *self, gssize *length);
 
diff --git a/gdata/georss/gdata-georss-where.c b/gdata/georss/gdata-georss-where.c
index 57c6496..1b2f2a5 100644
--- a/gdata/georss/gdata-georss-where.c
+++ b/gdata/georss/gdata-georss-where.c
@@ -130,8 +130,8 @@ get_xml (GDataParsable *parsable, GString *xml_string)
 
 	if (priv->latitude != G_MAXDOUBLE && priv->longitude != G_MAXDOUBLE) {
 		g_string_append_printf (xml_string, "<gml:Point><gml:pos>%s %s</gml:pos></gml:Point>",
-					g_ascii_dtostr (latitude_str, sizeof (latitude_str), priv->latitude),
-					g_ascii_dtostr (longitude_str, sizeof (longitude_str), priv->longitude));
+		                        g_ascii_dtostr (latitude_str, sizeof (latitude_str), priv->latitude),
+		                        g_ascii_dtostr (longitude_str, sizeof (longitude_str), priv->longitude));
 	}
 }
 
@@ -183,7 +183,8 @@ gdata_georss_where_get_longitude (GDataGeoRSSWhere *self)
  *
  * Sets the #GDataGeoRSSWhere:latitude property to @latitude.
  *
- * Valid values range from <code class="literal">-90.0</code> to <code class="literal">90.0</code> inclusive. Set @latitude to %G_MAXDOUBLE to unset it.
+ * Valid values range from <code class="literal">-90.0</code> to <code class="literal">90.0</code> inclusive.
+ * Set @latitude to %G_MAXDOUBLE to unset it.
  *
  * Since: 0.5.0
  **/
@@ -205,8 +206,8 @@ gdata_georss_where_set_latitude (GDataGeoRSSWhere *self, gdouble latitude)
  *
  * Sets the #GDataGeoRSSWhere:longitude property to @longitude.
  *
- * Valid values range from <code class="literal">-180.0</code> to <code class="literal">180.0</code> inclusive. Set @longitude to %G_MAXDOUBLE
- * to unset it.
+ * Valid values range from <code class="literal">-180.0</code> to <code class="literal">180.0</code> inclusive.
+ * Set @longitude to %G_MAXDOUBLE to unset it.
  *
  * Since: 0.5.0
  **/
diff --git a/gdata/media/gdata-media-category.c b/gdata/media/gdata-media-category.c
index 72cf956..4ed3978 100644
--- a/gdata/media/gdata-media-category.c
+++ b/gdata/media/gdata-media-category.c
@@ -90,10 +90,10 @@ gdata_media_category_class_init (GDataMediaCategoryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CATEGORY,
-				g_param_spec_string ("category",
-					"Category", "The category name.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("category",
+	                                                      "Category", "The category name.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaCategory:scheme:
@@ -105,10 +105,10 @@ gdata_media_category_class_init (GDataMediaCategoryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SCHEME,
-				g_param_spec_string ("scheme",
-					"Scheme", "A URI that identifies the categorization scheme.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("scheme",
+	                                                      "Scheme", "A URI that identifies the categorization scheme.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaCategory:label:
@@ -120,10 +120,10 @@ gdata_media_category_class_init (GDataMediaCategoryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LABEL,
-				g_param_spec_string ("label",
-					"Label", "A human-readable label that can be displayed in end-user applications.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("label",
+	                                                      "Label", "A human-readable label that can be displayed in end-user applications.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/media/gdata-media-content.c b/gdata/media/gdata-media-content.c
index 1ab00a5..e32d627 100644
--- a/gdata/media/gdata-media-content.c
+++ b/gdata/media/gdata-media-content.c
@@ -99,10 +99,10 @@ gdata_media_content_class_init (GDataMediaContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_URI,
-				g_param_spec_string ("uri",
-					"URI", "The direct URI to the media object.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uri",
+	                                                      "URI", "The direct URI to the media object.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaContent:filesize:
@@ -114,10 +114,10 @@ gdata_media_content_class_init (GDataMediaContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FILESIZE,
-				g_param_spec_ulong ("filesize",
-					"Filesize", "The number of bytes of the media object.",
-					0, G_MAXULONG, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_ulong ("filesize",
+	                                                     "Filesize", "The number of bytes of the media object.",
+	                                                     0, G_MAXULONG, 0,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaContent:content-type:
@@ -129,10 +129,10 @@ gdata_media_content_class_init (GDataMediaContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CONTENT_TYPE,
-				g_param_spec_string ("content-type",
-					"Content type", "The standard MIME type of the object.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("content-type",
+	                                                      "Content type", "The standard MIME type of the object.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaContent:medium:
@@ -145,25 +145,25 @@ gdata_media_content_class_init (GDataMediaContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MEDIUM,
-				g_param_spec_enum ("medium",
-					"Medium", "The type of object.",
-					GDATA_TYPE_MEDIA_MEDIUM, GDATA_MEDIA_UNKNOWN,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("medium",
+	                                                    "Medium", "The type of object.",
+	                                                    GDATA_TYPE_MEDIA_MEDIUM, GDATA_MEDIA_UNKNOWN,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaContent:is-default:
 	 *
-	 * Determines if this is the default object that should be used for the media group. There should only be one default object per media group.
+	 * Determines if this is the default content for the media group. There should only be one default object per media group.
 	 *
 	 * For more information, see the <ulink type="http" url="http://video.search.yahoo.com/mrss";>Media RSS specification</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_DEFAULT,
-				g_param_spec_boolean ("is-default",
-					"Default?", "Determines if this is the default object that should be used for the media group.",
-					FALSE,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-default",
+	                                                       "Default?", "Determines if this is the default content for the media group.",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaContent:expression:
@@ -175,10 +175,10 @@ gdata_media_content_class_init (GDataMediaContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EXPRESSION,
-				g_param_spec_enum ("expression",
-					"Expression", "Determines if the object is a sample or the full version of the object.",
-					GDATA_TYPE_MEDIA_EXPRESSION, GDATA_MEDIA_EXPRESSION_FULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("expression",
+	                                                    "Expression", "Determines if the object is a sample or the full version of the object.",
+	                                                    GDATA_TYPE_MEDIA_EXPRESSION, GDATA_MEDIA_EXPRESSION_FULL,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaContent:duration:
@@ -190,10 +190,10 @@ gdata_media_content_class_init (GDataMediaContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DURATION,
-				g_param_spec_int64 ("duration",
-					"Duration", "The number of seconds for which the media object plays.",
-					0, G_MAXINT64, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_int64 ("duration",
+	                                                     "Duration", "The number of seconds for which the media object plays.",
+	                                                     0, G_MAXINT64, 0,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaContent:height:
@@ -205,10 +205,10 @@ gdata_media_content_class_init (GDataMediaContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_HEIGHT,
-				g_param_spec_uint ("height",
-					"Height", "The height of the media object.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("height",
+	                                                    "Height", "The height of the media object.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaContent:width:
@@ -220,10 +220,10 @@ gdata_media_content_class_init (GDataMediaContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_WIDTH,
-				g_param_spec_uint ("width",
-					"Width", "The width of the media object.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("width",
+	                                                    "Width", "The width of the media object.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -302,13 +302,13 @@ pre_parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *root_node, gpointe
 
 	/* Parse expression */
 	expression = xmlGetProp (root_node, (xmlChar*) "expression");
-	if (expression == NULL || xmlStrcmp (expression, (xmlChar*) "full") == 0)
+	if (expression == NULL || xmlStrcmp (expression, (xmlChar*) "full") == 0) {
 		expression_enum = GDATA_MEDIA_EXPRESSION_FULL;
-	else if (xmlStrcmp (expression, (xmlChar*) "sample") == 0)
+	} else if (xmlStrcmp (expression, (xmlChar*) "sample") == 0) {
 		expression_enum = GDATA_MEDIA_EXPRESSION_SAMPLE;
-	else if (xmlStrcmp (expression, (xmlChar*) "nonstop") == 0)
+	} else if (xmlStrcmp (expression, (xmlChar*) "nonstop") == 0) {
 		expression_enum = GDATA_MEDIA_EXPRESSION_NONSTOP;
-	else {
+	} else {
 		gdata_parser_error_unknown_property_value (root_node, "expression", (gchar*) expression, error);
 		xmlFree (expression);
 		return FALSE;
@@ -317,19 +317,19 @@ pre_parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *root_node, gpointe
 
 	/* Parse medium */
 	medium = xmlGetProp (root_node, (xmlChar*) "medium");
-	if (medium == NULL)
+	if (medium == NULL) {
 		medium_enum = GDATA_MEDIA_UNKNOWN;
-	else if (xmlStrcmp (medium, (xmlChar*) "image") == 0)
+	} else if (xmlStrcmp (medium, (xmlChar*) "image") == 0) {
 		medium_enum = GDATA_MEDIA_IMAGE;
-	else if (xmlStrcmp (medium, (xmlChar*) "audio") == 0)
+	} else if (xmlStrcmp (medium, (xmlChar*) "audio") == 0) {
 		medium_enum = GDATA_MEDIA_AUDIO;
-	else if (xmlStrcmp (medium, (xmlChar*) "video") == 0)
+	} else if (xmlStrcmp (medium, (xmlChar*) "video") == 0) {
 		medium_enum = GDATA_MEDIA_VIDEO;
-	else if (xmlStrcmp (medium, (xmlChar*) "document") == 0)
+	} else if (xmlStrcmp (medium, (xmlChar*) "document") == 0) {
 		medium_enum = GDATA_MEDIA_DOCUMENT;
-	else if (xmlStrcmp (medium, (xmlChar*) "executable") == 0)
+	} else if (xmlStrcmp (medium, (xmlChar*) "executable") == 0) {
 		medium_enum = GDATA_MEDIA_EXECUTABLE;
-	else {
+	} else {
 		gdata_parser_error_unknown_property_value (root_node, "medium", (gchar*) medium, error);
 		xmlFree (medium);
 		return FALSE;
@@ -555,7 +555,8 @@ gdata_media_content_get_width (GDataMediaContent *self)
  * Since: 0.6.0
  **/
 GFile *
-gdata_media_content_download (GDataMediaContent *self, GDataService *service, const gchar *default_filename, GFile *target_dest_file, gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
+gdata_media_content_download (GDataMediaContent *self, GDataService *service, const gchar *default_filename, GFile *target_dest_file,
+                              gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
 {
 	GFileOutputStream *dest_stream;
 	const gchar *src_uri;
@@ -570,7 +571,8 @@ gdata_media_content_download (GDataMediaContent *self, GDataService *service, co
 	g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
 	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
-	dest_stream = _gdata_download_stream_find_destination (default_filename, target_dest_file, &actual_file, replace_file_if_exists, cancellable, error);
+	dest_stream = _gdata_download_stream_find_destination (default_filename, target_dest_file, &actual_file, replace_file_if_exists,
+	                                                       cancellable, error);
 	if (dest_stream == NULL)
 		return NULL;
 
@@ -579,7 +581,7 @@ gdata_media_content_download (GDataMediaContent *self, GDataService *service, co
 	/* Synchronously splice the data from the download stream to the file stream (network -> disk) */
 	src_stream = gdata_download_stream_new (GDATA_SERVICE (service), src_uri);
 	g_output_stream_splice (G_OUTPUT_STREAM (dest_stream), src_stream,
-				G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, cancellable, &child_error);
+	                        G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, cancellable, &child_error);
 	g_object_unref (src_stream);
 	g_object_unref (dest_stream);
 	if (child_error != NULL) {
diff --git a/gdata/media/gdata-media-credit.c b/gdata/media/gdata-media-credit.c
index 5784f8e..92a9661 100644
--- a/gdata/media/gdata-media-credit.c
+++ b/gdata/media/gdata-media-credit.c
@@ -86,10 +86,10 @@ gdata_media_credit_class_init (GDataMediaCreditClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CREDIT,
-				g_param_spec_string ("credit",
-					"Credit", "The credited entity's name.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("credit",
+	                                                      "Credit", "The credited entity's name.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaCredit:scheme:
@@ -101,10 +101,10 @@ gdata_media_credit_class_init (GDataMediaCreditClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SCHEME,
-				g_param_spec_string ("scheme",
-					"Scheme", "A URI that identifies the role scheme.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("scheme",
+	                                                      "Scheme", "A URI that identifies the role scheme.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaCredit:role:
@@ -116,10 +116,10 @@ gdata_media_credit_class_init (GDataMediaCreditClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ROLE,
-				g_param_spec_string ("role",
-					"Role", "The role the credited entity played in the production of the media.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("role",
+	                                                      "Role", "The role the credited entity played in the production of the media.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/media/gdata-media-group.c b/gdata/media/gdata-media-group.c
index f75a538..e9566f2 100644
--- a/gdata/media/gdata-media-group.c
+++ b/gdata/media/gdata-media-group.c
@@ -144,13 +144,13 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 		if (gdata_parser_string_from_element (node, "title", P_NONE, &(self->priv->title), &success, error) == TRUE ||
 		    gdata_parser_string_from_element (node, "description", P_NONE, &(self->priv->description), &success, error) == TRUE ||
 		    gdata_parser_object_from_element_setter (node, "category", P_REQUIRED, GDATA_TYPE_MEDIA_CATEGORY,
-			                                     gdata_media_group_set_category, self, &success, error) == TRUE ||
+		                                             gdata_media_group_set_category, self, &success, error) == TRUE ||
 		    gdata_parser_object_from_element_setter (node, "content", P_REQUIRED, GDATA_TYPE_MEDIA_CONTENT,
-			                                     _gdata_media_group_add_content, self, &success, error) == TRUE ||
+		                                             _gdata_media_group_add_content, self, &success, error) == TRUE ||
 		    gdata_parser_object_from_element_setter (node, "thumbnail", P_REQUIRED, GDATA_TYPE_MEDIA_THUMBNAIL,
-			                                     _gdata_media_group_add_thumbnail, self, &success, error) == TRUE ||
+		                                             _gdata_media_group_add_thumbnail, self, &success, error) == TRUE ||
 		    gdata_parser_object_from_element (node, "credit", P_REQUIRED | P_NO_DUPES, GDATA_TYPE_MEDIA_CREDIT,
-			                              &(self->priv->credit), &success, error) == TRUE) {
+		                                      &(self->priv->credit), &success, error) == TRUE) {
 			return success;
 		} else if (xmlStrcmp (node->name, (xmlChar*) "keywords") == 0) {
 			/* media:keywords */
@@ -220,11 +220,11 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 			xmlFree (type);
 
 			relationship = xmlGetProp (node, (xmlChar*) "relationship");
-			if (xmlStrcmp (relationship, (xmlChar*) "allow") == 0)
+			if (xmlStrcmp (relationship, (xmlChar*) "allow") == 0) {
 				relationship_bool = FALSE; /* it's *not* a restricted country */
-			else if (xmlStrcmp (relationship, (xmlChar*) "deny") == 0)
+			} else if (xmlStrcmp (relationship, (xmlChar*) "deny") == 0) {
 				relationship_bool = TRUE; /* it *is* a restricted country */
-			else {
+			} else {
 				gdata_parser_error_unknown_property_value (node, "relationship", (gchar*) relationship, error);
 				xmlFree (relationship);
 				return FALSE;
diff --git a/gdata/media/gdata-media-thumbnail.c b/gdata/media/gdata-media-thumbnail.c
index eb98a67..59592a7 100644
--- a/gdata/media/gdata-media-thumbnail.c
+++ b/gdata/media/gdata-media-thumbnail.c
@@ -86,10 +86,10 @@ gdata_media_thumbnail_class_init (GDataMediaThumbnailClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_URI,
-				g_param_spec_string ("uri",
-					"URI", "The URI of the thumbnail.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uri",
+	                                                      "URI", "The URI of the thumbnail.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaThumbnail:height:
@@ -101,10 +101,10 @@ gdata_media_thumbnail_class_init (GDataMediaThumbnailClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_HEIGHT,
-				g_param_spec_uint ("height",
-					"Height", "The height of the thumbnail, in pixels.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("height",
+	                                                    "Height", "The height of the thumbnail, in pixels.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaThumbnail:width:
@@ -116,10 +116,10 @@ gdata_media_thumbnail_class_init (GDataMediaThumbnailClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_WIDTH,
-				g_param_spec_uint ("width",
-					"Width", "The width of the thumbnail, in pixels.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("width",
+	                                                    "Width", "The width of the thumbnail, in pixels.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataMediaThumbnail:time:
@@ -131,10 +131,10 @@ gdata_media_thumbnail_class_init (GDataMediaThumbnailClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TIME,
-				g_param_spec_int64 ("time",
-					"Time", "The time offset of the thumbnail in relation to the media object, in milliseconds.",
-					-1, G_MAXINT64, -1,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_int64 ("time",
+	                                                     "Time", "The time offset of the thumbnail in relation to the media object, in ms.",
+	                                                     -1, G_MAXINT64, -1,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -382,7 +382,8 @@ gdata_media_thumbnail_get_time (GDataMediaThumbnail *self)
  * Since: 0.6.0
  **/
 GFile *
-gdata_media_thumbnail_download (GDataMediaThumbnail *self, GDataService *service, const gchar *default_filename, GFile *target_dest_file, gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
+gdata_media_thumbnail_download (GDataMediaThumbnail *self, GDataService *service, const gchar *default_filename, GFile *target_dest_file,
+                                gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
 {
 	GFileOutputStream *dest_stream;
 	const gchar *src_uri;
@@ -397,7 +398,8 @@ gdata_media_thumbnail_download (GDataMediaThumbnail *self, GDataService *service
 	g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
 	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
-	dest_stream = _gdata_download_stream_find_destination (default_filename, target_dest_file, &actual_file, replace_file_if_exists, cancellable, error);
+	dest_stream = _gdata_download_stream_find_destination (default_filename, target_dest_file, &actual_file, replace_file_if_exists,
+	                                                       cancellable, error);
 	if (dest_stream == NULL)
 		return NULL;
 
@@ -406,7 +408,7 @@ gdata_media_thumbnail_download (GDataMediaThumbnail *self, GDataService *service
 	/* Synchronously splice the data from the download stream to the file stream (network -> disk) */
 	src_stream = gdata_download_stream_new (GDATA_SERVICE (service), src_uri);
 	g_output_stream_splice (G_OUTPUT_STREAM (dest_stream), src_stream,
-				G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, cancellable, &child_error);
+	                        G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, cancellable, &child_error);
 	g_object_unref (src_stream);
 	g_object_unref (dest_stream);
 	if (child_error != NULL) {
diff --git a/gdata/services/calendar/gdata-calendar-calendar.c b/gdata/services/calendar/gdata-calendar-calendar.c
index a469fe6..2e1df86 100644
--- a/gdata/services/calendar/gdata-calendar-calendar.c
+++ b/gdata/services/calendar/gdata-calendar-calendar.c
@@ -76,7 +76,7 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (GDataCalendarCalendar, gdata_calendar_calendar, GDATA_TYPE_ENTRY,
-			 G_IMPLEMENT_INTERFACE (GDATA_TYPE_ACCESS_HANDLER, gdata_calendar_calendar_access_handler_init))
+                         G_IMPLEMENT_INTERFACE (GDATA_TYPE_ACCESS_HANDLER, gdata_calendar_calendar_access_handler_init))
 
 static void
 gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass)
@@ -101,21 +101,21 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass)
 	 * url="http://en.wikipedia.org/wiki/Tz_database#Names_of_time_zones";>reference</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TIMEZONE,
-				g_param_spec_string ("timezone",
-					"Timezone", "The timezone in which the calendar's times are given.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("timezone",
+	                                                      "Timezone", "The timezone in which the calendar's times are given.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarCalendar:times-cleaned:
 	 *
-	 * The number of times the calendar has been completely cleared of events.
+	 * The number of times the calendar has been cleared of events.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TIMES_CLEANED,
-				g_param_spec_uint ("times-cleaned",
-					"Times cleaned", "The number of times the calendar has been completely cleared of events.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("times-cleaned",
+	                                                    "Times cleaned", "The number of times the calendar has been cleared of events.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarCalendar:is-hidden:
@@ -125,10 +125,10 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_HIDDEN,
-				g_param_spec_boolean ("is-hidden",
-					"Hidden?", "Indicates whether the calendar is visible.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-hidden",
+	                                                       "Hidden?", "Indicates whether the calendar is visible.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarCalendar:color:
@@ -136,10 +136,10 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass)
 	 * The color used to highlight the calendar in the user's browser.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_COLOR,
-				g_param_spec_boxed ("color",
-					"Color", "The color used to highlight the calendar in the user's browser.",
-					GDATA_TYPE_COLOR,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("color",
+	                                                     "Color", "The color used to highlight the calendar in the user's browser.",
+	                                                     GDATA_TYPE_COLOR,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarCalendar:is-selected:
@@ -149,22 +149,22 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_SELECTED,
-				g_param_spec_boolean ("is-selected",
-					"Selected?", "Indicates whether the calendar is selected.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-selected",
+	                                                       "Selected?", "Indicates whether the calendar is selected.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarCalendar:access-level:
 	 *
-	 * Indicates what level of access the authenticated user has to the calendar. For example: %GDATA_CALENDAR_ACCESS_ROLE_READ or
-	 * %GDATA_CALENDAR_ACCESS_ROLE_FREE_BUSY.
+	 * Indicates the access level the current user has to the calendar. For example: %GDATA_CALENDAR_ACCESS_ROLE_READ or
+	 * %GDATA_CALENDAR_ACCESS_ROLE_FREE_BUSY. The "current user" is the one logged in with gdata_service_authenticate() or the guest user.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ACCESS_LEVEL,
-				g_param_spec_string ("access-level",
-					"Access level", "Indicates what level of access the authenticated user has to the calendar.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("access-level",
+	                                                      "Access level", "Indicates the access level the current user has to the calendar.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarCalendar:edited:
@@ -175,10 +175,10 @@ gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass)
 	 * Atom Publishing Protocol specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EDITED,
-				g_param_spec_boxed ("edited",
-					"Edited", "The last time the calendar was edited.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("edited",
+	                                                     "Edited", "The last time the calendar was edited.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static gboolean
@@ -308,13 +308,14 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 			if (gdata_color_from_hexadecimal ((gchar*) value, &colour) == FALSE) {
 				/* Error */
 				g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-					     /* Translators: the first parameter is the name of an XML element (including the angle brackets
-					      * ("<" and ">"), and the second parameter is the erroneous value (which was not in hexadecimal
-					      * RGB format).
-					      *
-					      * For example:
-					      *  The content of a <entry/gCal:color> element ("00FG56") was not in hexadecimal RGB format. */
-					     _("The content of a %s element (\"%s\") was not in hexadecimal RGB format."), "<entry/gCal:color>", value);
+				             /* Translators: the first parameter is the name of an XML element (including the angle brackets
+				              * ("<" and ">"), and the second parameter is the erroneous value (which was not in hexadecimal
+				              * RGB format).
+				              *
+				              * For example:
+				              *  The content of a <entry/gCal:color> element ("00FG56") was not in hexadecimal RGB format. */
+				             _("The content of a %s element (\"%s\") was not in hexadecimal RGB format."),
+				             "<entry/gCal:color>", value);
 				xmlFree (value);
 
 				return FALSE;
diff --git a/gdata/services/calendar/gdata-calendar-event.c b/gdata/services/calendar/gdata-calendar-event.c
index 38842f1..7d7fbbf 100644
--- a/gdata/services/calendar/gdata-calendar-event.c
+++ b/gdata/services/calendar/gdata-calendar-event.c
@@ -113,10 +113,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * Atom Publishing Protocol specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EDITED,
-				g_param_spec_boxed ("edited",
-					"Edited", "The last time the event was edited.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("edited",
+	                                                     "Edited", "The last time the event was edited.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:status:
@@ -129,10 +129,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_STATUS,
-				g_param_spec_string ("status",
-					"Status", "The scheduling status of the event.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("status",
+	                                                      "Status", "The scheduling status of the event.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:visibility:
@@ -143,10 +143,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * GData specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VISIBILITY,
-				g_param_spec_string ("visibility",
-					"Visibility", "The event's visibility to calendar users.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("visibility",
+	                                                      "Visibility", "The event's visibility to calendar users.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:transparency:
@@ -158,10 +158,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * GData specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TRANSPARENCY,
-				g_param_spec_string ("transparency",
-					"Transparency", "How the event is marked as consuming time on a calendar.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("transparency",
+	                                                      "Transparency", "How the event is marked as consuming time on a calendar.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:uid:
@@ -170,10 +170,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * url="http://www.ietf.org/rfc/rfc2445.txt";>RFC 2445</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_UID,
-				g_param_spec_string ("uid",
-					"UID", "The globally unique identifier (UID) of the event.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("uid",
+	                                                      "UID", "The globally unique identifier (UID) of the event.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:sequence:
@@ -182,64 +182,64 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * url="http://www.ietf.org/rfc/rfc2445.txt";>RFC 2445</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SEQUENCE,
-				g_param_spec_uint ("sequence",
-					"Sequence", "The revision sequence number of the event.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("sequence",
+	                                                    "Sequence", "The revision sequence number of the event.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:guests-can-modify:
 	 *
-	 * Indicates whether event attendees may modify the original event, so that changes are visible to organizer and other attendees.
+	 * Indicates whether attendees may modify the original event, so that changes are visible to organizers and other attendees.
 	 * Otherwise, any changes made by attendees will be restricted to that attendee's calendar.
 	 *
 	 * For more information, see the <ulink type="http" url="http://code.google.com/apis/calendar/docs/2.0/reference.html#gCalguestsCanModify";>
 	 * GData specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_GUESTS_CAN_MODIFY,
-				g_param_spec_boolean ("guests-can-modify",
-					"Guests can modify", "Indicates whether event attendees may modify the original event.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("guests-can-modify",
+	                                                       "Guests can modify", "Indicates whether attendees may modify the original event.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:guests-can-invite-others:
 	 *
-	 * Indicates whether event attendees may invite other people to the event.
+	 * Indicates whether attendees may invite others to the event.
 	 *
 	 * For more information, see the <ulink type="http"
 	 * url="http://code.google.com/apis/calendar/docs/2.0/reference.html#gCalguestsCanInviteOthers";>GData specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_GUESTS_CAN_INVITE_OTHERS,
-				g_param_spec_boolean ("guests-can-invite-others",
-					"Guests can invite others", "Indicates whether event attendees may invite other people to the event.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("guests-can-invite-others",
+	                                                       "Guests can invite others", "Indicates whether attendees may invite others.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:guests-can-see-guests:
 	 *
-	 * Indicates whether event attendees can see other people invited to the event.
+	 * Indicates whether attendees can see other people invited to the event.
 	 *
 	 * For more information, see the <ulink type="http" url="http://code.google.com/apis/calendar/docs/2.0/reference.html#gCalguestsCanSeeGuests";>
 	 * GData specification</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_GUESTS_CAN_SEE_GUESTS,
-				g_param_spec_boolean ("guests-can-see-guests",
-					"Guests can see guests", "Indicates whether event attendees can see other people invited to the event.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("guests-can-see-guests",
+	                                                       "Guests can see guests", "Indicates whether attendees can see other people invited.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:anyone-can-add-self:
 	 *
-	 * Indicates whether anyone can add themselves to the attendee list of the event.
+	 * Indicates whether anyone can invite themselves to the event, by adding themselves to the attendee list.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ANYONE_CAN_ADD_SELF,
-				g_param_spec_boolean ("anyone-can-add-self",
-					"Anyone can add self", "Indicates whether anyone can add themselves to the attendee list of the event.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("anyone-can-add-self",
+	                                                       "Anyone can add self", "Indicates whether anyone can invite themselves to the event.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:recurrence:
@@ -252,10 +252,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RECURRENCE,
-				g_param_spec_string ("recurrence",
-					"Recurrence", "Represents the dates and times when a recurring event takes place.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("recurrence",
+	                                                      "Recurrence", "Represents the dates and times when a recurring event takes place.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:original-event-id:
@@ -265,10 +265,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ORIGINAL_EVENT_ID,
-				g_param_spec_string ("original-event-id",
-					"Original event ID", "The event ID for the original event, if this event is an exception to a recurring event.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("original-event-id",
+	                                                      "Original event ID", "The event ID for the original event.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarEvent:original-event-uri:
@@ -278,11 +278,10 @@ gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ORIGINAL_EVENT_URI,
-				g_param_spec_string ("original-event-uri",
-					"Original event URI", "The event URI for the original event, if this event is an exception"
-					" to a recurring event.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("original-event-uri",
+	                                                      "Original event URI", "The event URI for the original event.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/services/calendar/gdata-calendar-feed.c b/gdata/services/calendar/gdata-calendar-feed.c
index 634f848..a54cf0c 100644
--- a/gdata/services/calendar/gdata-calendar-feed.c
+++ b/gdata/services/calendar/gdata-calendar-feed.c
@@ -72,10 +72,10 @@ gdata_calendar_feed_class_init (GDataCalendarFeedClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TIMEZONE,
-				g_param_spec_string ("timezone",
-					"Timezone", "The timezone in which the feed's times are given.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("timezone",
+	                                                      "Timezone", "The timezone in which the feed's times are given.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarFeed:times-cleaned:
@@ -85,10 +85,10 @@ gdata_calendar_feed_class_init (GDataCalendarFeedClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TIMES_CLEANED,
-				g_param_spec_uint ("times-cleaned",
-					"Times cleaned", "The number of times the feed has been completely cleared of entries.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("times-cleaned",
+	                                                    "Times cleaned", "The number of times the feed has been completely cleared of entries.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/services/calendar/gdata-calendar-query.c b/gdata/services/calendar/gdata-calendar-query.c
index adf0f81..a576a3a 100644
--- a/gdata/services/calendar/gdata-calendar-query.c
+++ b/gdata/services/calendar/gdata-calendar-query.c
@@ -86,15 +86,15 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass)
 	/**
 	 * GDataCalendarQuery:future-events:
 	 *
-	 * A shortcut to request all events that are scheduled for future times. Overrides the
+	 * A shortcut to request all events scheduled for the future. Overrides the
 	 * #GDataCalendarQuery:recurrence-expansion-start, #GDataCalendarQuery:recurrence-expansion-end,
 	 * #GDataCalendarQuery:start-min and #GDataCalendarQuery:start-max properties.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FUTURE_EVENTS,
-				g_param_spec_boolean ("future-events",
-					"Future events?", "A shortcut to request all events that are scheduled for future times.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("future-events",
+	                                                       "Future events?", "A shortcut to request all events scheduled for the future.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarQuery:order-by:
@@ -103,32 +103,32 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass)
 	 * <literal>starttime</literal>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ORDER_BY,
-				g_param_spec_string ("order-by",
-					"Order by", "Specifies order of entries in a feed.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("order-by",
+	                                                      "Order by", "Specifies order of entries in a feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarQuery:recurrence-expansion-start:
 	 *
-	 * Specifies beginning of time period for which to expand recurring events, inclusive.
+	 * Specifies the beginning of the time period to expand recurring events for, inclusive.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RECURRENCE_EXPANSION_START,
-				g_param_spec_boxed ("recurrence-expansion-start",
-					"Recurrence expansion start", "Specifies beginning of time period for which to expand recurring events.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("recurrence-expansion-start",
+	                                                     "Recurrence expansion start", "Specifies start of period to expand recurrences for.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarQuery:recurrence-expansion-end:
 	 *
-	 * Specifies end of time period for which to expand recurring events, exclusive.
+	 * Specifies the end of the time period to expand recurring events for, exclusive.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RECURRENCE_EXPANSION_END,
-				g_param_spec_boxed ("recurrence-expansion-end",
-					"Recurrence expansion end", "Specifies end of time period for which to expand recurring events.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("recurrence-expansion-end",
+	                                                     "Recurrence expansion end", "Specifies end of period to expand recurrences for.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarQuery:single-events:
@@ -136,10 +136,10 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass)
 	 * Indicates whether recurring events should be expanded or represented as a single event.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SINGLE_EVENTS,
-				g_param_spec_boolean ("single-events",
-					"Single events?", "Indicates whether recurring events should be expanded or represented as a single event.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("single-events",
+	                                                       "Single events?", "Indicates whether recurring events should be expanded.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarQuery:sort-order:
@@ -148,15 +148,15 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass)
 	 * <literal>descending</literal>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SORT_ORDER,
-				g_param_spec_string ("sort-order",
-					"Sort order", "Specifies direction of sorting.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("sort-order",
+	                                                      "Sort order", "Specifies direction of sorting.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarQuery:start-min:
 	 *
-	 * Together with #GDataCalendarQuery:start-max creates a timespan such that only events that are within the timespan are returned.
+	 * Together with #GDataCalendarQuery:start-max, creates a timespan such that only events within the timespan are returned.
 	 *
 	 * #GDataCalendarQuery:start-min is inclusive, while #GDataCalendarQuery:start-max is exclusive. Events that overlap the range are
 	 * included.
@@ -164,15 +164,15 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass)
 	 * If not specified, the default #GDataCalendarQuery:start-min is <literal>1970-01-01</literal>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_START_MIN,
-				g_param_spec_boxed ("start-min",
-					"Start min", "A timespan such that only events that are within the timespan are returned.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("start-min",
+	                                                     "Start min", "A timespan such that only events within the timespan are returned.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarQuery:start-max:
 	 *
-	 * Together with #GDataCalendarQuery:start-min creates a timespan such that only events that are within the timespan are returned
+	 * Together with #GDataCalendarQuery:start-min, creates a timespan such that only events within the timespan are returned
 	 *
 	 * #GDataCalendarQuery:start-min is inclusive, while #GDataCalendarQuery:start-max is exclusive. Events that overlap the range are
 	 * included.
@@ -180,23 +180,23 @@ gdata_calendar_query_class_init (GDataCalendarQueryClass *klass)
 	 * If not specified, the default #GDataCalendarQuery:start-max is <literal>2031-01-01</literal>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_START_MAX,
-				g_param_spec_boxed ("start-max",
-					"Start max", "A timespan such that only events that are within the timespan are returned.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("start-max",
+	                                                     "Start max", "A timespan such that only events within the timespan are returned.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataCalendarQuery:timezone:
 	 *
-	 * The current timezone. If not specified, times are returned in UTC.
+	 * The current timezone. If this is not specified, all times are returned in UTC.
 	 *
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TIMEZONE,
-				g_param_spec_string ("timezone",
-					"Timezone", "The current timezone. If not specified, times are returned in UTC.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("timezone",
+	                                                      "Timezone", "The current timezone.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -408,10 +408,10 @@ GDataCalendarQuery *
 gdata_calendar_query_new_with_limits (const gchar *q, const GTimeVal *start_min, const GTimeVal *start_max)
 {
 	return g_object_new (GDATA_TYPE_CALENDAR_QUERY,
-			     "q", q,
-			     "start-min", start_min,
-			     "start-max", start_max,
-			     NULL);
+	                     "q", q,
+	                     "start-min", start_min,
+	                     "start-max", start_max,
+	                     NULL);
 }
 
 /**
diff --git a/gdata/services/calendar/gdata-calendar-query.h b/gdata/services/calendar/gdata-calendar-query.h
index b1b226c..649d165 100644
--- a/gdata/services/calendar/gdata-calendar-query.h
+++ b/gdata/services/calendar/gdata-calendar-query.h
@@ -60,8 +60,8 @@ typedef struct {
 GType gdata_calendar_query_get_type (void) G_GNUC_CONST;
 
 GDataCalendarQuery *gdata_calendar_query_new (const gchar *q) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
-GDataCalendarQuery *gdata_calendar_query_new_with_limits (const gchar *q,
-                                                          const GTimeVal *start_min, const GTimeVal *start_max) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+GDataCalendarQuery *gdata_calendar_query_new_with_limits (const gchar *q, const GTimeVal *start_min,
+                                                          const GTimeVal *start_max) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 gboolean gdata_calendar_query_get_future_events (GDataCalendarQuery *self);
 void gdata_calendar_query_set_future_events (GDataCalendarQuery *self, gboolean future_events);
diff --git a/gdata/services/calendar/gdata-calendar-service.c b/gdata/services/calendar/gdata-calendar-service.c
index ab6d2f5..5e466c8 100644
--- a/gdata/services/calendar/gdata-calendar-service.c
+++ b/gdata/services/calendar/gdata-calendar-service.c
@@ -72,10 +72,7 @@ GDataCalendarService *
 gdata_calendar_service_new (const gchar *client_id)
 {
 	g_return_val_if_fail (client_id != NULL, NULL);
-
-	return g_object_new (GDATA_TYPE_CALENDAR_SERVICE,
-			     "client-id", client_id,
-			     NULL);
+	return g_object_new (GDATA_TYPE_CALENDAR_SERVICE, "client-id", client_id, NULL);
 }
 
 /**
@@ -97,7 +94,7 @@ gdata_calendar_service_new (const gchar *client_id)
  **/
 GDataFeed *
 gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable,
-					    GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
+                                            GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
 {
 	GDataFeed *feed;
 	gchar *request_uri;
@@ -110,7 +107,7 @@ gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQue
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to query all calendars."));
+		                     _("You must be authenticated to query all calendars."));
 		return NULL;
 	}
 
@@ -141,8 +138,8 @@ gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQue
  **/
 void
 gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable,
-						  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						  GAsyncReadyCallback callback, gpointer user_data)
+                                                  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                  GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *request_uri;
 
@@ -154,8 +151,8 @@ gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GD
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data,
-						     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-						     _("You must be authenticated to query all calendars."));
+		                                     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
+		                                     _("You must be authenticated to query all calendars."));
 		return;
 	}
 
@@ -184,7 +181,7 @@ gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GD
  **/
 GDataFeed *
 gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable,
-					    GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
+                                            GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
 {
 	GDataFeed *feed;
 	gchar *request_uri;
@@ -197,7 +194,7 @@ gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQue
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to query your own calendars."));
+		                     _("You must be authenticated to query your own calendars."));
 		return NULL;
 	}
 
@@ -228,8 +225,8 @@ gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQue
  **/
 void
 gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable,
-						  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						  GAsyncReadyCallback callback, gpointer user_data)
+                                                  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                  GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *request_uri;
 
@@ -241,8 +238,8 @@ gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GD
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data,
-						     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-						     _("You must be authenticated to query your own calendars."));
+		                                     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
+		                                     _("You must be authenticated to query your own calendars."));
 		return;
 	}
 
@@ -270,7 +267,7 @@ gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GD
  **/
 GDataFeed *
 gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCalendar *calendar, GDataQuery *query, GCancellable *cancellable,
-				     GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
+                                     GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
 {
 	/* TODO: Async variant */
 	const gchar *uri;
@@ -284,7 +281,7 @@ gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCa
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to query your own calendars."));
+		                     _("You must be authenticated to query your own calendars."));
 		return NULL;
 	}
 
@@ -293,13 +290,13 @@ gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCa
 	if (uri == NULL) {
 		/* Erroring out is probably the safest thing to do */
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     _("The calendar did not have a content source."));
+		                     _("The calendar did not have a content source."));
 		return NULL;
 	}
 
 	/* Execute the query */
 	return gdata_service_query (GDATA_SERVICE (self), uri, query, GDATA_TYPE_CALENDAR_EVENT, cancellable,
-				    progress_callback, progress_user_data, error);
+	                            progress_callback, progress_user_data, error);
 }
 
 /**
diff --git a/gdata/services/calendar/gdata-calendar-service.h b/gdata/services/calendar/gdata-calendar-service.h
index 8494192..099211c 100644
--- a/gdata/services/calendar/gdata-calendar-service.h
+++ b/gdata/services/calendar/gdata-calendar-service.h
@@ -62,27 +62,27 @@ GType gdata_calendar_service_get_type (void) G_GNUC_CONST;
 GDataCalendarService *gdata_calendar_service_new (const gchar *client_id) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 GDataFeed *gdata_calendar_service_query_all_calendars (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable,
-						       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						       GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                       GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_calendar_service_query_all_calendars_async (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable,
-						       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						       GAsyncReadyCallback callback, gpointer user_data);
+                                                       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                       GAsyncReadyCallback callback, gpointer user_data);
 
 GDataFeed *gdata_calendar_service_query_own_calendars (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable,
-						       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						       GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                       GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_calendar_service_query_own_calendars_async (GDataCalendarService *self, GDataQuery *query, GCancellable *cancellable,
-						       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						       GAsyncReadyCallback callback, gpointer user_data);
+                                                       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                       GAsyncReadyCallback callback, gpointer user_data);
 
 GDataFeed *gdata_calendar_service_query_events (GDataCalendarService *self, GDataCalendarCalendar *calendar, GDataQuery *query,
-						GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 #include <gdata/services/calendar/gdata-calendar-event.h>
 
 GDataCalendarEvent *gdata_calendar_service_insert_event (GDataCalendarService *self, GDataCalendarEvent *event,
-							 GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                         GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 G_END_DECLS
 
diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c
index 8e007f2..b47781d 100644
--- a/gdata/services/contacts/gdata-contacts-contact.c
+++ b/gdata/services/contacts/gdata-contacts-contact.c
@@ -155,10 +155,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EDITED,
-				g_param_spec_boxed ("edited",
-					"Edited", "The last time the contact was edited.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("edited",
+	                                                     "Edited", "The last time the contact was edited.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:deleted:
@@ -168,10 +168,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DELETED,
-				g_param_spec_boolean ("deleted",
-					"Deleted", "Whether the entry has been deleted.",
-					FALSE,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("deleted",
+	                                                       "Deleted", "Whether the entry has been deleted.",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:has-photo:
@@ -181,10 +181,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_HAS_PHOTO,
-				g_param_spec_boolean ("has-photo",
-					"Has photo?", "Whether the contact has a photo.",
-					FALSE,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("has-photo",
+	                                                       "Has photo?", "Whether the contact has a photo.",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:name:
@@ -194,10 +194,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NAME,
-				g_param_spec_object ("name",
-					"Name", "The contact's name in a structured representation.",
-					GDATA_TYPE_GD_NAME,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("name",
+	                                                      "Name", "The contact's name in a structured representation.",
+	                                                      GDATA_TYPE_GD_NAME,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:nickname:
@@ -207,10 +207,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NICKNAME,
-				g_param_spec_string ("nickname",
-					"Nickname", "The contact's chosen nickname.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("nickname",
+	                                                      "Nickname", "The contact's chosen nickname.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:birthday:
@@ -220,23 +220,23 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_BIRTHDAY,
-				g_param_spec_boxed ("birthday",
-					"Birthday", "The contact's birthday.",
-					G_TYPE_DATE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("birthday",
+	                                                     "Birthday", "The contact's birthday.",
+	                                                     G_TYPE_DATE,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:birthday-has-year:
 	 *
-	 * Whether the contact's birthday includes the year of their birth.
+	 * Whether the contact's birthday includes their year of birth.
 	 *
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_BIRTHDAY_HAS_YEAR,
-				g_param_spec_boolean ("birthday-has-year",
-					"Birthday has year?", "Whether the contact's birthday includes the year of their birth.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("birthday-has-year",
+	                                                       "Birthday has year?", "Whether the contact's birthday includes their year of birth.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:billing-information:
@@ -246,10 +246,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_BILLING_INFORMATION,
-				g_param_spec_string ("billing-information",
-					"Billing information", "Billing information for the contact.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("billing-information",
+	                                                      "Billing information", "Billing information for the contact.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:directory-server:
@@ -259,10 +259,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DIRECTORY_SERVER,
-				g_param_spec_string ("directory-server",
-					"Directory server", "The name or address of a directory server associated with the contact.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("directory-server",
+	                                                      "Directory server", "The name or address of an associated directory server.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:gender:
@@ -272,10 +272,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_GENDER,
-				g_param_spec_string ("gender",
-					"Gender", "The gender of the contact.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("gender",
+	                                                      "Gender", "The gender of the contact.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:initials:
@@ -285,10 +285,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_INITIALS,
-				g_param_spec_string ("initials",
-					"Initials", "The initials of the contact.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("initials",
+	                                                      "Initials", "The initials of the contact.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:maiden-name:
@@ -298,10 +298,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MAIDEN_NAME,
-				g_param_spec_string ("maiden-name",
-					"Maiden name", "The maiden name of the contact.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("maiden-name",
+	                                                      "Maiden name", "The maiden name of the contact.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:mileage:
@@ -311,10 +311,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MILEAGE,
-				g_param_spec_string ("mileage",
-					"Mileage", "A mileage associated with the contact, such as one for reimbursement purposes.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("mileage",
+	                                                      "Mileage", "A mileage associated with the contact.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:occupation:
@@ -324,10 +324,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_OCCUPATION,
-				g_param_spec_string ("occupation",
-					"Occupation", "The contact's occupation.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("occupation",
+	                                                      "Occupation", "The contact's occupation.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:priority:
@@ -337,10 +337,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PRIORITY,
-				g_param_spec_string ("priority",
-					"Priority", "The contact's importance.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("priority",
+	                                                      "Priority", "The contact's importance.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:sensitivity:
@@ -350,10 +350,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SENSITIVITY,
-				g_param_spec_string ("sensitivity",
-					"Sensitivity", "The sensitivity of the contact's data.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("sensitivity",
+	                                                      "Sensitivity", "The sensitivity of the contact's data.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:short-name:
@@ -364,10 +364,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SHORT_NAME,
-				g_param_spec_string ("short-name",
-					"Short name", "A short name for the contact.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("short-name",
+	                                                      "Short name", "A short name for the contact.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsContact:subject:
@@ -377,10 +377,10 @@ gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SUBJECT,
-				g_param_spec_string ("subject",
-					"Subject", "The subject of the contact.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("subject",
+	                                                      "Subject", "The subject of the contact.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void notify_full_name_cb (GObject *gobject, GParamSpec *pspec, GDataContactsContact *self);
@@ -2873,7 +2873,7 @@ gdata_contacts_contact_has_photo (GDataContactsContact *self)
  **/
 gchar *
 gdata_contacts_contact_get_photo (GDataContactsContact *self, GDataContactsService *service, gsize *length, gchar **content_type,
-				  GCancellable *cancellable, GError **error)
+                                  GCancellable *cancellable, GError **error)
 {
 	GDataLink *link;
 	SoupMessage *message;
@@ -2952,7 +2952,7 @@ gdata_contacts_contact_get_photo (GDataContactsContact *self, GDataContactsServi
  **/
 gboolean
 gdata_contacts_contact_set_photo (GDataContactsContact *self, GDataService *service, const gchar *data, gsize length,
-				  GCancellable *cancellable, GError **error)
+                                  GCancellable *cancellable, GError **error)
 {
 	GDataLink *link;
 	SoupMessage *message;
diff --git a/gdata/services/contacts/gdata-contacts-query.c b/gdata/services/contacts/gdata-contacts-query.c
index 1e269cc..f034c78 100644
--- a/gdata/services/contacts/gdata-contacts-query.c
+++ b/gdata/services/contacts/gdata-contacts-query.c
@@ -83,10 +83,10 @@ gdata_contacts_query_class_init (GDataContactsQueryClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ORDER_BY,
-				g_param_spec_string ("order-by",
-					"Order by", "Sorting criterion.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("order-by",
+	                                                      "Order by", "Sorting criterion.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsQuery:show-deleted:
@@ -98,10 +98,10 @@ gdata_contacts_query_class_init (GDataContactsQueryClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SHOW_DELETED,
-				g_param_spec_boolean ("show-deleted",
-					"Show deleted?", "Whether to include deleted contacts in the query feed.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("show-deleted",
+	                                                       "Show deleted?", "Whether to include deleted contacts in the query feed.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsQuery:sort-order:
@@ -111,24 +111,24 @@ gdata_contacts_query_class_init (GDataContactsQueryClass *klass)
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SORT_ORDER,
-				g_param_spec_string ("sort-order",
-					"Sort order", "Sorting order direction.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("sort-order",
+	                                                      "Sort order", "Sorting order direction.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataContactsQuery:group:
 	 *
-	 * Constrains the results to only the contacts belonging to the group specified. The value of this parameter
+	 * Constrains the results to only those belonging to the group specified. The value of this parameter
 	 * should be a group ID URI.
 	 *
 	 * Since: 0.2.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_GROUP,
-				g_param_spec_string ("group",
-					"Group", "Constrains the results to only the contacts belonging to the group specified.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("group",
+	                                                      "Group", "Constrains the results to only those belonging to the group specified.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -268,10 +268,10 @@ GDataContactsQuery *
 gdata_contacts_query_new_with_limits (const gchar *q, guint start_index, guint max_results)
 {
 	return g_object_new (GDATA_TYPE_CONTACTS_QUERY,
-			     "q", q,
-			     "start-index", start_index,
-			     "max-results", max_results,
-			     NULL);
+	                     "q", q,
+	                     "start-index", start_index,
+	                     "max-results", max_results,
+	                     NULL);
 }
 
 /**
diff --git a/gdata/services/contacts/gdata-contacts-query.h b/gdata/services/contacts/gdata-contacts-query.h
index 2805901..a00a6c5 100644
--- a/gdata/services/contacts/gdata-contacts-query.h
+++ b/gdata/services/contacts/gdata-contacts-query.h
@@ -63,7 +63,8 @@ typedef struct {
 GType gdata_contacts_query_get_type (void) G_GNUC_CONST;
 
 GDataContactsQuery *gdata_contacts_query_new (const gchar *q) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
-GDataContactsQuery *gdata_contacts_query_new_with_limits (const gchar *q, guint start_index, guint max_results) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+GDataContactsQuery *gdata_contacts_query_new_with_limits (const gchar *q, guint start_index,
+                                                          guint max_results) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 const gchar *gdata_contacts_query_get_order_by (GDataContactsQuery *self);
 void gdata_contacts_query_set_order_by (GDataContactsQuery *self, const gchar *order_by);
diff --git a/gdata/services/contacts/gdata-contacts-service.c b/gdata/services/contacts/gdata-contacts-service.c
index 5a20c46..442fa67 100644
--- a/gdata/services/contacts/gdata-contacts-service.c
+++ b/gdata/services/contacts/gdata-contacts-service.c
@@ -75,8 +75,8 @@ gdata_contacts_service_new (const gchar *client_id)
 	g_return_val_if_fail (client_id != NULL, NULL);
 
 	return g_object_new (GDATA_TYPE_CONTACTS_SERVICE,
-			     "client-id", client_id,
-			     NULL);
+	                     "client-id", client_id,
+	                     NULL);
 }
 
 /**
@@ -98,7 +98,7 @@ gdata_contacts_service_new (const gchar *client_id)
  **/
 GDataFeed *
 gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable,
-				       GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
+                                       GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
 {
 	GDataFeed *feed;
 	gchar *request_uri;
@@ -111,7 +111,7 @@ gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *q
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to query contacts."));
+		                     _("You must be authenticated to query contacts."));
 		return NULL;
 	}
 
@@ -143,8 +143,8 @@ gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *q
  **/
 void
 gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable,
-					     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					     GAsyncReadyCallback callback, gpointer user_data)
+                                             GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                             GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *request_uri;
 
@@ -156,8 +156,8 @@ gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQu
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data,
-						     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-						     _("You must be authenticated to query contacts."));
+		                                     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
+		                                     _("You must be authenticated to query contacts."));
 		return;
 	}
 
diff --git a/gdata/services/contacts/gdata-contacts-service.h b/gdata/services/contacts/gdata-contacts-service.h
index 5206f13..2dbfc00 100644
--- a/gdata/services/contacts/gdata-contacts-service.h
+++ b/gdata/services/contacts/gdata-contacts-service.h
@@ -65,18 +65,18 @@ GType gdata_contacts_service_get_type (void) G_GNUC_CONST;
 GDataContactsService *gdata_contacts_service_new (const gchar *client_id) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 GDataFeed *gdata_contacts_service_query_contacts (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable,
-						  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						  GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                  GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_contacts_service_query_contacts_async (GDataContactsService *self, GDataQuery *query, GCancellable *cancellable,
-						  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						  GAsyncReadyCallback callback, gpointer user_data);
+                                                  GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                  GAsyncReadyCallback callback, gpointer user_data);
 
 #include <gdata/services/contacts/gdata-contacts-contact.h>
 
 GDataContactsContact *gdata_contacts_service_insert_contact (GDataContactsService *self, GDataContactsContact *contact,
-							     GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                             GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 GDataContactsContact *gdata_contacts_service_update_contact (GDataContactsService *self, GDataContactsContact *contact,
-							     GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                             GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 G_END_DECLS
 
diff --git a/gdata/services/documents/gdata-documents-entry.c b/gdata/services/documents/gdata-documents-entry.c
index c472886..d371ee4 100644
--- a/gdata/services/documents/gdata-documents-entry.c
+++ b/gdata/services/documents/gdata-documents-entry.c
@@ -30,8 +30,8 @@
  * access roles defined for the base #GDataAccessRule (e.g. %GDATA_ACCESS_ROLE_NONE), #GDataDocumentsEntry has its own, such as
  * %GDATA_DOCUMENTS_ACCESS_ROLE_OWNER and %GDATA_DOCUMENTS_ACCESS_ROLE_READER.
  *
- * For more details of Google Documents' GData API, see the <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html";>
- * online documentation</ulink>.
+ * For more details of Google Documents' GData API, see the
+ * <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html";>online documentation</ulink>.
  *
  * Since: 0.4.0
  **/
@@ -77,7 +77,7 @@ enum {
 };
 
 G_DEFINE_TYPE_WITH_CODE (GDataDocumentsEntry, gdata_documents_entry, GDATA_TYPE_ENTRY,
-			 G_IMPLEMENT_INTERFACE (GDATA_TYPE_ACCESS_HANDLER, gdata_documents_entry_access_handler_init))
+                         G_IMPLEMENT_INTERFACE (GDATA_TYPE_ACCESS_HANDLER, gdata_documents_entry_access_handler_init))
 
 static void
 gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass)
@@ -107,10 +107,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EDITED,
-				g_param_spec_boxed ("edited",
-					"Edited", "The last time the document was edited.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("edited",
+	                                                     "Edited", "The last time the document was edited.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsEntry:last-viewed
@@ -120,10 +120,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LAST_VIEWED,
-				g_param_spec_boxed ("last-viewed",
-					"Last viewed", "The last time the document was viewed.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("last-viewed",
+	                                                     "Last viewed", "The last time the document was viewed.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsEntry:writers-can-invite:
@@ -133,10 +133,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_WRITERS_CAN_INVITE,
-				g_param_spec_boolean ("writers-can-invite",
-					"Writers can invite?", "Indicates whether writers can invite others to edit.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("writers-can-invite",
+	                                                       "Writers can invite?", "Indicates whether writers can invite others to edit.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsEntry:is-deleted:
@@ -147,10 +147,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_DELETED,
-				g_param_spec_boolean ("is-deleted",
-					"Deleted?", "Indicates whether the document entry has been deleted.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-deleted",
+	                                                       "Deleted?", "Indicates whether the document entry has been deleted.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsEntry:document-id
@@ -160,10 +160,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DOCUMENT_ID,
-				g_param_spec_string ("document-id",
-					"Document ID", "The document ID of the document.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("document-id",
+	                                                      "Document ID", "The document ID of the document.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsEntry:last-modified-by
@@ -173,10 +173,10 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LAST_MODIFIED_BY,
-				g_param_spec_object ("last-modified-by",
-					"Last modified by", "Indicates the author of the last modification.",
-					GDATA_TYPE_AUTHOR,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("last-modified-by",
+	                                                      "Last modified by", "Indicates the author of the last modification.",
+	                                                      GDATA_TYPE_AUTHOR,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 }
 
@@ -409,10 +409,10 @@ gdata_documents_entry_get_last_viewed (GDataDocumentsEntry *self, GTimeVal *last
  * gdata_documents_entry_get_path:
  * @self: a #GDataDocumentsEntry
  *
- * Builds a path for the #GDataDocumentsEntry, starting from a root node and traversing the folders containing the document, then
- * ending with the document's ID.
+ * Builds a path for the #GDataDocumentsEntry, starting from a root node and traversing the folders containing the document, then ending with the
+ * document's ID.
  *
- * An example path would be: "/folder_id1/folder_id2/document_id".
+ * An example path would be: <literal>/folder_id1/folder_id2/document_id</literal>.
  *
  * Note: the path is based on the entry/document IDs of the folders (#GDataEntry:id) and document (#GDataDocumentsEntry:document-id),
  * and not the entries' human-readable names (#GDataEntry:title).
@@ -597,8 +597,8 @@ notify_content_type_cb (GDataDownloadStream *download_stream, GParamSpec *pspec,
  */
 GFile *
 _gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataService *service, gchar **content_type, const gchar *src_uri,
-					  GFile *destination_file, const gchar *file_extension, gboolean replace_file_if_exists,
-					  GCancellable *cancellable, GError **error)
+                                          GFile *destination_file, const gchar *file_extension, gboolean replace_file_if_exists,
+                                          GCancellable *cancellable, GError **error)
 {
 	const gchar *document_title;
 	gchar *default_filename;
@@ -619,7 +619,7 @@ _gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataServic
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (service)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to download documents."));
+		                     _("You must be authenticated to download documents."));
 		return NULL;
 	}
 
@@ -627,7 +627,8 @@ _gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataServic
 	document_title = gdata_entry_get_title (GDATA_ENTRY (self));
 	default_filename = g_strdup_printf ("%s.%s", document_title, file_extension);
 
-	dest_stream = _gdata_download_stream_find_destination (default_filename, destination_file, &actual_file, replace_file_if_exists, cancellable, error);
+	dest_stream = _gdata_download_stream_find_destination (default_filename, destination_file, &actual_file, replace_file_if_exists,
+	                                                       cancellable, error);
 	g_free (default_filename);
 
 	if (dest_stream == NULL)
@@ -637,7 +638,7 @@ _gdata_documents_entry_download_document (GDataDocumentsEntry *self, GDataServic
 	src_stream = gdata_download_stream_new (GDATA_SERVICE (service), src_uri);
 	g_signal_connect (src_stream, "notify::content-type", (GCallback) notify_content_type_cb, content_type);
 	g_output_stream_splice (G_OUTPUT_STREAM (dest_stream), src_stream,
-				G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, cancellable, &child_error);
+	                        G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, cancellable, &child_error);
 	g_object_unref (src_stream);
 	g_object_unref (dest_stream);
 	if (child_error != NULL) {
diff --git a/gdata/services/documents/gdata-documents-feed.c b/gdata/services/documents/gdata-documents-feed.c
index 5969c23..89e7f4e 100644
--- a/gdata/services/documents/gdata-documents-feed.c
+++ b/gdata/services/documents/gdata-documents-feed.c
@@ -98,15 +98,15 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 		GDataEntry *entry = NULL;
 		gchar *kind = get_kind (doc, node);
 
-		if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#spreadsheet";) == 0)
+		if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#spreadsheet";) == 0) {
 			entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (GDATA_TYPE_DOCUMENTS_SPREADSHEET, doc, node, NULL, error));
-		else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#document";) == 0)
+		} else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#document";) == 0) {
 			entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (GDATA_TYPE_DOCUMENTS_TEXT, doc, node, NULL, error));
-		else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#presentation";) == 0)
+		} else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#presentation";) == 0) {
 			entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (GDATA_TYPE_DOCUMENTS_PRESENTATION, doc, node, NULL, error));
-		else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#folder";) == 0)
+		} else if (g_strcmp0 (kind, "http://schemas.google.com/docs/2007#folder";) == 0) {
 			entry = GDATA_ENTRY (_gdata_parsable_new_from_xml_node (GDATA_TYPE_DOCUMENTS_FOLDER, doc, node, NULL, error));
-		else {
+		} else {
 			g_message ("%s documents are not handled yet", kind);
 			g_free (kind);
 			return TRUE;
diff --git a/gdata/services/documents/gdata-documents-presentation.c b/gdata/services/documents/gdata-documents-presentation.c
index bf5a9b8..8a8c746 100644
--- a/gdata/services/documents/gdata-documents-presentation.c
+++ b/gdata/services/documents/gdata-documents-presentation.c
@@ -132,8 +132,8 @@ gdata_documents_presentation_new (const gchar *id)
  **/
 GFile *
 gdata_documents_presentation_download_document (GDataDocumentsPresentation *self, GDataDocumentsService *service, gchar **content_type,
-						GDataDocumentsPresentationFormat export_format, GFile *destination_file,
-						gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
+                                                GDataDocumentsPresentationFormat export_format, GFile *destination_file,
+                                                gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
 {
 	gchar *link_href;
 
@@ -147,7 +147,8 @@ gdata_documents_presentation_download_document (GDataDocumentsPresentation *self
 	/* Call the common download method on the parent class */
 	link_href = gdata_documents_presentation_get_download_uri (self, export_format);
 	destination_file = _gdata_documents_entry_download_document (GDATA_DOCUMENTS_ENTRY (self), GDATA_SERVICE (service), content_type, link_href,
-								     destination_file, export_formats[export_format], replace_file_if_exists, cancellable, error);
+	                                                             destination_file, export_formats[export_format], replace_file_if_exists,
+	                                                             cancellable, error);
 	g_free (link_href);
 
 	return destination_file;
diff --git a/gdata/services/documents/gdata-documents-presentation.h b/gdata/services/documents/gdata-documents-presentation.h
index 2f3485c..024bcd1 100644
--- a/gdata/services/documents/gdata-documents-presentation.h
+++ b/gdata/services/documents/gdata-documents-presentation.h
@@ -29,11 +29,14 @@
 G_BEGIN_DECLS
 
 #define GDATA_TYPE_DOCUMENTS_PRESENTATION		(gdata_documents_presentation_get_type ())
-#define GDATA_DOCUMENTS_PRESENTATION(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION, GDataDocumentsPresentation))
-#define GDATA_DOCUMENTS_PRESENTATION_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_DOCUMENTS_PRESENTATION, GDataDocumentsPresentationClass))
+#define GDATA_DOCUMENTS_PRESENTATION(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION, \
+                                                         GDataDocumentsPresentation))
+#define GDATA_DOCUMENTS_PRESENTATION_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_DOCUMENTS_PRESENTATION, \
+                                                         GDataDocumentsPresentationClass))
 #define GDATA_IS_DOCUMENTS_PRESENTATION(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION))
 #define GDATA_IS_DOCUMENTS_PRESENTATION_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_DOCUMENTS_PRESENTATION))
-#define GDATA_DOCUMENTS_PRESENTATION_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION, GDataDocumentsPresentationClass))
+#define GDATA_DOCUMENTS_PRESENTATION_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_DOCUMENTS_PRESENTATION, \
+                                                         GDataDocumentsPresentationClass))
 
 typedef struct _GDataDocumentsPresentationPrivate	GDataDocumentsPresentationPrivate;
 
@@ -54,7 +57,7 @@ typedef enum {
 	GDATA_DOCUMENTS_PRESENTATION_PNG,
 	GDATA_DOCUMENTS_PRESENTATION_PPT,
 	GDATA_DOCUMENTS_PRESENTATION_SWF,
-	GDATA_DOCUMENTS_PRESENTATION_TXT,
+	GDATA_DOCUMENTS_PRESENTATION_TXT
 } GDataDocumentsPresentationFormat;
 
 /**
@@ -87,9 +90,9 @@ GDataDocumentsPresentation *gdata_documents_presentation_new (const gchar *id) G
 
 #include <gdata/services/documents/gdata-documents-service.h>
 GFile *gdata_documents_presentation_download_document (GDataDocumentsPresentation *self, GDataDocumentsService *service, gchar **content_type,
-						       GDataDocumentsPresentationFormat export_format, GFile *destination_file,
-						       gboolean replace_file_if_exists, GCancellable *cancellable,
-						       GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                       GDataDocumentsPresentationFormat export_format, GFile *destination_file,
+                                                       gboolean replace_file_if_exists, GCancellable *cancellable,
+                                                       GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gchar *gdata_documents_presentation_get_download_uri (GDataDocumentsPresentation *self,
                                                       GDataDocumentsPresentationFormat export_format) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
diff --git a/gdata/services/documents/gdata-documents-query.c b/gdata/services/documents/gdata-documents-query.c
index 8d9e64a..042a272 100644
--- a/gdata/services/documents/gdata-documents-query.c
+++ b/gdata/services/documents/gdata-documents-query.c
@@ -94,10 +94,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SHOW_DELETED,
-				g_param_spec_boolean ("show-deleted",
-					"Show deleted?", "A shortcut to request all documents that have been deleted.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("show-deleted",
+	                                                       "Show deleted?", "A shortcut to request all documents that have been deleted.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsQuery:show-folders:
@@ -107,10 +107,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SHOW_FOLDERS,
-				g_param_spec_boolean ("show-folders",
-					"Show folders?", "Specifies if the request also returns folders.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("show-folders",
+	                                                       "Show folders?", "Specifies if the request also returns folders.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsQuery:exact-title:
@@ -120,10 +120,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EXACT_TITLE,
-				g_param_spec_boolean ("exact-title",
-					"Exact title?", "Specifies whether the query should search for an exact title match.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("exact-title",
+	                                                       "Exact title?", "Specifies whether the query should search for an exact title match.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsQuery:folder-id:
@@ -133,10 +133,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FOLDER_ID,
-				g_param_spec_string ("folder-id",
-					"Folder ID", "Specifies the ID of the folder in which to search.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("folder-id",
+	                                                      "Folder ID", "Specifies the ID of the folder in which to search.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataDocumentsQuery:title:
@@ -147,10 +147,10 @@ gdata_documents_query_class_init (GDataDocumentsQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TITLE,
-				g_param_spec_string ("title",
-					"Title", "A title (or title fragment) to be searched for.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("title",
+	                                                      "Title", "A title (or title fragment) to be searched for.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -242,28 +242,28 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo
 	GDATA_QUERY_CLASS (gdata_documents_query_parent_class)->get_query_uri (self, feed_uri, query_uri, params_started);
 
 	if  (priv->collaborator_addresses != NULL) {
-		GList *collaborator_address;
+		GList *address;
 		APPEND_SEP
-		collaborator_address = priv->collaborator_addresses;
+		address = priv->collaborator_addresses;
 
 		g_string_append (query_uri, "writer=");
-		g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (collaborator_address->data), NULL, FALSE);
-		for (collaborator_address = collaborator_address->next; collaborator_address != NULL; collaborator_address = collaborator_address->next) {
+		g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (address->data), NULL, FALSE);
+		for (address = address->next; address != NULL; address = address->next) {
 			g_string_append_c (query_uri, ';');
-			g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (collaborator_address->data), NULL, FALSE);
+			g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (address->data), NULL, FALSE);
 		}
 	}
 
 	if  (priv->reader_addresses != NULL) {
-		GList *reader_address;
+		GList *address;
 		APPEND_SEP
-		reader_address = priv->reader_addresses;
+		address = priv->reader_addresses;
 
 		g_string_append (query_uri, "reader=");
-		g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (reader_address->data), NULL, FALSE);
-		for (reader_address = reader_address->next; reader_address != NULL; reader_address = reader_address->next) {
+		g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (address->data), NULL, FALSE);
+		for (address = address->next; address != NULL; address = address->next) {
 			g_string_append_c (query_uri, ';');
-			g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (reader_address->data), NULL, FALSE);
+			g_string_append_uri_escaped (query_uri, gdata_gd_email_address_get_address (address->data), NULL, FALSE);
 		}
 	}
 
@@ -320,10 +320,10 @@ GDataDocumentsQuery *
 gdata_documents_query_new_with_limits (const gchar *q, guint start_index, guint max_results)
 {
 	return g_object_new (GDATA_TYPE_DOCUMENTS_QUERY,
-			     "q", q,
-			     "start-index", start_index,
-			     "max-results", max_results,
-			     NULL);
+	                     "q", q,
+	                     "start-index", start_index,
+	                     "max-results", max_results,
+	                     NULL);
 }
 
 /**
diff --git a/gdata/services/documents/gdata-documents-service.c b/gdata/services/documents/gdata-documents-service.c
index c2ce0de..e19b815 100644
--- a/gdata/services/documents/gdata-documents-service.c
+++ b/gdata/services/documents/gdata-documents-service.c
@@ -62,7 +62,7 @@ static void gdata_documents_service_get_property (GObject *object, guint propert
 static void notify_authenticated_cb (GObject *service, GParamSpec *pspec, GObject *self);
 static void notify_proxy_uri_cb (GObject *service, GParamSpec *pspec, GObject *self);
 static GDataDocumentsEntry *upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file,
-						    const gchar *method, const gchar *upload_uri, GCancellable *cancellable, GError **error);
+                                                    const gchar *method, const gchar *upload_uri, GCancellable *cancellable, GError **error);
 
 struct _GDataDocumentsServicePrivate {
 	GDataService *spreadsheet_service;
@@ -100,10 +100,10 @@ gdata_documents_service_class_init (GDataDocumentsServiceClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SPREADSHEET_SERVICE,
-				g_param_spec_object ("spreadsheet-service",
-					"Spreadsheet service", "Another service for spreadsheets.",
-					GDATA_TYPE_SERVICE,
-					G_PARAM_READABLE));
+	                                 g_param_spec_object ("spreadsheet-service",
+	                                                      "Spreadsheet service", "Another service for spreadsheets.",
+	                                                      GDATA_TYPE_SERVICE,
+	                                                      G_PARAM_READABLE));
 }
 
 static void
@@ -158,8 +158,8 @@ gdata_documents_service_new (const gchar *client_id)
 	g_return_val_if_fail (client_id != NULL, NULL);
 
 	return g_object_new (GDATA_TYPE_DOCUMENTS_SERVICE,
-			     "client-id", client_id,
-			     NULL);
+	                     "client-id", client_id,
+	                     NULL);
 }
 
 /**
@@ -182,8 +182,8 @@ gdata_documents_service_new (const gchar *client_id)
  **/
 GDataDocumentsFeed *
 gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocumentsQuery *query, GCancellable *cancellable,
-					 GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					 GError **error)
+                                         GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                         GError **error)
 {
 	GDataFeed *feed;
 	gchar *request_uri;
@@ -196,7 +196,7 @@ gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocum
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to query documents."));
+		                     _("You must be authenticated to query documents."));
 		return NULL;
 	}
 
@@ -233,8 +233,8 @@ gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocum
  **/
 void
 gdata_documents_service_query_documents_async (GDataDocumentsService *self, GDataDocumentsQuery *query, GCancellable *cancellable,
-					       GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					       GAsyncReadyCallback callback, gpointer user_data)
+                                               GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                               GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *request_uri;
 
@@ -246,8 +246,8 @@ gdata_documents_service_query_documents_async (GDataDocumentsService *self, GDat
 	/* Ensure we're authenticated first */
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data,
-						     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-						     _("You must be authenticated to query documents."));
+		                                     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
+		                                     _("You must be authenticated to query documents."));
 		return;
 	}
 
@@ -273,7 +273,7 @@ notify_authenticated_cb (GObject *service, GParamSpec *pspec, GObject *self)
 	spreadsheet_service = g_object_new (GDATA_TYPE_SERVICE, "client-id", gdata_service_get_client_id (GDATA_SERVICE (service)), NULL);
 	GDATA_SERVICE_GET_CLASS (spreadsheet_service)->service_name = "wise";
 	gdata_service_authenticate (spreadsheet_service, gdata_service_get_username (GDATA_SERVICE (service)),
-				    gdata_service_get_password (GDATA_SERVICE (service)), NULL, NULL);
+	                            gdata_service_get_password (GDATA_SERVICE (service)), NULL, NULL);
 	priv->spreadsheet_service = spreadsheet_service;
 }
 
@@ -292,7 +292,7 @@ notify_proxy_uri_cb (GObject *service, GParamSpec *pspec, GObject *self)
 
 static GDataDocumentsEntry *
 upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, const gchar *method,
-			const gchar *upload_uri, GCancellable *cancellable, GError **error)
+                        const gchar *upload_uri, GCancellable *cancellable, GError **error)
 {
 	GDataDocumentsEntry *new_entry;
 	GOutputStream *output_stream;
@@ -331,17 +331,17 @@ upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *docume
 		    strcmp (content_type, "application/vnd.ms-excel") == 0) {
 			new_document_type = GDATA_TYPE_DOCUMENTS_SPREADSHEET;
 		} else if (strcmp (content_type, "application/msword") == 0 ||
-			 strcmp (content_type, "application/vnd.oasis.opendocument.text") == 0 ||
-			 strcmp (content_type, "application/rtf") == 0 ||
-			 strcmp (content_type, "text/html") == 0 ||
-			 strcmp (content_type, "application/vnd.sun.xml.writer") == 0 ||
-			 strcmp (content_type, "text/plain") == 0) {
+		           strcmp (content_type, "application/vnd.oasis.opendocument.text") == 0 ||
+		           strcmp (content_type, "application/rtf") == 0 ||
+		           strcmp (content_type, "text/html") == 0 ||
+		           strcmp (content_type, "application/vnd.sun.xml.writer") == 0 ||
+		           strcmp (content_type, "text/plain") == 0) {
 			new_document_type = GDATA_TYPE_DOCUMENTS_TEXT;
 		} else if (strcmp (content_type, "application/vnd.ms-powerpoint") == 0) {
 			new_document_type = GDATA_TYPE_DOCUMENTS_PRESENTATION;
 		} else {
 			g_set_error_literal (error, GDATA_DOCUMENTS_SERVICE_ERROR, GDATA_DOCUMENTS_SERVICE_ERROR_INVALID_CONTENT_TYPE,
-					     _("The supplied document had an invalid content type."));
+			                     _("The supplied document had an invalid content type."));
 			if (file_info != NULL)
 				g_object_unref (file_info);
 			return NULL;
@@ -366,7 +366,7 @@ upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *docume
 	}
 
 	g_output_stream_splice (output_stream, input_stream, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-				cancellable, &child_error);
+	                        cancellable, &child_error);
 
 	g_object_unref (input_stream);
 	if (child_error != NULL) {
@@ -412,8 +412,8 @@ upload_update_document (GDataDocumentsService *self, GDataDocumentsEntry *docume
  * Since: 0.4.0
  **/
 GDataDocumentsEntry *
-gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file, GDataDocumentsFolder *folder,
-					 GCancellable *cancellable, GError **error)
+gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file,
+                                         GDataDocumentsFolder *folder, GCancellable *cancellable, GError **error)
 {
 	GDataDocumentsEntry *new_document;
 	gchar *upload_uri;
@@ -428,13 +428,13 @@ gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocum
 
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to upload documents."));
+		                     _("You must be authenticated to upload documents."));
 		return NULL;
 	}
 
 	if (document != NULL && gdata_entry_is_inserted (GDATA_ENTRY (document)) == TRUE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED,
-				     _("The document has already been uploaded."));
+		                     _("The document has already been uploaded."));
 		return NULL;
 	}
 
@@ -442,7 +442,7 @@ gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocum
 
 	if (document_file == NULL) {
 		new_document = GDATA_DOCUMENTS_ENTRY (gdata_service_insert_entry (GDATA_SERVICE (self), upload_uri, GDATA_ENTRY (document),
-										  cancellable, error));
+		                                                                  cancellable, error));
 	} else {
 		new_document = upload_update_document (self, document, document_file, SOUP_METHOD_POST, upload_uri, cancellable, error);
 	}
@@ -473,7 +473,7 @@ gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocum
  **/
 GDataDocumentsEntry *
 gdata_documents_service_update_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file,
-					 GCancellable *cancellable, GError **error)
+                                         GCancellable *cancellable, GError **error)
 {
 	GDataLink *update_link;
 
@@ -485,7 +485,7 @@ gdata_documents_service_update_document (GDataDocumentsService *self, GDataDocum
 
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to update documents."));
+		                     _("You must be authenticated to update documents."));
 		return NULL;
 	}
 
@@ -517,7 +517,7 @@ gdata_documents_service_update_document (GDataDocumentsService *self, GDataDocum
  **/
 GDataDocumentsEntry *
 gdata_documents_service_move_document_to_folder (GDataDocumentsService *self, GDataDocumentsEntry *document, GDataDocumentsFolder *folder,
-						 GCancellable *cancellable, GError **error)
+                                                 GCancellable *cancellable, GError **error)
 {
 	GDataDocumentsEntry *new_document;
 	gchar *uri, *upload_data;
@@ -533,7 +533,7 @@ gdata_documents_service_move_document_to_folder (GDataDocumentsService *self, GD
 
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to move documents."));
+		                     _("You must be authenticated to move documents."));
 		return NULL;
 	}
 
@@ -592,7 +592,7 @@ gdata_documents_service_move_document_to_folder (GDataDocumentsService *self, GD
  **/
 GDataDocumentsEntry *
 gdata_documents_service_remove_document_from_folder (GDataDocumentsService *self, GDataDocumentsEntry *document, GDataDocumentsFolder *folder,
-						     GCancellable *cancellable, GError **error)
+                                                     GCancellable *cancellable, GError **error)
 {
 	const gchar *folder_id, *document_id;
 	SoupMessage *message;
@@ -647,8 +647,8 @@ gdata_documents_service_remove_document_from_folder (GDataDocumentsService *self
 		/* Error */
 		GDataServiceClass *klass = GDATA_SERVICE_GET_CLASS (self);
 		g_assert (klass->parse_error_response != NULL);
-		klass->parse_error_response (GDATA_SERVICE (self), GDATA_OPERATION_UPDATE, status, message->reason_phrase, message->response_body->data,
-		                             message->response_body->length, error);
+		klass->parse_error_response (GDATA_SERVICE (self), GDATA_OPERATION_UPDATE, status, message->reason_phrase,
+		                             message->response_body->data, message->response_body->length, error);
 		g_object_unref (message);
 		return NULL;
 	}
diff --git a/gdata/services/documents/gdata-documents-service.h b/gdata/services/documents/gdata-documents-service.h
index 33edf7b..0b5a023 100644
--- a/gdata/services/documents/gdata-documents-service.h
+++ b/gdata/services/documents/gdata-documents-service.h
@@ -81,25 +81,25 @@ GQuark gdata_documents_service_error_quark (void) G_GNUC_CONST;
 
 GDataDocumentsService *gdata_documents_service_new (const gchar *client_id) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 GDataDocumentsFeed *gdata_documents_service_query_documents (GDataDocumentsService *self, GDataDocumentsQuery *query, GCancellable *cancellable,
-							     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-							     GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                             GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                             GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_documents_service_query_documents_async (GDataDocumentsService *self, GDataDocumentsQuery *query, GCancellable *cancellable,
-						    GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						    GAsyncReadyCallback callback, gpointer user_data);
+                                                    GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                    GAsyncReadyCallback callback, gpointer user_data);
 
 #include <gdata/services/documents/gdata-documents-folder.h>
 
 GDataDocumentsEntry *gdata_documents_service_upload_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file,
-							      GDataDocumentsFolder *folder, GCancellable *cancellable,
-							      GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                              GDataDocumentsFolder *folder, GCancellable *cancellable,
+                                                              GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 GDataDocumentsEntry *gdata_documents_service_update_document (GDataDocumentsService *self, GDataDocumentsEntry *document, GFile *document_file,
-							      GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                              GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 GDataDocumentsEntry *gdata_documents_service_move_document_to_folder (GDataDocumentsService *self, GDataDocumentsEntry *document,
-								      GDataDocumentsFolder *folder, GCancellable *cancellable,
-								      GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                                      GDataDocumentsFolder *folder, GCancellable *cancellable,
+                                                                      GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 GDataDocumentsEntry *gdata_documents_service_remove_document_from_folder (GDataDocumentsService *self, GDataDocumentsEntry *document,
-									  GDataDocumentsFolder *folder, GCancellable *cancellable,
-									  GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                                          GDataDocumentsFolder *folder, GCancellable *cancellable,
+                                                                          GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gchar *gdata_documents_service_get_upload_uri (GDataDocumentsFolder *folder) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 G_END_DECLS
diff --git a/gdata/services/documents/gdata-documents-spreadsheet.c b/gdata/services/documents/gdata-documents-spreadsheet.c
index f364ab9..50da9ae 100644
--- a/gdata/services/documents/gdata-documents-spreadsheet.c
+++ b/gdata/services/documents/gdata-documents-spreadsheet.c
@@ -26,8 +26,8 @@
  *
  * #GDataDocumentsSpreadsheet is a subclass of #GDataDocumentsEntry to represent a spreadsheet from Google Documents.
  *
- * For more details of Google Documents' GData API, see the <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html";>
- * online documentation</ulink>.
+ * For more details of Google Documents' GData API, see the
+ * <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html";>online documentation</ulink>.
  *
  * Since: 0.4.0
  **/
@@ -137,8 +137,8 @@ gdata_documents_spreadsheet_new (const gchar *id)
  **/
 GFile *
 gdata_documents_spreadsheet_download_document (GDataDocumentsSpreadsheet *self, GDataDocumentsService *service, gchar **content_type,
-					       GDataDocumentsSpreadsheetFormat export_format, gint gid, GFile *destination_file,
-					       gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
+                                               GDataDocumentsSpreadsheetFormat export_format, gint gid, GFile *destination_file,
+                                               gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
 {
 	gchar *link_href;
 	const gchar *extension;
@@ -149,7 +149,8 @@ gdata_documents_spreadsheet_download_document (GDataDocumentsSpreadsheet *self,
 	g_return_val_if_fail (GDATA_IS_DOCUMENTS_SERVICE (service), NULL);
 	g_return_val_if_fail (export_format < G_N_ELEMENTS (export_formats), NULL);
 	g_return_val_if_fail (gid >= -1, NULL);
-	g_return_val_if_fail ((export_format != GDATA_DOCUMENTS_SPREADSHEET_CSV && export_format != GDATA_DOCUMENTS_SPREADSHEET_TSV) || gid != -1, NULL);
+	g_return_val_if_fail ((export_format != GDATA_DOCUMENTS_SPREADSHEET_CSV && export_format != GDATA_DOCUMENTS_SPREADSHEET_TSV) ||
+	                      gid != -1, NULL);
 	g_return_val_if_fail (G_IS_FILE (destination_file), NULL);
 	g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
 	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -162,8 +163,8 @@ gdata_documents_spreadsheet_download_document (GDataDocumentsSpreadsheet *self,
 	/* Download the document */
 	link_href = gdata_documents_spreadsheet_get_download_uri (self, export_format, gid);
 	destination_file = _gdata_documents_entry_download_document (GDATA_DOCUMENTS_ENTRY (self), spreadsheet_service, content_type,
-								     link_href, destination_file, extension, replace_file_if_exists,
-								     cancellable, error);
+	                                                             link_href, destination_file, extension, replace_file_if_exists,
+	                                                             cancellable, error);
 	g_free (link_href);
 
 	return destination_file;
@@ -195,7 +196,8 @@ gdata_documents_spreadsheet_get_download_uri (GDataDocumentsSpreadsheet *self, G
 	g_return_val_if_fail (GDATA_IS_DOCUMENTS_SPREADSHEET (self), NULL);
 	g_return_val_if_fail (export_format < G_N_ELEMENTS (export_formats), NULL);
 	g_return_val_if_fail (gid >= -1, NULL);
-	g_return_val_if_fail ((export_format != GDATA_DOCUMENTS_SPREADSHEET_CSV && export_format != GDATA_DOCUMENTS_SPREADSHEET_TSV) || gid != -1, NULL);
+	g_return_val_if_fail ((export_format != GDATA_DOCUMENTS_SPREADSHEET_CSV && export_format != GDATA_DOCUMENTS_SPREADSHEET_TSV) ||
+	                      gid != -1, NULL);
 
 	document_id = gdata_documents_entry_get_document_id (GDATA_DOCUMENTS_ENTRY (self));
 	g_assert (document_id != NULL);
diff --git a/gdata/services/documents/gdata-documents-spreadsheet.h b/gdata/services/documents/gdata-documents-spreadsheet.h
index b395f04..5a7a847 100644
--- a/gdata/services/documents/gdata-documents-spreadsheet.h
+++ b/gdata/services/documents/gdata-documents-spreadsheet.h
@@ -29,11 +29,14 @@
 G_BEGIN_DECLS
 
 #define GDATA_TYPE_DOCUMENTS_SPREADSHEET		(gdata_documents_spreadsheet_get_type ())
-#define GDATA_DOCUMENTS_SPREADSHEET(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET, GDataDocumentsSpreadsheet))
-#define GDATA_DOCUMENTS_SPREADSHEET_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_DOCUMENTS_SPREADSHEET, GDataDocumentsSpreadsheetClass))
+#define GDATA_DOCUMENTS_SPREADSHEET(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET, \
+                                                         GDataDocumentsSpreadsheet))
+#define GDATA_DOCUMENTS_SPREADSHEET_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_DOCUMENTS_SPREADSHEET, \
+                                                         GDataDocumentsSpreadsheetClass))
 #define GDATA_IS_DOCUMENTS_SPREADSHEET(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET))
 #define GDATA_IS_DOCUMENTS_SPREADSHEET_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_DOCUMENTS_SPREADSHEET))
-#define GDATA_DOCUMENTS_SPREADSHEET_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET, GDataDocumentsSpreadsheetClass))
+#define GDATA_DOCUMENTS_SPREADSHEET_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_DOCUMENTS_SPREADSHEET, \
+                                                         GDataDocumentsSpreadsheetClass))
 
 typedef struct _GDataDocumentsSpreadsheetPrivate	GDataDocumentsSpreadsheetPrivate;
 
@@ -51,7 +54,7 @@ typedef struct _GDataDocumentsSpreadsheetPrivate	GDataDocumentsSpreadsheetPrivat
  * Since: 0.4.0
  **/
 typedef enum {
-        GDATA_DOCUMENTS_SPREADSHEET_XLS = 0,
+	GDATA_DOCUMENTS_SPREADSHEET_XLS = 0,
 	GDATA_DOCUMENTS_SPREADSHEET_CSV,
 	GDATA_DOCUMENTS_SPREADSHEET_PDF,
 	GDATA_DOCUMENTS_SPREADSHEET_ODS,
@@ -90,11 +93,11 @@ GDataDocumentsSpreadsheet *gdata_documents_spreadsheet_new (const gchar *id) G_G
 #include <gdata/services/documents/gdata-documents-service.h>
 
 GFile *gdata_documents_spreadsheet_download_document (GDataDocumentsSpreadsheet *self, GDataDocumentsService *service, gchar **content_type,
-						      GDataDocumentsSpreadsheetFormat export_format, gint gid, GFile *destination_file,
-						      gboolean replace_file_if_exists, GCancellable *cancellable,
-						      GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                      GDataDocumentsSpreadsheetFormat export_format, gint gid, GFile *destination_file,
+                                                      gboolean replace_file_if_exists, GCancellable *cancellable,
+                                                      GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 gchar *gdata_documents_spreadsheet_get_download_uri (GDataDocumentsSpreadsheet *self, GDataDocumentsSpreadsheetFormat export_format,
-						     gint gid) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                     gint gid) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 G_END_DECLS
 
diff --git a/gdata/services/documents/gdata-documents-text.c b/gdata/services/documents/gdata-documents-text.c
index 95c0a87..18cf350 100644
--- a/gdata/services/documents/gdata-documents-text.c
+++ b/gdata/services/documents/gdata-documents-text.c
@@ -26,8 +26,8 @@
  *
  * #GDataDocumentsText is a subclass of #GDataDocumentsEntry to represent a text document from Google Documents.
  *
- * For more details of Google Documents' GData API, see the <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html";>
- * online documentation</ulink>.
+ * For more details of Google Documents' GData API, see the
+ * <ulink type="http://code.google.com/apis/document/docs/2.0/developers_guide_protocol.html";>online documentation</ulink>.
  *
  * Since: 0.4.0
  **/
@@ -134,8 +134,8 @@ gdata_documents_text_new (const gchar *id)
  **/
 GFile *
 gdata_documents_text_download_document (GDataDocumentsText *self, GDataDocumentsService *service, gchar **content_type,
-					GDataDocumentsTextFormat export_format, GFile *destination_file,
-					gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
+                                        GDataDocumentsTextFormat export_format, GFile *destination_file,
+                                        gboolean replace_file_if_exists, GCancellable *cancellable, GError **error)
 {
 	gchar *link_href;
 
@@ -149,8 +149,8 @@ gdata_documents_text_download_document (GDataDocumentsText *self, GDataDocuments
 	/* Download the file */
 	link_href = gdata_documents_text_get_download_uri (self, export_format);
 	destination_file = _gdata_documents_entry_download_document (GDATA_DOCUMENTS_ENTRY (self), GDATA_SERVICE (service),
-								     content_type, link_href, destination_file, export_formats[export_format], replace_file_if_exists,
-								     cancellable, error);
+	                                                             content_type, link_href, destination_file, export_formats[export_format],
+	                                                             replace_file_if_exists, cancellable, error);
 	g_free (link_href);
 
 	return destination_file;
diff --git a/gdata/services/documents/gdata-documents-text.h b/gdata/services/documents/gdata-documents-text.h
index a8779fc..1f5d10b 100644
--- a/gdata/services/documents/gdata-documents-text.h
+++ b/gdata/services/documents/gdata-documents-text.h
@@ -94,10 +94,11 @@ GDataDocumentsText *gdata_documents_text_new (const gchar *id) G_GNUC_WARN_UNUSE
 #include <gdata/services/documents/gdata-documents-service.h>
 
 GFile *gdata_documents_text_download_document (GDataDocumentsText *self, GDataDocumentsService *service, gchar **content_type,
-					       GDataDocumentsTextFormat export_format, GFile *destination_file,
-					       gboolean replace_file_if_exists, GCancellable *cancellable,
-					       GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
-gchar *gdata_documents_text_get_download_uri (GDataDocumentsText *self, GDataDocumentsTextFormat export_format) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                               GDataDocumentsTextFormat export_format, GFile *destination_file,
+                                               gboolean replace_file_if_exists, GCancellable *cancellable,
+                                               GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+gchar *gdata_documents_text_get_download_uri (GDataDocumentsText *self,
+                                              GDataDocumentsTextFormat export_format) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 G_END_DECLS
 
diff --git a/gdata/services/picasaweb/gdata-picasaweb-album.c b/gdata/services/picasaweb/gdata-picasaweb-album.c
index 0e808a5..3bdd2cc 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-album.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-album.c
@@ -128,10 +128,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ALBUM_ID,
-					 g_param_spec_string ("album-id",
-							      "Album ID", "The ID of the album.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("album-id",
+	                                                      "Album ID", "The ID of the album.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:user
@@ -144,10 +144,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_USER,
-					 g_param_spec_string ("user",
-							      "User", "The username of the album owner.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("user",
+	                                                      "User", "The username of the album owner.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:nickname
@@ -160,10 +160,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NICKNAME,
-					 g_param_spec_string ("nickname",
-							      "Nickname", "The user's nickname.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("nickname",
+	                                                      "Nickname", "The user's nickname.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:edited
@@ -176,10 +176,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EDITED,
-					 g_param_spec_boxed ("edited",
-							     "Edited", "The time this album was last edited.",
-							     GDATA_TYPE_G_TIME_VAL,
-							     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("edited",
+	                                                     "Edited", "The time this album was last edited.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:location
@@ -192,10 +192,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LOCATION,
-					 g_param_spec_string ("location",
-							      "Location", "The user-specified location associated with the album.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("location",
+	                                                      "Location", "The user-specified location associated with the album.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:visibility
@@ -208,10 +208,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VISIBILITY,
-					 g_param_spec_enum ("visibility",
-							    "Visibility", "The visibility (or access rights) of the album.",
-							    GDATA_TYPE_PICASAWEB_VISIBILITY, GDATA_PICASAWEB_PUBLIC,
-							    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("visibility",
+	                                                    "Visibility", "The visibility (or access rights) of the album.",
+	                                                    GDATA_TYPE_PICASAWEB_VISIBILITY, GDATA_PICASAWEB_PUBLIC,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:timestamp
@@ -224,10 +224,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TIMESTAMP,
-					 g_param_spec_boxed ("timestamp",
-							     "Timestamp", "The timestamp of when the album occurred, settable by the user.",
-							     GDATA_TYPE_G_TIME_VAL,
-							     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("timestamp",
+	                                                     "Timestamp", "The timestamp of when the album occurred, settable by the user.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/* TODO: Change to photo-count? */
 	/**
@@ -241,10 +241,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NUM_PHOTOS,
-					 g_param_spec_uint ("num-photos",
-							    "Number of photos", "The number of photos and videos in the album.",
-							    0, G_MAXUINT, 0,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("num-photos",
+	                                                    "Number of photos", "The number of photos and videos in the album.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/* TODO: Change to remaining-photos-count? */
 	/**
@@ -259,11 +259,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NUM_PHOTOS_REMAINING,
-					 g_param_spec_uint ("num-photos-remaining",
-							    "Number of photo spaces remaining", "The number of photos and videos that can still be"
-							    " uploaded to this album.",
-							    0, G_MAXUINT, 0,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("num-photos-remaining",
+	                                                    "Number of photo spaces remaining", "The number of files spaces still free for uploads.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:bytes-used:
@@ -277,10 +276,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_BYTES_USED,
-					 g_param_spec_long ("bytes-used",
-							    "Number of bytes used", "The number of bytes consumed by this album and its contents.",
-							    -1, G_MAXLONG, -1,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_long ("bytes-used",
+	                                                    "Number of bytes used", "The number of bytes consumed by this album and its contents.",
+	                                                    -1, G_MAXLONG, -1,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:commenting-enabled:
@@ -290,10 +289,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_COMMENTING_ENABLED,
-					 g_param_spec_boolean ("is-commenting-enabled",
-							       "Commenting enabled?", "Whether commenting is enabled for this album.",
-							       FALSE,
-							       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-commenting-enabled",
+	                                                       "Commenting enabled?", "Whether commenting is enabled for this album.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:comment-count:
@@ -306,10 +305,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_COMMENT_COUNT,
-					 g_param_spec_uint ("comment-count",
-							    "Comment count", "The number of comments on the album.",
-							    0, G_MAXUINT, 0,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("comment-count",
+	                                                    "Comment count", "The number of comments on the album.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:tags:
@@ -322,10 +321,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TAGS,
-					 g_param_spec_boxed ("tags",
-							      "Tags", "A NULL-terminated array of tags associated with the album",
-							      G_TYPE_STRV,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("tags",
+	                                                     "Tags", "A NULL-terminated array of tags associated with the album",
+	                                                     G_TYPE_STRV,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:latitude:
@@ -339,10 +338,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LATITUDE,
-					 g_param_spec_double ("latitude",
-							      "Latitude", "The location as a latitude coordinate associated with this album.",
-							      -90.0, 90.0, 0.0,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("latitude",
+	                                                      "Latitude", "The location as a latitude coordinate associated with this album.",
+	                                                      -90.0, 90.0, 0.0,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebAlbum:longitude:
@@ -356,10 +355,10 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LONGITUDE,
-					 g_param_spec_double ("longitude",
-							      "Longitude", "The location as a longitude coordinate associated with this album.",
-							      -180.0, 180.0, 0.0,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("longitude",
+	                                                      "Longitude", "The location as a longitude coordinate associated with this album.",
+	                                                      -180.0, 180.0, 0.0,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -661,7 +660,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 				return gdata_parser_error_required_content_missing (node, error);
 			}
 
-			gdata_picasaweb_album_set_is_commenting_enabled (self, (xmlStrcmp (commenting_enabled, (xmlChar*) "true") == 0) ? TRUE : FALSE);
+			gdata_picasaweb_album_set_is_commenting_enabled (self,
+			                                                 (xmlStrcmp (commenting_enabled, (xmlChar*) "true") == 0) ? TRUE : FALSE);
 			xmlFree (commenting_enabled);
 		} else if (xmlStrcmp (node->name, (xmlChar*) "commentCount") == 0) {
 			/* gphoto:commentCount */
@@ -712,7 +712,7 @@ get_xml (GDataParsable *parsable, GString *xml_string)
 	if (priv->timestamp.tv_sec != 0 || priv->timestamp.tv_usec != 0) {
 		/* in milliseconds */
 		g_string_append_printf (xml_string, "<gphoto:timestamp>%" G_GUINT64_FORMAT "</gphoto:timestamp>",
-					((guint64) priv->timestamp.tv_sec) * 1000 + priv->timestamp.tv_usec / 1000);
+		                        ((guint64) priv->timestamp.tv_sec) * 1000 + priv->timestamp.tv_usec / 1000);
 	}
 
 	if (priv->is_commenting_enabled == FALSE)
diff --git a/gdata/services/picasaweb/gdata-picasaweb-album.h b/gdata/services/picasaweb/gdata-picasaweb-album.h
index c9cbddf..f3dc33e 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-album.h
+++ b/gdata/services/picasaweb/gdata-picasaweb-album.h
@@ -33,8 +33,8 @@ G_BEGIN_DECLS
  * @GDATA_PICASAWEB_PUBLIC: the album is visible to everyone, regardless of whether they're authenticated
  * @GDATA_PICASAWEB_PRIVATE: the album is visible only to authenticated users in a whitelist
  *
- * Visibility statuses available for albums on PicasaWeb. For more information, see the <ulink type="http"
- * url="http://code.google.com/apis/picasaweb/reference.html#Visibility";>online documentation</ulink>.
+ * Visibility statuses available for albums on PicasaWeb. For more information, see the
+ * <ulink type="http" url="http://code.google.com/apis/picasaweb/reference.html#Visibility";>online documentation</ulink>.
  *
  * Since: 0.4.0
  **/
diff --git a/gdata/services/picasaweb/gdata-picasaweb-feed.c b/gdata/services/picasaweb/gdata-picasaweb-feed.c
index c297ef6..749afd2 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-feed.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-feed.c
@@ -46,7 +46,6 @@ gdata_picasaweb_feed_class_init (GDataPicasaWebFeedClass *klass)
 {
 	GDataParsableClass *parsable_class = GDATA_PARSABLE_CLASS (klass);
 	parsable_class->parse_xml = parse_xml;
-
 }
 
 static void
@@ -59,60 +58,30 @@ static gboolean
 parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_data, GError **error)
 {
 	if (gdata_parser_is_namespace (node, "http://schemas.google.com/photos/2007";) == TRUE) {
-		if (xmlStrcmp (node->name, (xmlChar*) "user") == 0) {
-			/* gphoto:user */
-			/* From user's feed of album entries.  Redundant with user entry represented by GDataPicasaWebUser.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "nickname") == 0) {
-			/* gphoto:nickname */
-			/* From user's feed of album entries.  Redundant with user entry represented by GDataPicasaWebUser.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "quotacurrent") == 0) {
-			/* gphoto:quota-current */
-			/* From user's feed of album entries.  Redundant with user entry represented by GDataPicasaWebUser.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "quotalimit") == 0) {
-			/* gphoto:quota-limit */
-			/* From user's feed of album entries.  Redundant with user entry represented by GDataPicasaWebUser.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "maxPhotosPerAlbum") == 0) {
-			/* gphoto:max-photos-per-album */
-			/* From user's feed of album entries.  Redundant with user entry represented by GDataPicasaWebUser.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "thumbnail") == 0) {
-			/* gphoto:thumbnail */
-			/* From user's feed of album entries.  Redundant with user entry represented by GDataPicasaWebUser.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "allowDownloads") == 0) {
-			/* gphoto:allowDownloads */
-			/* Not part of public API so we're capturing and ignoring for now.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "allowPrints") == 0) {
-			/* gphoto:allowPrints */
-			/* Not part of public API so we're capturing and ignoring for now.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "id") == 0 && xmlStrcmp (node->ns->href, (xmlChar*) "http://schemas.google.com/photos/2007";) == 0) {
-			/* gphoto:id */
-			/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "rights") == 0) {
-			/* gphoto:rights */
-			/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "location") == 0) {
-			/* gphoto:location */
-			/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "access") == 0) {
-			/* gphoto:access */
-			/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "timestamp") == 0) {
-			/* gphoto:timestamp */
-			/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "numphotos") == 0) {
-			/* gphoto:numphotos */
-			/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "numphotosremaining") == 0) {
-			/* gphoto:numphotosremaining */
-			/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
-		} else if (xmlStrcmp (node->name, (xmlChar*) "bytesUsed") == 0) {
-			/* gphoto:bytesUsed */
-			/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
+		if (xmlStrcmp (node->name, (xmlChar*) "user") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "nickname") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "quotacurrent") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "quotalimit") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "maxPhotosPerAlbum") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "thumbnail") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "allowDownloads") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "allowPrints") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "id") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "rights") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "location") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "access") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "timestamp") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "numphotos") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "numphotosremaining") == 0 ||
+		    xmlStrcmp (node->name, (xmlChar*) "bytesUsed") == 0) {
+			/* From user's feed of album entries. Redundant with user entry represented by #GDataPicasaWebUser.
+			 * Capturing and ignoring. See bgo #589858. */
 		} else {
 			return GDATA_PARSABLE_CLASS (gdata_picasaweb_feed_parent_class)->parse_xml (parsable, doc, node, user_data, error);
 		}
 	} else if (gdata_parser_is_namespace (node, "http://www.georss.org/georss";) == TRUE && xmlStrcmp (node->name, (xmlChar*) "where") == 0) {
-		/* georss:where */
-		/* From album's feed of file entries.  Redundant with album entries represented by GDataPicasaWebAlbum.  Capturing and ignoring.  See bgo #589858. */
+		/* From user's feed of album entries. Redundant with user entry represented by #GDataPicasaWebUser.
+		 * Capturing and ignoring. See bgo #589858. */
 	} else {
 		return GDATA_PARSABLE_CLASS (gdata_picasaweb_feed_parent_class)->parse_xml (parsable, doc, node, user_data, error);
 	}
diff --git a/gdata/services/picasaweb/gdata-picasaweb-file.c b/gdata/services/picasaweb/gdata-picasaweb-file.c
index 2c47d48..661bb2a 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-file.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-file.c
@@ -149,10 +149,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.7.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FILE_ID,
-					 g_param_spec_string ("file-id",
-							      "File ID", "The ID of the file.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("file-id",
+	                                                      "File ID", "The ID of the file.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:version:
@@ -165,10 +165,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VERSION,
-					 g_param_spec_string ("version",
-							      "Version", "The version number of the file.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("version",
+	                                                      "Version", "The version number of the file.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:album-id:
@@ -181,10 +181,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ALBUM_ID,
-					 g_param_spec_string ("album-id",
-							      "Album ID", "The ID for the file's album.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("album-id",
+	                                                      "Album ID", "The ID for the file's album.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:client:
@@ -197,10 +197,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CLIENT,
-					 g_param_spec_string ("client",
-							      "Client", "The name of the software which created or last modified the file.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("client",
+	                                                      "Client", "The name of the software which created or last modified the file.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:checksum:
 	 *
@@ -212,10 +213,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CHECKSUM,
-					 g_param_spec_string ("checksum",
-							      "Checksum", "A checksum of the file, useful for duplicate detection.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("checksum",
+	                                                      "Checksum", "A checksum of the file, useful for duplicate detection.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:video-status:
 	 *
@@ -227,10 +229,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VIDEO_STATUS,
-					 g_param_spec_string ("video-status",
-							      "Video Status", "The status of the file, if it is a video.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("video-status",
+	                                                      "Video Status", "The status of the file, if it is a video.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:position:
@@ -243,10 +245,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_POSITION,
-					 g_param_spec_double ("position",
-							      "Position", "The ordinal position of the file within the album.",
-							      0.0, G_MAXFLOAT, 0.0,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("position",
+	                                                      "Position", "The ordinal position of the file within the album.",
+	                                                      0.0, G_MAXFLOAT, 0.0,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:width:
 	 *
@@ -258,10 +261,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_WIDTH,
-					 g_param_spec_uint ("width",
-							    "Width", "The width of the photo or video, in pixels.",
-							    0, G_MAXUINT, 0,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("width",
+	                                                    "Width", "The width of the photo or video, in pixels.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:height:
 	 *
@@ -273,10 +277,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_HEIGHT,
-					 g_param_spec_uint ("height",
-							    "Height", "The height of the photo or video, in pixels.",
-							    0, G_MAXUINT, 0,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("height",
+	                                                    "Height", "The height of the photo or video, in pixels.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:size:
 	 *
@@ -288,10 +293,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SIZE,
-					 g_param_spec_ulong ("size",
-							     "Size", "The size of the file, in bytes.",
-							     0, G_MAXULONG, 0,
-							     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_ulong ("size",
+	                                                     "Size", "The size of the file, in bytes.",
+	                                                     0, G_MAXULONG, 0,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:edited:
@@ -304,10 +309,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EDITED,
-					 g_param_spec_boxed ("edited",
-							     "Edited", "The time this file was last edited.",
-							     GDATA_TYPE_G_TIME_VAL,
-							     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("edited",
+	                                                     "Edited", "The time this file was last edited.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:timestamp:
 	 *
@@ -319,10 +325,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TIMESTAMP,
-					 g_param_spec_boxed ("timestamp",
-							     "Timestamp", "The time the file was purportedly taken.",
-							     GDATA_TYPE_G_TIME_VAL,
-							     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("timestamp",
+	                                                     "Timestamp", "The time the file was purportedly taken.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:comment-count:
 	 *
@@ -334,10 +341,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_COMMENT_COUNT,
-					 g_param_spec_uint ("comment-count",
-							    "Comment Count", "The number of comments on the file.",
-							    0, G_MAXUINT, 0,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("comment-count",
+	                                                    "Comment Count", "The number of comments on the file.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:rotation:
 	 *
@@ -350,10 +358,11 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ROTATION,
-					 g_param_spec_uint ("rotation",
-							    "Rotation", "The rotation of the photo, in degrees.",
-							    0, 359, 0,
-							    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("rotation",
+	                                                    "Rotation", "The rotation of the photo, in degrees.",
+	                                                    0, 359, 0,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * GDataPicasaWebFile:is-commenting-enabled:
 	 *
@@ -362,10 +371,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_COMMENTING_ENABLED,
-					 g_param_spec_boolean ("is-commenting-enabled",
-							       "Commenting enabled?", "Indicates whether comments are enabled.",
-							       TRUE,
-							       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-commenting-enabled",
+	                                                       "Commenting enabled?", "Indicates whether comments are enabled.",
+	                                                       TRUE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:credit:
@@ -378,10 +387,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CREDIT,
-					 g_param_spec_string ("credit",
-							      "Credit", "The nickname of the user credited with this file.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("credit",
+	                                                      "Credit", "The nickname of the user credited with this file.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:caption:
@@ -391,10 +400,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CAPTION,
-					 g_param_spec_string ("caption",
-							      "Caption", "The file's descriptive caption.",
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("caption",
+	                                                      "Caption", "The file's descriptive caption.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:tags:
@@ -407,10 +416,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TAGS,
-					 g_param_spec_boxed ("tags",
-							      "Tags", "A NULL-terminated array of tags associated with the file.",
-							      G_TYPE_STRV,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("tags",
+	                                                     "Tags", "A NULL-terminated array of tags associated with the file.",
+	                                                     G_TYPE_STRV,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:distance:
@@ -423,10 +432,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DISTANCE,
-					 g_param_spec_double ("distance",
-							      "Distance", "The distance to the subject.",
-							      -1.0, G_MAXDOUBLE, -1.0,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("distance",
+	                                                      "Distance", "The distance to the subject.",
+	                                                      -1.0, G_MAXDOUBLE, -1.0,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:exposure:
@@ -439,10 +448,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_EXPOSURE,
-					 g_param_spec_double ("exposure",
-							      "Exposure", "The exposure time.",
-							      0.0, G_MAXDOUBLE, 0.0,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("exposure",
+	                                                      "Exposure", "The exposure time.",
+	                                                      0.0, G_MAXDOUBLE, 0.0,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:flash:
@@ -455,10 +464,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FLASH,
-					 g_param_spec_boolean ("flash",
-							       "Flash", "Indicates whether the flash was used.",
-							       FALSE,
-							       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("flash",
+	                                                       "Flash", "Indicates whether the flash was used.",
+	                                                       FALSE,
+	                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:focal-length:
@@ -471,11 +480,12 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FOCAL_LENGTH,
-					 g_param_spec_double ("focal-length",
-							      "Focal Length", "The focal length used in the shot.",
-							      -1.0, G_MAXDOUBLE, -1.0,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("focal-length",
+	                                                      "Focal Length", "The focal length used in the shot.",
+	                                                      -1.0, G_MAXDOUBLE, -1.0,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
+	/* TODO: Rename to f-stop */
 	/**
 	 * GDataPicasaWebFile:fstop:
 	 *
@@ -487,10 +497,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FSTOP,
-					 g_param_spec_double ("fstop",
-							      "F-stop", "The F-stop used.",
-							      0.0, G_MAXDOUBLE, 0.0,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("fstop",
+	                                                      "F-stop", "The F-stop used.",
+	                                                      0.0, G_MAXDOUBLE, 0.0,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:image-unique-id:
@@ -503,10 +513,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IMAGE_UNIQUE_ID,
-					 g_param_spec_string ("image-unique-id",
-							      "Image Unique ID", "An unique ID for the image.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("image-unique-id",
+	                                                      "Image Unique ID", "An unique ID for the image.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:iso:
@@ -519,10 +529,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ISO,
-					 g_param_spec_long ("iso",
-							    "ISO", "The ISO speed.",
-							    -1, G_MAXLONG, -1,
-							    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_long ("iso",
+	                                                    "ISO", "The ISO speed.",
+	                                                    -1, G_MAXLONG, -1,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:make:
@@ -535,10 +545,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MAKE,
-					 g_param_spec_string ("make",
-							      "Make", "The name of the manufacturer.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("make",
+	                                                      "Make", "The name of the manufacturer.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:model:
@@ -551,10 +561,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MODEL,
-					 g_param_spec_string ("model",
-							      "Model", "The model of the camera.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("model",
+	                                                      "Model", "The model of the camera.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:latitude:
@@ -568,10 +578,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LATITUDE,
-					 g_param_spec_double ("latitude",
-							      "Latitude", "The location as a latitude coordinate associated with this file.",
-							      -90.0, 90.0, 0.0,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("latitude",
+	                                                      "Latitude", "The location as a latitude coordinate associated with this file.",
+	                                                      -90.0, 90.0, 0.0,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebFile:longitude:
@@ -585,10 +595,10 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 	 * Since: 0.5.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LONGITUDE,
-					 g_param_spec_double ("longitude",
-							      "Longitude", "The location as a longitude coordinate associated with this file.",
-							      -180.0, 180.0, 0.0,
-							      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("longitude",
+	                                                      "Longitude", "The location as a longitude coordinate associated with this file.",
+	                                                      -180.0, 180.0, 0.0,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -806,11 +816,11 @@ gdata_picasaweb_file_set_property (GObject *object, guint property_id, const GVa
 			break;
 		case PROP_LATITUDE:
 			gdata_picasaweb_file_set_coordinates (self, g_value_get_double (value),
-							      gdata_georss_where_get_longitude (self->priv->georss_where));
+			                                      gdata_georss_where_get_longitude (self->priv->georss_where));
 			break;
 		case PROP_LONGITUDE:
 			gdata_picasaweb_file_set_coordinates (self, gdata_georss_where_get_latitude (self->priv->georss_where),
-							      g_value_get_double (value));
+			                                      g_value_get_double (value));
 			break;
 		default:
 			/* We don't have any other property... */
@@ -900,8 +910,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 		} else if (xmlStrcmp (node->name, (xmlChar*) "access") == 0) {
 			/* gphoto:access */
 			/* Visibility is already obtained through the album. When PicasaWeb supports per-file access restrictions,
-			   we'll expose this property. Until then, we'll catch this to suppress the Unhandled XML warning.
-			   See https://bugzilla.gnome.org/show_bug.cgi?id=589858 */
+			 * we'll expose this property. Until then, we'll catch this to suppress the Unhandled XML warning.
+			 * See https://bugzilla.gnome.org/show_bug.cgi?id=589858 */
 		} else if (xmlStrcmp (node->name, (xmlChar*) "rotation") == 0) {
 			/* gphoto:rotation */
 			xmlChar *rotation = xmlNodeListGetString (doc, node->children, TRUE);
@@ -934,7 +944,7 @@ get_xml (GDataParsable *parsable, GString *xml_string)
 		g_string_append_printf (xml_string, "<gphoto:version>%s</gphoto:version>", priv->version);
 
 	g_string_append_printf (xml_string, "<gphoto:position>%s</gphoto:position>",
-				g_ascii_dtostr (ascii_double_str, sizeof (ascii_double_str), priv->position));
+	                        g_ascii_dtostr (ascii_double_str, sizeof (ascii_double_str), priv->position));
 
 	if (priv->album_id != NULL)
 		g_string_append_printf (xml_string, "<gphoto:albumid>%s</gphoto:albumid>", priv->album_id);
@@ -948,7 +958,7 @@ get_xml (GDataParsable *parsable, GString *xml_string)
 	if (priv->timestamp.tv_sec != 0 || priv->timestamp.tv_usec != 0) {
 		/* timestamp is in milliseconds */
 		g_string_append_printf (xml_string, "<gphoto:timestamp>%" G_GUINT64_FORMAT "</gphoto:timestamp>",
-					((guint64) priv->timestamp.tv_sec) * 1000 + priv->timestamp.tv_usec / 1000);
+		                        ((guint64) priv->timestamp.tv_sec) * 1000 + priv->timestamp.tv_usec / 1000);
 	}
 
 	if (priv->is_commenting_enabled == TRUE)
diff --git a/gdata/services/picasaweb/gdata-picasaweb-file.h b/gdata/services/picasaweb/gdata-picasaweb-file.h
index 46d9083..2351e45 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-file.h
+++ b/gdata/services/picasaweb/gdata-picasaweb-file.h
@@ -108,7 +108,8 @@ const gchar *gdata_picasaweb_file_get_version (GDataPicasaWebFile *self);
 gdouble gdata_picasaweb_file_get_position (GDataPicasaWebFile *self);
 void gdata_picasaweb_file_set_position (GDataPicasaWebFile *self, gdouble position);
 const gchar *gdata_picasaweb_file_get_album_id (GDataPicasaWebFile *self);
-void gdata_picasaweb_file_set_album_id (GDataPicasaWebFile *self, const gchar *album_id); /* TODO should we have a more obvious _move() API too? nah */
+/* TODO should we have a more obvious _move() API too? nah */
+void gdata_picasaweb_file_set_album_id (GDataPicasaWebFile *self, const gchar *album_id);
 guint gdata_picasaweb_file_get_width (GDataPicasaWebFile *self);
 guint gdata_picasaweb_file_get_height (GDataPicasaWebFile *self);
 gsize gdata_picasaweb_file_get_size (GDataPicasaWebFile *self);
diff --git a/gdata/services/picasaweb/gdata-picasaweb-query.c b/gdata/services/picasaweb/gdata-picasaweb-query.c
index 49371a9..1033178 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-query.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-query.c
@@ -100,25 +100,25 @@ gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VISIBILITY,
-				g_param_spec_int ("visibility",
-					"Visibility", "Specifies which albums should be listed, in terms of their visibility.",
-					0, GDATA_PICASAWEB_PRIVATE, 0,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_int ("visibility",
+	                                                   "Visibility", "Specifies which albums should be listed, in terms of their visibility.",
+	                                                   0, GDATA_PICASAWEB_PRIVATE, 0,
+	                                                   G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebQuery:thumbnail-size:
 	 *
-	 * A comma-separated list of thumbnail sizes (width in pixels) to return. Only certain sizes are allowed, and whether the thumbnail should be
+	 * A comma-separated list of thumbnail widths (in pixels) to return. Only certain sizes are allowed, and whether the thumbnail should be
 	 * cropped or scaled can be specified; for more information, see the
 	 * <ulink type="http" url="http://code.google.com/apis/picasaweb/reference.html#Parameters";>online documentation</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_THUMBNAIL_SIZE,
-				g_param_spec_string ("thumbnail-size",
-					"Thumbnail size", "A comma-separated list of thumbnail sizes (width in pixels) to return.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("thumbnail-size",
+	                                                      "Thumbnail size", "A comma-separated list of thumbnail width (in pixels) to return.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebQuery:image-size:
@@ -130,10 +130,10 @@ gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IMAGE_SIZE,
-				g_param_spec_string ("image-size",
-					"Image size", "A comma-separated list of image sizes (width in pixels) to return.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("image-size",
+	                                                      "Image size", "A comma-separated list of image sizes (width in pixels) to return.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebQuery:tag:
@@ -143,10 +143,10 @@ gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_TAG,
-				g_param_spec_string ("tag",
-					"Tag", "A tag which returned results must contain.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("tag",
+	                                                      "Tag", "A tag which returned results must contain.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebQuery:location:
@@ -156,10 +156,10 @@ gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LOCATION,
-				g_param_spec_string ("location",
-					"Location", "A location to search for photos, e.g. \"London\".",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("location",
+	                                                      "Location", "A location to search for photos, e.g. \"London\".",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -281,10 +281,10 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo
 
 		APPEND_SEP
 		g_string_append_printf (query_uri, "bbox=%s,%s,%s,%s",
-					g_ascii_dtostr (west, sizeof (west), priv->bounding_box.west),
-					g_ascii_dtostr (south, sizeof (south), priv->bounding_box.south),
-					g_ascii_dtostr (east, sizeof (east), priv->bounding_box.east),
-					g_ascii_dtostr (north, sizeof (north), priv->bounding_box.north));
+		                        g_ascii_dtostr (west, sizeof (west), priv->bounding_box.west),
+		                        g_ascii_dtostr (south, sizeof (south), priv->bounding_box.south),
+		                        g_ascii_dtostr (east, sizeof (east), priv->bounding_box.east),
+		                        g_ascii_dtostr (north, sizeof (north), priv->bounding_box.north));
 	}
 
 	if (priv->location != NULL) {
@@ -334,10 +334,10 @@ GDataPicasaWebQuery *
 gdata_picasaweb_query_new_with_limits (const gchar *q, guint start_index, guint max_results)
 {
 	return g_object_new (GDATA_TYPE_PICASAWEB_QUERY,
-			     "q", q,
-			     "start-index", start_index,
-			     "max-results", max_results,
-			     NULL);
+	                     "q", q,
+	                     "start-index", start_index,
+	                     "max-results", max_results,
+	                     NULL);
 }
 
 /**
diff --git a/gdata/services/picasaweb/gdata-picasaweb-query.h b/gdata/services/picasaweb/gdata-picasaweb-query.h
index a1eb3dc..7fbff66 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-query.h
+++ b/gdata/services/picasaweb/gdata-picasaweb-query.h
@@ -30,7 +30,7 @@
 G_BEGIN_DECLS
 
 #define GDATA_TYPE_PICASAWEB_QUERY		(gdata_picasaweb_query_get_type ())
-#define GDATA_PICASAWEB_QUERY(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_PICASAWEB_QUERY, GDataPicasaWebQuery))
+#define GDATA_PICASAWEB_QUERY(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_PICASAWEB_QUERY, GDataPicasaWebQuery))
 #define GDATA_PICASAWEB_QUERY_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_PICASAWEB_QUERY, GDataPicasawebQueryClass))
 #define GDATA_IS_PICASAWEB_QUERY(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_PICASAWEB_QUERY))
 #define GDATA_IS_PICASAWEB_QUERY_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_PICASAWEB_QUERY))
diff --git a/gdata/services/picasaweb/gdata-picasaweb-service.c b/gdata/services/picasaweb/gdata-picasaweb-service.c
index 457577b..2b09231 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-service.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-service.c
@@ -75,10 +75,7 @@ GDataPicasaWebService *
 gdata_picasaweb_service_new (const gchar *client_id)
 {
 	g_return_val_if_fail (client_id != NULL, NULL);
-
-	return g_object_new (GDATA_TYPE_PICASAWEB_SERVICE,
-			     "client-id", client_id,
-			     NULL);
+	return g_object_new (GDATA_TYPE_PICASAWEB_SERVICE, "client-id", client_id, NULL);
 }
 
 /*
@@ -135,7 +132,7 @@ gdata_picasaweb_service_get_user (GDataPicasaWebService *self, const gchar *user
 	uri = create_uri (self, username, "entry");
 	if (uri == NULL) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must specify a username or be authenticated to query a user."));
+		                     _("You must specify a username or be authenticated to query a user."));
 		return NULL;
 	}
 
@@ -176,7 +173,7 @@ gdata_picasaweb_service_get_user (GDataPicasaWebService *self, const gchar *user
  **/
 GDataFeed *
 gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuery *query, const gchar *username, GCancellable *cancellable,
-					  GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
+                                          GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
 {
 	gchar *uri;
 	GDataFeed *album_feed;
@@ -189,20 +186,20 @@ gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuer
 	if (query != NULL && gdata_query_get_q (query) != NULL) {
 		/* Bug #593336 â?? Query parameter "q=..." isn't valid for album kinds */
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_BAD_QUERY_PARAMETER,
-				     _("Query parameter not allowed for albums."));
+		                     _("Query parameter not allowed for albums."));
 		return NULL;
 	}
 
 	uri = create_uri (self, username, "feed");
 	if (uri == NULL) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must specify a username or be authenticated to query all albums."));
+		                     _("You must specify a username or be authenticated to query all albums."));
 		return NULL;
 	}
 
 	/* Execute the query */
 	album_feed = gdata_service_query (GDATA_SERVICE (self), uri, query, GDATA_TYPE_PICASAWEB_ALBUM,
-					  cancellable, progress_callback, progress_user_data, error);
+	                                  cancellable, progress_callback, progress_user_data, error);
 	g_free (uri);
 
 	return album_feed;
@@ -230,8 +227,8 @@ gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuer
  **/
 void
 gdata_picasaweb_service_query_all_albums_async (GDataPicasaWebService *self, GDataQuery *query, const gchar *username,
-						GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						GAsyncReadyCallback callback, gpointer user_data)
+                                                GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                GAsyncReadyCallback callback, gpointer user_data)
 {
 	gchar *uri;
 
@@ -243,22 +240,22 @@ gdata_picasaweb_service_query_all_albums_async (GDataPicasaWebService *self, GDa
 	if (query != NULL && gdata_query_get_q (query) != NULL) {
 		/* Bug #593336 â?? Query parameter "q=..." isn't valid for album kinds */
 		g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data,
-						     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_BAD_QUERY_PARAMETER,
-						     _("Query parameter not allowed for albums."));
+		                                     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_BAD_QUERY_PARAMETER,
+		                                     _("Query parameter not allowed for albums."));
 		return;
 	}
 
 	uri = create_uri (self, username, "feed");
 	if (uri == NULL) {
 		g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data,
-						     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-						     _("You must specify a username or be authenticated to query all albums."));
+		                                     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
+		                                     _("You must specify a username or be authenticated to query all albums."));
 		return;
 	}
 
 	/* Schedule the async query */
 	gdata_service_query_async (GDATA_SERVICE (self), uri, query, GDATA_TYPE_PICASAWEB_ALBUM, cancellable, progress_callback, progress_user_data,
-				   callback, user_data);
+	                           callback, user_data);
 	g_free (uri);
 }
 
@@ -283,7 +280,7 @@ gdata_picasaweb_service_query_all_albums_async (GDataPicasaWebService *self, GDa
  **/
 GDataFeed *
 gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataQuery *query, GCancellable *cancellable,
-				     GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
+                                     GDataQueryProgressCallback progress_callback, gpointer progress_user_data, GError **error)
 {
 	/* TODO: Async variant */
 	const gchar *uri;
@@ -299,7 +296,7 @@ gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWeb
 		if (link == NULL) {
 			/* Error */
 			g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-					     _("The album did not have a feed link."));
+			                     _("The album did not have a feed link."));
 			return NULL;
 		}
 		uri = gdata_link_get_uri (link);
@@ -310,7 +307,7 @@ gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWeb
 
 	/* Execute the query */
 	return gdata_service_query (GDATA_SERVICE (self), uri, GDATA_QUERY (query), GDATA_TYPE_PICASAWEB_FILE, cancellable,
-				    progress_callback, progress_user_data, error);
+	                            progress_callback, progress_user_data, error);
 }
 
 static GOutputStream *
@@ -388,7 +385,7 @@ parse_spliced_stream (GOutputStream *output_stream, GError **error)
  **/
 GDataPicasaWebFile *
 gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry, GFile *file_data,
-				     GCancellable *cancellable, GError **error)
+                                     GCancellable *cancellable, GError **error)
 {
 	GOutputStream *output_stream;
 	GInputStream *input_stream;
@@ -404,13 +401,13 @@ gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWeb
 
 	if (gdata_entry_is_inserted (GDATA_ENTRY (file_entry)) == TRUE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED,
-				     _("The entry has already been inserted."));
+		                     _("The entry has already been inserted."));
 		return NULL;
 	}
 
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to upload a file."));
+		                     _("You must be authenticated to upload a file."));
 		return NULL;
 	}
 
@@ -426,7 +423,7 @@ gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWeb
 	}
 
 	g_output_stream_splice (output_stream, input_stream, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-				cancellable, &child_error);
+	                        cancellable, &child_error);
 
 	g_object_unref (input_stream);
 	if (child_error != NULL) {
@@ -473,7 +470,6 @@ gdata_picasaweb_service_upload_file_finish (GDataPicasaWebService *self, GAsyncR
 	g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL);
 	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
-	/* propagate any potential errors we might have encountered in g_output_stream_splice() or gdata_picasaweb_service_upload_file_async() */
 	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error))
 		return NULL;
 
@@ -510,10 +506,10 @@ upload_file_async_cb (GOutputStream *output_stream, GAsyncResult *result, Upload
 
 	if (error == NULL && file != NULL)
 		async_result = g_simple_async_result_new (G_OBJECT (data->service), (GAsyncReadyCallback) data->callback,
-							  data->user_data, gdata_picasaweb_service_upload_file_async);
+		                                          data->user_data, gdata_picasaweb_service_upload_file_async);
 	else
 		async_result = g_simple_async_result_new_from_error (G_OBJECT (data->service), (GAsyncReadyCallback) data->callback,
-								     data->user_data, error);
+		                                                     data->user_data, error);
 
 	g_simple_async_result_set_op_res_gpointer (async_result, file, NULL);
 
@@ -546,7 +542,7 @@ upload_file_async_cb (GOutputStream *output_stream, GAsyncResult *result, Upload
  **/
 void
 gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry,
-					   GFile *file_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+                                           GFile *file_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
 	GOutputStream *output_stream;
 	GInputStream *input_stream;
@@ -562,13 +558,13 @@ gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPic
 
 	if (gdata_entry_is_inserted (GDATA_ENTRY (file_entry)) == TRUE) {
 		g_set_error_literal (&error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED,
-				     _("The entry has already been inserted."));
+		                     _("The entry has already been inserted."));
 		goto error;
 	}
 
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (&error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to upload a file."));
+		                     _("You must be authenticated to upload a file."));
 		goto error;
 	}
 
@@ -591,14 +587,14 @@ gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPic
 
 	/* Actually transfer the data */
 	g_output_stream_splice_async (output_stream, input_stream, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-				      0, cancellable, (GAsyncReadyCallback) upload_file_async_cb, data);
+	                              0, cancellable, (GAsyncReadyCallback) upload_file_async_cb, data);
 
 	g_object_unref (input_stream);
 	g_object_unref (output_stream);
 
 	return;
 
- error:
+error:
 	result = g_simple_async_result_new_from_error (G_OBJECT (self), callback, user_data, error);
 	g_simple_async_result_complete (result);
 }
@@ -630,13 +626,13 @@ gdata_picasaweb_service_insert_album (GDataPicasaWebService *self, GDataPicasaWe
 
 	if (gdata_entry_is_inserted (GDATA_ENTRY (album)) == TRUE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_ENTRY_ALREADY_INSERTED,
-				     _("The album has already been inserted."));
+		                     _("The album has already been inserted."));
 		return NULL;
 	}
 
 	if (gdata_service_is_authenticated (GDATA_SERVICE (self)) == FALSE) {
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-				     _("You must be authenticated to insert an album."));
+		                     _("You must be authenticated to insert an album."));
 		return NULL;
 	}
 
diff --git a/gdata/services/picasaweb/gdata-picasaweb-service.h b/gdata/services/picasaweb/gdata-picasaweb-service.h
index 2d75815..0191edd 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-service.h
+++ b/gdata/services/picasaweb/gdata-picasaweb-service.h
@@ -70,31 +70,29 @@ GDataPicasaWebUser *gdata_picasaweb_service_get_user (GDataPicasaWebService *sel
                                                       GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 GDataFeed *gdata_picasaweb_service_query_all_albums (GDataPicasaWebService *self, GDataQuery *query, const gchar *username, GCancellable *cancellable,
-						     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						     GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                     GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_picasaweb_service_query_all_albums_async (GDataPicasaWebService *self, GDataQuery *query, const gchar *username, GCancellable *cancellable,
-						     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						     GAsyncReadyCallback callback, gpointer user_data);
+                                                     GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                     GAsyncReadyCallback callback, gpointer user_data);
 
 GDataFeed *gdata_picasaweb_service_query_files (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataQuery *query,
-						GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 #include <gdata/services/picasaweb/gdata-picasaweb-file.h>
 
 GDataPicasaWebFile *gdata_picasaweb_service_upload_file (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry,
-							 GFile *file_data,
-							 GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                         GFile *file_data,
+                                                         GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
-void
-gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry,
-					   GFile *file_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-GDataPicasaWebFile *
-gdata_picasaweb_service_upload_file_finish (GDataPicasaWebService *self, GAsyncResult *result, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+void gdata_picasaweb_service_upload_file_async (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GDataPicasaWebFile *file_entry,
+                                                GFile *file_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+GDataPicasaWebFile *gdata_picasaweb_service_upload_file_finish (GDataPicasaWebService *self, GAsyncResult *result,
+                                                                GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 GDataPicasaWebAlbum *gdata_picasaweb_service_insert_album (GDataPicasaWebService *self, GDataPicasaWebAlbum *album, GCancellable *cancellable,
-							   GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
-
+                                                           GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 G_END_DECLS
 
diff --git a/gdata/services/picasaweb/gdata-picasaweb-user.c b/gdata/services/picasaweb/gdata-picasaweb-user.c
index e3e06bb..48e457d 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-user.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-user.c
@@ -85,10 +85,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass)
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_USER,
-					 g_param_spec_string ("user",
-							      "User", "The username of the user.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("user",
+	                                                      "User", "The username of the user.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebUser:nickname:
@@ -99,10 +99,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass)
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NICKNAME,
-					 g_param_spec_string ("nickname",
-							      "Nickname", "The user's nickname.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("nickname",
+	                                                      "Nickname", "The user's nickname.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebUser:quota-limit:
@@ -113,10 +113,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass)
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_QUOTA_LIMIT,
-					 g_param_spec_int64 ("quota-limit",
-							     "Quota Limit", "The total amount of space, in bytes, available to the user.",
-							     -1, G_MAXINT64, -1,
-							     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_int64 ("quota-limit",
+	                                                     "Quota Limit", "The total amount of space, in bytes, available to the user.",
+	                                                     -1, G_MAXINT64, -1,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebUser:quota-current:
@@ -127,10 +127,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass)
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_QUOTA_CURRENT,
-					 g_param_spec_int64 ("quota-current",
-							     "Quota Current", "The current amount of space, in bytes, already used by the user.",
-							     -1, G_MAXINT64, -1,
-							     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_int64 ("quota-current",
+	                                                     "Quota Current", "The current amount of space, in bytes, already used by the user.",
+	                                                     -1, G_MAXINT64, -1,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebUser:max-photos-per-album:
@@ -141,10 +141,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass)
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MAX_PHOTOS_PER_ALBUM,
-					 g_param_spec_int ("max-photos-per-album",
-							   "Max Photos Per Album", "The maximum number of photos allowed in an album.",
-							   -1, G_MAXINT, -1,
-							   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_int ("max-photos-per-album",
+	                                                   "Max Photos Per Album", "The maximum number of photos allowed in an album.",
+	                                                   -1, G_MAXINT, -1,
+	                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataPicasaWebUser:thumbnail-uri:
@@ -155,10 +155,10 @@ gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass)
 	 * Since: 0.6.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_THUMBNAIL_URI,
-					 g_param_spec_string ("thumbnail-uri",
-							      "Thumbnail URI", "The URI of a thumbnail-sized portrait of the user.",
-							      NULL,
-							      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("thumbnail-uri",
+	                                                      "Thumbnail URI", "The URI of a thumbnail-sized portrait of the user.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/services/youtube/gdata-youtube-content.c b/gdata/services/youtube/gdata-youtube-content.c
index 4e8cce7..9480092 100644
--- a/gdata/services/youtube/gdata-youtube-content.c
+++ b/gdata/services/youtube/gdata-youtube-content.c
@@ -77,10 +77,10 @@ gdata_youtube_content_class_init (GDataYouTubeContentClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FORMAT,
-				g_param_spec_enum ("format",
-					"Format", "The video format of the video object.",
-					GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_UNKNOWN,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("format",
+	                                                    "Format", "The video format of the video object.",
+	                                                    GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_UNKNOWN,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/services/youtube/gdata-youtube-control.c b/gdata/services/youtube/gdata-youtube-control.c
index 69ced11..cbe1e4a 100644
--- a/gdata/services/youtube/gdata-youtube-control.c
+++ b/gdata/services/youtube/gdata-youtube-control.c
@@ -25,8 +25,8 @@
  *
  * #GDataYouTubeControl represents a "control" element from the
  * <ulink type="http" url="http://www.atomenabled.org/developers/protocol/#appControl";>Atom Publishing Protocol specification</ulink>,
- * with support for the YouTube-specific <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>
- * "state" element</ulink>.
+ * with support for the YouTube-specific
+ * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>"state" element</ulink>.
  *
  * It is private API, since it would be unnecessary and confusing to expose #GDataYouTubeControl itself. There is the option
  * of breaking this up into #GDataAPPControl and extending #GDataYouTubeControl classes in the future, if more entry types implement
diff --git a/gdata/services/youtube/gdata-youtube-credit.c b/gdata/services/youtube/gdata-youtube-credit.c
index 361381a..3e47563 100644
--- a/gdata/services/youtube/gdata-youtube-credit.c
+++ b/gdata/services/youtube/gdata-youtube-credit.c
@@ -80,10 +80,10 @@ gdata_youtube_credit_class_init (GDataYouTubeCreditClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ENTITY_TYPE,
-				g_param_spec_string ("entity-type",
-					"Entity type", "The type of entity who is credited.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("entity-type",
+	                                                      "Entity type", "The type of entity who is credited.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/services/youtube/gdata-youtube-group.c b/gdata/services/youtube/gdata-youtube-group.c
index cb8997e..5dc468f 100644
--- a/gdata/services/youtube/gdata-youtube-group.c
+++ b/gdata/services/youtube/gdata-youtube-group.c
@@ -102,7 +102,8 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 		if (gdata_parser_string_from_element (node, "videoid", P_NO_DUPES, &(self->priv->video_id), &success, error) == TRUE ||
 		    gdata_parser_string_from_element (node, "aspectRatio", P_REQUIRED | P_NO_DUPES,
 		                                      &(self->priv->aspect_ratio), &success, error) == TRUE ||
-		    gdata_parser_time_val_from_element (node, "uploaded", P_REQUIRED | P_NO_DUPES, &(self->priv->uploaded), &success, error) == TRUE) {
+		    gdata_parser_time_val_from_element (node, "uploaded", P_REQUIRED | P_NO_DUPES,
+		                                        &(self->priv->uploaded), &success, error) == TRUE) {
 			return success;
 		} else if (xmlStrcmp (node->name, (xmlChar*) "duration") == 0) {
 			/* yt:duration */
diff --git a/gdata/services/youtube/gdata-youtube-group.h b/gdata/services/youtube/gdata-youtube-group.h
index 759b6f1..f4f1367 100644
--- a/gdata/services/youtube/gdata-youtube-group.h
+++ b/gdata/services/youtube/gdata-youtube-group.h
@@ -30,10 +30,10 @@
 G_BEGIN_DECLS
 
 #define GDATA_TYPE_YOUTUBE_GROUP		(gdata_youtube_group_get_type ())
-#define GDATA_YOUTUBE_GROUP(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroup))
+#define GDATA_YOUTUBE_GROUP(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroup))
 #define GDATA_YOUTUBE_GROUP_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroupClass))
 #define GDATA_IS_YOUTUBE_GROUP(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_YOUTUBE_GROUP))
-#define GDATA_IS_YOUTUBE_GROUP_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_YOUTUBE_GROUP))
+#define GDATA_IS_YOUTUBE_GROUP_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_YOUTUBE_GROUP))
 #define GDATA_YOUTUBE_GROUP_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroupClass))
 
 typedef struct _GDataYouTubeGroupPrivate	GDataYouTubeGroupPrivate;
diff --git a/gdata/services/youtube/gdata-youtube-query.c b/gdata/services/youtube/gdata-youtube-query.c
index 5b5bcda..3139e42 100644
--- a/gdata/services/youtube/gdata-youtube-query.c
+++ b/gdata/services/youtube/gdata-youtube-query.c
@@ -101,10 +101,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FORMAT,
-				g_param_spec_enum ("format",
-					"Format", "Specifies that videos must be available in a particular video format.",
-					GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_UNKNOWN,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("format",
+	                                                    "Format", "Specifies that videos must be available in a particular video format.",
+	                                                    GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_UNKNOWN,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:latitude:
@@ -127,10 +127,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LATITUDE,
-				g_param_spec_double ("latitude",
-					"Latitude", "The latitude of a particular location of which videos should be found.",
-					-G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("latitude",
+	                                                      "Latitude", "The latitude of a particular location of which videos should be found.",
+	                                                      -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:longitude:
@@ -145,10 +145,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LONGITUDE,
-				g_param_spec_double ("longitude",
-					"Longitude", "The longitude of a particular location of which videos should be found.",
-					-G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("longitude",
+	                                                      "Longitude", "The longitude of a particular location of which videos should be found.",
+	                                                      -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:location-radius:
@@ -163,10 +163,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LOCATION_RADIUS,
-				g_param_spec_double ("location-radius",
-					"Location radius", "The radius, in metres, of a circle from within which videos should be returned.",
-					0.0, G_MAXDOUBLE, 0.0,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("location-radius",
+	                                                      "Location radius", "The radius, in metres, of a circle to search within.",
+	                                                      0.0, G_MAXDOUBLE, 0.0,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:has-location:
@@ -181,10 +181,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_HAS_LOCATION,
-				g_param_spec_boolean ("has-location",
-					"Has location?", "Whether to restrict search results to videos with specific coordinates associated with them.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("has-location",
+	                                                       "Has location?", "Whether to restrict results to videos with specific coordinates.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:language:
@@ -199,10 +199,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LANGUAGE,
-				g_param_spec_string ("language",
-					"Language", "Restricts the search to videos that have a title, description or keywords in a specified language.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("language",
+	                                                      "Language", "Restricts the search to videos described in the given language.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:order-by:
@@ -220,10 +220,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ORDER_BY,
-				g_param_spec_string ("order-by",
-					"Order by", "Specifies the order of entries in a feed.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("order-by",
+	                                                      "Order by", "Specifies the order of entries in a feed.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:restriction:
@@ -238,10 +238,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RESTRICTION,
-				g_param_spec_string ("restriction",
-					"Restriction", "The IP address that should be used to filter videos playable only in specific countries.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("restriction",
+	                                                      "Restriction", "The IP address to filter videos playable only in specific countries.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:safe-search:
@@ -254,10 +254,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SAFE_SEARCH,
-				g_param_spec_enum ("safe-search",
-					"Safe search", "Whether the search results should include restricted content as well as standard content.",
-					GDATA_TYPE_YOUTUBE_SAFE_SEARCH, GDATA_YOUTUBE_SAFE_SEARCH_MODERATE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("safe-search",
+	                                                    "Safe search", "Whether the search results should include restricted content.",
+	                                                    GDATA_TYPE_YOUTUBE_SAFE_SEARCH, GDATA_YOUTUBE_SAFE_SEARCH_MODERATE,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:sort-order:
@@ -267,10 +267,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_SORT_ORDER,
-				g_param_spec_enum ("sort-order",
-					"Sort order", "Specifies the direction of sorting.",
-					GDATA_TYPE_YOUTUBE_SORT_ORDER, GDATA_YOUTUBE_SORT_NONE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("sort-order",
+	                                                    "Sort order", "Specifies the direction of sorting.",
+	                                                    GDATA_TYPE_YOUTUBE_SORT_ORDER, GDATA_YOUTUBE_SORT_NONE,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:age:
@@ -281,10 +281,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_AGE,
-				g_param_spec_enum ("age",
-					"Age", "Restricts the search to videos uploaded within the specified time period.",
-					GDATA_TYPE_YOUTUBE_AGE, GDATA_YOUTUBE_AGE_ALL_TIME,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("age",
+	                                                    "Age", "Restricts the search to videos uploaded within the specified time period.",
+	                                                    GDATA_TYPE_YOUTUBE_AGE, GDATA_YOUTUBE_AGE_ALL_TIME,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeQuery:uploader:
@@ -295,10 +295,10 @@ gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_UPLOADER,
-				g_param_spec_enum ("uploader",
-					"Uploader", "Restricts the search to videos from the specified type of uploader.",
-					GDATA_TYPE_YOUTUBE_UPLOADER, GDATA_YOUTUBE_UPLOADER_ALL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_enum ("uploader",
+	                                                    "Uploader", "Restricts the search to videos from the specified type of uploader.",
+	                                                    GDATA_TYPE_YOUTUBE_UPLOADER, GDATA_YOUTUBE_UPLOADER_ALL,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -469,8 +469,8 @@ get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboo
 		gchar latitude[G_ASCII_DTOSTR_BUF_SIZE], longitude[G_ASCII_DTOSTR_BUF_SIZE];
 
 		g_string_append_printf (query_uri, (priv->has_location == TRUE) ? "&location=%s,%s!" : "&location=%s,%s",
-					g_ascii_dtostr (latitude, sizeof (latitude), priv->latitude),
-					g_ascii_dtostr (longitude, sizeof (longitude), priv->longitude));
+		                        g_ascii_dtostr (latitude, sizeof (latitude), priv->latitude),
+		                        g_ascii_dtostr (longitude, sizeof (longitude), priv->longitude));
 
 		if (priv->location_radius >= 0.0) {
 			gchar radius[G_ASCII_DTOSTR_BUF_SIZE];
diff --git a/gdata/services/youtube/gdata-youtube-service.c b/gdata/services/youtube/gdata-youtube-service.c
index 74975d8..7034f46 100644
--- a/gdata/services/youtube/gdata-youtube-service.c
+++ b/gdata/services/youtube/gdata-youtube-service.c
@@ -98,10 +98,10 @@ gdata_youtube_service_class_init (GDataYouTubeServiceClass *klass)
 	 * The matching #GDataService:client-id property belongs to #GDataService.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DEVELOPER_KEY,
-				g_param_spec_string ("developer-key",
-					"Developer key", "Your YouTube developer API key.",
-					NULL,
-					G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("developer-key",
+	                                                      "Developer key", "Your YouTube developer API key.",
+	                                                      NULL,
+	                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeService:youtube-user:
@@ -110,10 +110,10 @@ gdata_youtube_service_class_init (GDataYouTubeServiceClass *klass)
 	 * YouTube was converted to use Google's centralised login system.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_YOUTUBE_USER,
-				g_param_spec_string ("youtube-user",
-					"YouTube username", "The YouTube account username.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("youtube-user",
+	                                                      "YouTube username", "The YouTube account username.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -177,7 +177,7 @@ parse_authentication_response (GDataService *self, guint status, const gchar *re
 
 	/* Chain up to the parent method first */
 	if (GDATA_SERVICE_CLASS (gdata_youtube_service_parent_class)->parse_authentication_response (self, status,
-												     response_body, length, error) == FALSE) {
+		                                                                                     response_body, length, error) == FALSE) {
 		return FALSE;
 	}
 
@@ -199,7 +199,7 @@ parse_authentication_response (GDataService *self, guint status, const gchar *re
 
 protocol_error:
 	g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-			     _("The server returned a malformed response."));
+	                     _("The server returned a malformed response."));
 	return FALSE;
 }
 
@@ -300,34 +300,34 @@ parse_error_response (GDataService *self, GDataOperationType operation_type, gui
 			if (xmlStrcmp (domain, (xmlChar*) "yt:service") == 0 && xmlStrcmp (code, (xmlChar*) "disabled_in_maintenance_mode") == 0) {
 				/* Service disabled */
 				g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_UNAVAILABLE,
-					     _("This service is not available at the moment."));
+				             _("This service is not available at the moment."));
 			} else if (xmlStrcmp (domain, (xmlChar*) "yt:authentication") == 0) {
 				/* Authentication problem; make sure to set our status as unauthenticated */
 				_gdata_service_set_authenticated (GDATA_SERVICE (self), FALSE);
 				g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_AUTHENTICATION_REQUIRED,
-					     _("You must be authenticated to do this."));
+				             _("You must be authenticated to do this."));
 			} else if (xmlStrcmp (domain, (xmlChar*) "yt:quota") == 0) {
 				/* Quota errors */
 				if (xmlStrcmp (code, (xmlChar*) "too_many_recent_calls") == 0) {
 					g_set_error (error, GDATA_YOUTUBE_SERVICE_ERROR, GDATA_YOUTUBE_SERVICE_ERROR_API_QUOTA_EXCEEDED,
-						     _("You have made too many API calls recently. Please wait a few minutes and try again."));
+					             _("You have made too many API calls recently. Please wait a few minutes and try again."));
 				} else if (xmlStrcmp (code, (xmlChar*) "too_many_entries") == 0) {
 					g_set_error (error, GDATA_YOUTUBE_SERVICE_ERROR, GDATA_YOUTUBE_SERVICE_ERROR_ENTRY_QUOTA_EXCEEDED,
-						     _("You have exceeded your entry quota. Please delete some entries and try again."));
+					             _("You have exceeded your entry quota. Please delete some entries and try again."));
 				} else {
 					/* Protocol error */
 					g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-						     /* Translators: the first parameter is an error code, which is a coded string. The second parameter
-						      * is an error domain, which is another coded string. The third parameter is the location of the
-						      * error, which is either a URI or an XPath. */
-						     _("Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."),
-						     code, domain, location);
+					             /* Translators: the first parameter is an error code, which is a coded string.
+					              * The second parameter is an error domain, which is another coded string.
+					              * The third parameter is the location of the error, which is either a URI or an XPath. */
+					             _("Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."),
+					             code, domain, location);
 				}
 			} else {
 				/* Unknown or validation (protocol) error */
 				g_set_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-					     _("Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."),
-					     code, domain, location);
+				             _("Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."),
+				             code, domain, location);
 			}
 		} else {
 			/* For all errors after the first, log the error in the terminal */
@@ -371,9 +371,9 @@ gdata_youtube_service_new (const gchar *developer_key, const gchar *client_id)
 	g_return_val_if_fail (client_id != NULL, NULL);
 
 	return g_object_new (GDATA_TYPE_YOUTUBE_SERVICE,
-			     "developer-key", developer_key,
-			     "client-id", client_id,
-			     NULL);
+	                     "developer-key", developer_key,
+	                     "client-id", client_id,
+	                     NULL);
 }
 
 static const gchar *
@@ -423,8 +423,8 @@ standard_feed_type_to_feed_uri (GDataYouTubeStandardFeedType feed_type)
  **/
 GDataFeed *
 gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTubeStandardFeedType feed_type, GDataQuery *query,
-					   GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					   GError **error)
+                                           GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                           GError **error)
 {
 	g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (self), NULL);
 	g_return_val_if_fail (query == NULL || GDATA_IS_QUERY (query), NULL);
@@ -433,7 +433,7 @@ gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTu
 
 	/* TODO: Support the "time" parameter, as well as category- and region-specific feeds */
 	return gdata_service_query (GDATA_SERVICE (self), standard_feed_type_to_feed_uri (feed_type), query,
-				    GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error);
+	                            GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error);
 }
 
 /**
@@ -457,8 +457,8 @@ gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTu
  **/
 void
 gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDataYouTubeStandardFeedType feed_type, GDataQuery *query,
-						 GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						 GAsyncReadyCallback callback, gpointer user_data)
+                                                 GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                 GAsyncReadyCallback callback, gpointer user_data)
 {
 	g_return_if_fail (GDATA_IS_YOUTUBE_SERVICE (self));
 	g_return_if_fail (query == NULL || GDATA_IS_QUERY (query));
@@ -466,7 +466,7 @@ gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDat
 	g_return_if_fail (callback != NULL);
 
 	gdata_service_query_async (GDATA_SERVICE (self), standard_feed_type_to_feed_uri (feed_type), query,
-				   GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data);
+	                           GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data);
 }
 
 /**
@@ -487,8 +487,8 @@ gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDat
  **/
 GDataFeed *
 gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query,
-				    GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-				    GError **error)
+                                    GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                    GError **error)
 {
 	g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (self), NULL);
 	g_return_val_if_fail (query == NULL || GDATA_IS_QUERY (query), NULL);
@@ -496,7 +496,7 @@ gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query
 	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
 	return gdata_service_query (GDATA_SERVICE (self), "http://gdata.youtube.com/feeds/api/videos";, query,
-				    GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error);
+	                            GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error);
 }
 
 /**
@@ -519,8 +519,8 @@ gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query
  **/
 void
 gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery *query,
-					  GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					  GAsyncReadyCallback callback, gpointer user_data)
+                                          GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                          GAsyncReadyCallback callback, gpointer user_data)
 {
 	g_return_if_fail (GDATA_IS_YOUTUBE_SERVICE (self));
 	g_return_if_fail (query == NULL || GDATA_IS_QUERY (query));
@@ -528,7 +528,7 @@ gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery
 	g_return_if_fail (callback != NULL);
 
 	gdata_service_query_async (GDATA_SERVICE (self), "http://gdata.youtube.com/feeds/api/videos";, query,
-				   GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data);
+	                           GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data);
 }
 
 /**
@@ -550,8 +550,8 @@ gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery
  **/
 GDataFeed *
 gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVideo *video, GDataQuery *query,
-				     GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-				     GError **error)
+                                     GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                     GError **error)
 {
 	GDataLink *related_link;
 
@@ -566,13 +566,13 @@ gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVide
 	if (related_link == NULL) {
 		/* Erroring out is probably the safest thing to do */
 		g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-				     _("The video did not have a related videos <link>."));
+		                     _("The video did not have a related videos <link>."));
 		return NULL;
 	}
 
 	/* Execute the query */
 	return gdata_service_query (GDATA_SERVICE (self), gdata_link_get_uri (related_link), query,
-				    GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error);
+	                            GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, error);
 }
 
 /**
@@ -596,8 +596,8 @@ gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVide
  **/
 void
 gdata_youtube_service_query_related_async (GDataYouTubeService *self, GDataYouTubeVideo *video, GDataQuery *query,
-					   GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					   GAsyncReadyCallback callback, gpointer user_data)
+                                           GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                           GAsyncReadyCallback callback, gpointer user_data)
 {
 	GDataLink *related_link;
 
@@ -612,13 +612,13 @@ gdata_youtube_service_query_related_async (GDataYouTubeService *self, GDataYouTu
 	if (related_link == NULL) {
 		/* Erroring out is probably the safest thing to do */
 		g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data,
-						     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
-						     _("The video did not have a related videos <link>."));
+		                                     GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR,
+		                                     _("The video did not have a related videos <link>."));
 		return;
 	}
 
 	gdata_service_query_async (GDATA_SERVICE (self), gdata_link_get_uri (related_link), query,
-				   GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data);
+	                           GDATA_TYPE_YOUTUBE_VIDEO, cancellable, progress_callback, progress_user_data, callback, user_data);
 }
 
 /**
diff --git a/gdata/services/youtube/gdata-youtube-service.h b/gdata/services/youtube/gdata-youtube-service.h
index c81ccca..4d5cf89 100644
--- a/gdata/services/youtube/gdata-youtube-service.h
+++ b/gdata/services/youtube/gdata-youtube-service.h
@@ -108,30 +108,30 @@ GQuark gdata_youtube_service_error_quark (void) G_GNUC_CONST;
 GDataYouTubeService *gdata_youtube_service_new (const gchar *developer_key, const gchar *client_id) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 GDataFeed *gdata_youtube_service_query_standard_feed (GDataYouTubeService *self, GDataYouTubeStandardFeedType feed_type, GDataQuery *query,
-						      GCancellable *cancellable,
-						      GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						      GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                      GCancellable *cancellable,
+                                                      GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                      GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_youtube_service_query_standard_feed_async (GDataYouTubeService *self, GDataYouTubeStandardFeedType feed_type, GDataQuery *query,
-						      GCancellable *cancellable,
-						      GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						      GAsyncReadyCallback callback, gpointer user_data);
+                                                      GCancellable *cancellable,
+                                                      GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                      GAsyncReadyCallback callback, gpointer user_data);
 
 GDataFeed *gdata_youtube_service_query_videos (GDataYouTubeService *self, GDataQuery *query,
-					       GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					       GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                               GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                               GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_youtube_service_query_videos_async (GDataYouTubeService *self, GDataQuery *query,
-					       GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-					       GAsyncReadyCallback callback, gpointer user_data);
+                                               GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                               GAsyncReadyCallback callback, gpointer user_data);
 
 GDataFeed *gdata_youtube_service_query_related (GDataYouTubeService *self, GDataYouTubeVideo *video, GDataQuery *query,
-						GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 void gdata_youtube_service_query_related_async (GDataYouTubeService *self, GDataYouTubeVideo *video, GDataQuery *query,
-						GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
-						GAsyncReadyCallback callback, gpointer user_data);
+                                                GCancellable *cancellable, GDataQueryProgressCallback progress_callback, gpointer progress_user_data,
+                                                GAsyncReadyCallback callback, gpointer user_data);
 
 GDataYouTubeVideo *gdata_youtube_service_upload_video (GDataYouTubeService *self, GDataYouTubeVideo *video, GFile *video_file,
-						       GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
+                                                       GCancellable *cancellable, GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
 
 const gchar *gdata_youtube_service_get_developer_key (GDataYouTubeService *self);
 const gchar *gdata_youtube_service_get_youtube_user (GDataYouTubeService *self);
diff --git a/gdata/services/youtube/gdata-youtube-state.c b/gdata/services/youtube/gdata-youtube-state.c
index a9290e0..6df4da5 100644
--- a/gdata/services/youtube/gdata-youtube-state.c
+++ b/gdata/services/youtube/gdata-youtube-state.c
@@ -80,32 +80,32 @@ gdata_youtube_state_class_init (GDataYouTubeStateClass *klass)
 	 *
 	 * The name of the status of the unpublished video. Valid values are: "processing", "restricted", "deleted", "rejected" and "failed".
 	 *
-	 * For more information, see the <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>
-	 * online documentation</ulink>.
+	 * For more information, see the
+	 * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>online documentation</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_NAME,
-				g_param_spec_string ("name",
-					"Name", "The name of the status of the unpublished video.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("name",
+	                                                      "Name", "The name of the status of the unpublished video.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeState:reason-code:
 	 *
 	 * The reason code explaining why the video failed to upload.
 	 *
-	 * For more information, see the <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>
-	 * online documentation</ulink>.
+	 * For more information, see the
+	 * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>online documentation</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_REASON_CODE,
-				g_param_spec_string ("reason-code",
-					"Reason code", "The reason code explaining why the video failed to upload.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("reason-code",
+	                                                      "Reason code", "The reason code explaining why the video failed to upload.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeState:help-uri:
@@ -113,32 +113,32 @@ gdata_youtube_state_class_init (GDataYouTubeStateClass *klass)
 	 * A URI for a YouTube Help Center page that may help the developer or the video owner to diagnose
 	 * the reason that an upload failed or was rejected.
 	 *
-	 * For more information, see the <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>
-	 * online documentation</ulink>.
+	 * For more information, see the
+	 * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>online documentation</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_HELP_URI,
-				g_param_spec_string ("help-uri",
-					"Help URI", "A URI for a YouTube Help Center page.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("help-uri",
+	                                                      "Help URI", "A URI for a YouTube Help Center page.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeState:message:
 	 *
 	 * A human-readable description of why the video failed to upload.
 	 *
-	 * For more information, see the <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>
-	 * online documentation</ulink>.
+	 * For more information, see the
+	 * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>online documentation</ulink>.
 	 *
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MESSAGE,
-				g_param_spec_string ("message",
-					"Message", "A human-readable description of why the video failed to upload.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("message",
+	                                                      "Message", "A human-readable description of why the video failed to upload.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/gdata/services/youtube/gdata-youtube-video.c b/gdata/services/youtube/gdata-youtube-video.c
index 36b1e99..80f3f77 100644
--- a/gdata/services/youtube/gdata-youtube-video.c
+++ b/gdata/services/youtube/gdata-youtube-video.c
@@ -166,24 +166,24 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:statistics";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VIEW_COUNT,
-				g_param_spec_uint ("view-count",
-					"View count", "The number of times the video has been viewed.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("view-count",
+	                                                    "View count", "The number of times the video has been viewed.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:favorite-count:
 	 *
-	 * The number of YouTube users who have added the video to their list of favorite videos.
+	 * The number of users who have added the video to their favorites.
 	 *
 	 * For more information, see the <ulink type="http"
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:statistics";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_FAVORITE_COUNT,
-				g_param_spec_uint ("favorite-count",
-					"Favorite count", "The number of YouTube users who have added the video to their list of favorite videos.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("favorite-count",
+	                                                    "Favorite count", "The number of users who have added the video to their favorites.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:location:
@@ -194,10 +194,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:location";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_LOCATION,
-				g_param_spec_string ("location",
-					"Location", "Descriptive text about the location where the video was taken.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("location",
+	                                                      "Location", "Descriptive text about the location where the video was taken.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:min-rating:
@@ -208,10 +208,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdRating";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MIN_RATING,
-				g_param_spec_uint ("min-rating",
-					"Minimum rating", "The minimum allowed rating for the video.",
-					0, G_MAXUINT, 1, /* defaults to 1 */
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("min-rating",
+	                                                    "Minimum rating", "The minimum allowed rating for the video.",
+	                                                    0, G_MAXUINT, 1, /* defaults to 1 */
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:max-rating:
@@ -222,10 +222,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdRating";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_MAX_RATING,
-				g_param_spec_uint ("max-rating",
-					"Maximum rating", "The maximum allowed rating for the video.",
-					0, G_MAXUINT, 5, /* defaults to 5 */
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("max-rating",
+	                                                    "Maximum rating", "The maximum allowed rating for the video.",
+	                                                    0, G_MAXUINT, 5, /* defaults to 5 */
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:rating-count:
@@ -236,10 +236,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdRating";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RATING_COUNT,
-				g_param_spec_uint ("rating-count",
-					"Rating count", "The number of times the video has been rated.",
-					0, G_MAXUINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("rating-count",
+	                                                    "Rating count", "The number of times the video has been rated.",
+	                                                    0, G_MAXUINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:average-rating:
@@ -250,10 +250,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/gdata/docs/2.0/elements.html#gdRating";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_AVERAGE_RATING,
-				g_param_spec_double ("average-rating",
-					"Average rating", "The average rating of the video, over all the ratings it's received.",
-					0.0, G_MAXDOUBLE, 0.0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_double ("average-rating",
+	                                                      "Average rating", "The average rating of the video.",
+	                                                      0.0, G_MAXDOUBLE, 0.0,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:keywords:
@@ -264,26 +264,24 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:keywords";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_KEYWORDS,
-				g_param_spec_boxed ("keywords",
-					"Keywords", "A NULL-terminated array of words associated with the video.",
-					G_TYPE_STRV,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("keywords",
+	                                                     "Keywords", "A NULL-terminated array of words associated with the video.",
+	                                                     G_TYPE_STRV,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:player-uri:
 	 *
-	 * Specifies a URI where the full-length video is available through a media player that runs inside a web browser
-	 * (i.e. the video's page on YouTube).
+	 * A URI for a browser-based media player for the full-length video (i.e. the video's page on YouTube).
 	 *
 	 * For more information, see the <ulink type="http"
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:player";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_PLAYER_URI,
-				g_param_spec_string ("player-uri",
-					"Player URI", "Specifies a URI where the full-length video is available through a media player"
-					"that runs inside a web browser.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("player-uri",
+	                                                      "Player URI", "A URI for a browser-based media player for the full-length video.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:category:
@@ -294,10 +292,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:category";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CATEGORY,
-				g_param_spec_object ("category",
-					"Category", "Specifies a genre or developer tag that describes the video.",
-					GDATA_TYPE_MEDIA_CATEGORY,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("category",
+	                                                      "Category", "Specifies a genre or developer tag that describes the video.",
+	                                                      GDATA_TYPE_MEDIA_CATEGORY,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:credit:
@@ -308,10 +306,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:credit";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_CREDIT,
-				g_param_spec_object ("credit",
-					"Credit", "Identifies the owner of the video.",
-					GDATA_TYPE_YOUTUBE_CREDIT,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("credit",
+	                                                      "Credit", "Identifies the owner of the video.",
+	                                                      GDATA_TYPE_YOUTUBE_CREDIT,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:description:
@@ -322,10 +320,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_media:description";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
-				g_param_spec_string ("description",
-					"Description", "A summary or description of the video.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("description",
+	                                                      "Description", "A summary or description of the video.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:duration:
@@ -336,10 +334,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:duration";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_DURATION,
-				g_param_spec_uint ("duration",
-					"Duration", "The duration of the video in seconds.",
-					0, G_MAXINT, 0,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_uint ("duration",
+	                                                    "Duration", "The duration of the video in seconds.",
+	                                                    0, G_MAXINT, 0,
+	                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:private:
@@ -350,10 +348,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:private";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_PRIVATE,
-				g_param_spec_boolean ("is-private",
-					"Private?", "Indicates whether the video is private.",
-					FALSE,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-private",
+	                                                       "Private?", "Indicates whether the video is private.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:uploaded:
@@ -364,10 +362,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:uploaded";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_UPLOADED,
-				g_param_spec_boxed ("uploaded",
-					"Uploaded", "Specifies the time the video was originally uploaded to YouTube.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("uploaded",
+	                                                     "Uploaded", "Specifies the time the video was originally uploaded to YouTube.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:video-id:
@@ -378,10 +376,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:videoid";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_VIDEO_ID,
-				g_param_spec_string ("video-id",
-					"Video ID", "Specifies a unique ID which YouTube uses to identify the video.",
-					NULL,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("video-id",
+	                                                      "Video ID", "Specifies a unique ID which YouTube uses to identify the video.",
+	                                                      NULL,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:is-draft:
@@ -392,9 +390,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_app:draft";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_IS_DRAFT,
-				g_param_spec_boolean ("is-draft",
-					"Draft?", "Indicates whether the video is in draft, or unpublished, status.",
-					FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boolean ("is-draft",
+	                                                       "Draft?", "Indicates whether the video is in draft, or unpublished, status.",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:state:
@@ -406,10 +405,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * url="http://code.google.com/apis/youtube/2.0/reference.html#youtube_data_api_tag_yt:state";>online documentation</ulink>.
 	 **/
 	g_object_class_install_property (gobject_class, PROP_STATE,
-				g_param_spec_object ("state",
-					"State", "Information describing the state of the video.",
-					GDATA_TYPE_YOUTUBE_STATE,
-					G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_object ("state",
+	                                                      "State", "Information describing the state of the video.",
+	                                                      GDATA_TYPE_YOUTUBE_STATE,
+	                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:recorded:
@@ -422,10 +421,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * Since: 0.3.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_RECORDED,
-				g_param_spec_boxed ("recorded",
-					"Recorded", "Specifies the time the video was originally recorded.",
-					GDATA_TYPE_G_TIME_VAL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_boxed ("recorded",
+	                                                     "Recorded", "Specifies the time the video was originally recorded.",
+	                                                     GDATA_TYPE_G_TIME_VAL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * GDataYouTubeVideo:aspect-ratio:
@@ -439,10 +438,10 @@ gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
 	 * Since: 0.4.0
 	 **/
 	g_object_class_install_property (gobject_class, PROP_ASPECT_RATIO,
-				g_param_spec_string ("aspect-ratio",
-					"Aspect Ratio", "The aspect ratio of the video.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	                                 g_param_spec_string ("aspect-ratio",
+	                                                      "Aspect Ratio", "The aspect ratio of the video.",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -618,7 +617,7 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 		return success;
 	} else if (gdata_parser_is_namespace (node, "http://www.w3.org/2007/app";) == TRUE &&
 	           gdata_parser_object_from_element (node, "control", P_REQUIRED | P_NO_DUPES, GDATA_TYPE_YOUTUBE_CONTROL,
-		                                     &(self->priv->youtube_control), &success, error) == TRUE) {
+	                                             &(self->priv->youtube_control), &success, error) == TRUE) {
 		return success;
 	} else if (gdata_parser_is_namespace (node, "http://gdata.youtube.com/schemas/2007";) == TRUE) {
 		if (gdata_parser_string_from_element (node, "location", P_NONE, &(self->priv->location), &success, error) == TRUE) {
@@ -641,7 +640,7 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 		} else if (xmlStrcmp (node->name, (xmlChar*) "noembed") == 0) {
 			/* yt:noembed */
 			/* Ignore this now; it's been superceded by yt:accessControl.
-			   See http://apiblog.youtube.com/2010/02/extended-access-controls-available-via.html */
+			 * See http://apiblog.youtube.com/2010/02/extended-access-controls-available-via.html */
 		} else if (xmlStrcmp (node->name, (xmlChar*) "accessControl") == 0) {
 			/* yt:accessControl */
 			xmlChar *action, *permission;
diff --git a/gdata/services/youtube/gdata-youtube-video.h b/gdata/services/youtube/gdata-youtube-video.h
index 587882a..ac1f8f8 100644
--- a/gdata/services/youtube/gdata-youtube-video.h
+++ b/gdata/services/youtube/gdata-youtube-video.h
@@ -105,7 +105,8 @@ G_BEGIN_DECLS
  *
  * Permissions for actions which can be set on a #GDataYouTubeVideo using gdata_youtube_video_set_access_control().
  *
- * The only actions which can have the %GDATA_YOUTUBE_PERMISSION_MODERATED permission are %GDATA_YOUTUBE_ACTION_RATE and %GDATA_YOUTUBE_ACTION_COMMENT.
+ * The only actions which can have the %GDATA_YOUTUBE_PERMISSION_MODERATED permission are
+ * %GDATA_YOUTUBE_ACTION_RATE and %GDATA_YOUTUBE_ACTION_COMMENT.
  *
  * Since: 0.7.0
  **/



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