[libgdata] [core] Removed unnecessary *_GET_PRIVATE macros everywhere

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [libgdata] [core] Removed unnecessary *_GET_PRIVATE macros everywhere
Date: Thu, 25 Mar 2010 12:54:38 +0000 (UTC)
commit 9b868119b6168dc1af26713a2be57f045db58482
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Mar 25 12:54:12 2010 +0000

    [core] Removed unnecessary *_GET_PRIVATE macros everywhere

 gdata/atom/gdata-author.c                          |    1 -
 gdata/atom/gdata-category.c                        |    1 -
 gdata/atom/gdata-generator.c                       |    1 -
 gdata/atom/gdata-link.c                            |    1 -
 gdata/exif/gdata-exif-tags.c                       |    1 -
 gdata/gd/gdata-gd-email-address.c                  |    1 -
 gdata/gd/gdata-gd-im-address.c                     |    1 -
 gdata/gd/gdata-gd-name.c                           |    1 -
 gdata/gd/gdata-gd-organization.c                   |    1 -
 gdata/gd/gdata-gd-phone-number.c                   |    1 -
 gdata/gd/gdata-gd-postal-address.c                 |    1 -
 gdata/gd/gdata-gd-reminder.c                       |    1 -
 gdata/gd/gdata-gd-when.c                           |    1 -
 gdata/gd/gdata-gd-where.c                          |    1 -
 gdata/gd/gdata-gd-who.c                            |    1 -
 gdata/gdata-access-rule.c                          |    5 ++---
 gdata/gdata-download-stream.c                      |    7 +++----
 gdata/gdata-entry.c                                |    5 ++---
 gdata/gdata-feed.c                                 |    1 -
 gdata/gdata-parsable.c                             |    3 +--
 gdata/gdata-query.c                                |    5 ++---
 gdata/gdata-service.c                              |    9 ++++-----
 gdata/gdata-upload-stream.c                        |    7 +++----
 gdata/georss/gdata-georss-where.c                  |    1 -
 gdata/media/gdata-media-category.c                 |    1 -
 gdata/media/gdata-media-content.c                  |    1 -
 gdata/media/gdata-media-credit.c                   |    1 -
 gdata/media/gdata-media-group.c                    |    1 -
 gdata/media/gdata-media-thumbnail.c                |    1 -
 gdata/services/calendar/gdata-calendar-calendar.c  |    5 ++---
 gdata/services/calendar/gdata-calendar-event.c     |    3 +--
 gdata/services/calendar/gdata-calendar-feed.c      |    5 ++---
 gdata/services/calendar/gdata-calendar-query.c     |    5 ++---
 gdata/services/calendar/gdata-calendar-service.c   |    1 -
 gdata/services/contacts/gdata-contacts-contact.c   |    3 +--
 gdata/services/contacts/gdata-contacts-query.c     |    5 ++---
 gdata/services/contacts/gdata-contacts-service.c   |    1 -
 gdata/services/documents/gdata-documents-entry.c   |    7 +++----
 gdata/services/documents/gdata-documents-feed.c    |    1 -
 gdata/services/documents/gdata-documents-folder.c  |    1 -
 .../documents/gdata-documents-presentation.c       |    1 -
 gdata/services/documents/gdata-documents-query.c   |    5 ++---
 gdata/services/documents/gdata-documents-service.c |    7 +++----
 .../documents/gdata-documents-spreadsheet.c        |    1 -
 gdata/services/documents/gdata-documents-text.c    |    1 -
 gdata/services/picasaweb/gdata-picasaweb-album.c   |    7 +++----
 gdata/services/picasaweb/gdata-picasaweb-file.c    |    7 +++----
 gdata/services/picasaweb/gdata-picasaweb-query.c   |    5 ++---
 gdata/services/picasaweb/gdata-picasaweb-user.c    |    5 ++---
 gdata/services/youtube/gdata-youtube-content.c     |    1 -
 gdata/services/youtube/gdata-youtube-control.c     |    1 -
 gdata/services/youtube/gdata-youtube-credit.c      |    1 -
 gdata/services/youtube/gdata-youtube-group.c       |    1 -
 gdata/services/youtube/gdata-youtube-query.c       |    5 ++---
 gdata/services/youtube/gdata-youtube-service.c     |    7 +++----
 gdata/services/youtube/gdata-youtube-state.c       |    1 -
 gdata/services/youtube/gdata-youtube-video.c       |    1 -
 57 files changed, 50 insertions(+), 107 deletions(-)
---
diff --git a/gdata/atom/gdata-author.c b/gdata/atom/gdata-author.c
index f88f6f5..d726cfb 100644
--- a/gdata/atom/gdata-author.c
+++ b/gdata/atom/gdata-author.c
@@ -56,7 +56,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataAuthor, gdata_author, GDATA_TYPE_PARSABLE)
-#define GDATA_AUTHOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_AUTHOR, GDataAuthorPrivate))
 
 static void
 gdata_author_class_init (GDataAuthorClass *klass)
diff --git a/gdata/atom/gdata-category.c b/gdata/atom/gdata-category.c
index 810d717..9aafef8 100644
--- a/gdata/atom/gdata-category.c
+++ b/gdata/atom/gdata-category.c
@@ -55,7 +55,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataCategory, gdata_category, GDATA_TYPE_PARSABLE)
-#define GDATA_CATEGORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CATEGORY, GDataCategoryPrivate))
 
 static void
 gdata_category_class_init (GDataCategoryClass *klass)
diff --git a/gdata/atom/gdata-generator.c b/gdata/atom/gdata-generator.c
index 86cbf1c..d02360e 100644
--- a/gdata/atom/gdata-generator.c
+++ b/gdata/atom/gdata-generator.c
@@ -52,7 +52,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGenerator, gdata_generator, GDATA_TYPE_PARSABLE)
-#define GDATA_GENERATOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GENERATOR, GDataGeneratorPrivate))
 
 static void
 gdata_generator_class_init (GDataGeneratorClass *klass)
diff --git a/gdata/atom/gdata-link.c b/gdata/atom/gdata-link.c
index 5e07400..222b18d 100644
--- a/gdata/atom/gdata-link.c
+++ b/gdata/atom/gdata-link.c
@@ -62,7 +62,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataLink, gdata_link, GDATA_TYPE_PARSABLE)
-#define GDATA_LINK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_LINK, GDataLinkPrivate))
 
 static void
 gdata_link_class_init (GDataLinkClass *klass)
diff --git a/gdata/exif/gdata-exif-tags.c b/gdata/exif/gdata-exif-tags.c
index 4139f6a..cbf0e8c 100644
--- a/gdata/exif/gdata-exif-tags.c
+++ b/gdata/exif/gdata-exif-tags.c
@@ -66,7 +66,6 @@ struct _GDataExifTagsPrivate {
 };
 
 G_DEFINE_TYPE (GDataExifTags, gdata_exif_tags, GDATA_TYPE_PARSABLE)
-#define GDATA_EXIF_TAGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_EXIF_TAGS, GDataExifTagsPrivate))
 
 static void
 gdata_exif_tags_class_init (GDataExifTagsClass *klass)
diff --git a/gdata/gd/gdata-gd-email-address.c b/gdata/gd/gdata-gd-email-address.c
index 893dae4..8895c28 100644
--- a/gdata/gd/gdata-gd-email-address.c
+++ b/gdata/gd/gdata-gd-email-address.c
@@ -60,7 +60,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDEmailAddress, gdata_gd_email_address, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_EMAIL_ADDRESS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_EMAIL_ADDRESS, GDataGDEmailAddressPrivate))
 
 static void
 gdata_gd_email_address_class_init (GDataGDEmailAddressClass *klass)
diff --git a/gdata/gd/gdata-gd-im-address.c b/gdata/gd/gdata-gd-im-address.c
index 09856fc..3bdf18f 100644
--- a/gdata/gd/gdata-gd-im-address.c
+++ b/gdata/gd/gdata-gd-im-address.c
@@ -60,7 +60,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDIMAddress, gdata_gd_im_address, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_IM_ADDRESS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_IM_ADDRESS, GDataGDIMAddressPrivate))
 
 static void
 gdata_gd_im_address_class_init (GDataGDIMAddressClass *klass)
diff --git a/gdata/gd/gdata-gd-name.c b/gdata/gd/gdata-gd-name.c
index ddf843b..57cc5fb 100644
--- a/gdata/gd/gdata-gd-name.c
+++ b/gdata/gd/gdata-gd-name.c
@@ -72,7 +72,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDName, gdata_gd_name, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_NAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_NAME, GDataGDNamePrivate))
 
 static void
 gdata_gd_name_class_init (GDataGDNameClass *klass)
diff --git a/gdata/gd/gdata-gd-organization.c b/gdata/gd/gdata-gd-organization.c
index a23b7c9..130d4fe 100644
--- a/gdata/gd/gdata-gd-organization.c
+++ b/gdata/gd/gdata-gd-organization.c
@@ -73,7 +73,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDOrganization, gdata_gd_organization, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_ORGANIZATION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_ORGANIZATION, GDataGDOrganizationPrivate))
 
 static void
 gdata_gd_organization_class_init (GDataGDOrganizationClass *klass)
diff --git a/gdata/gd/gdata-gd-phone-number.c b/gdata/gd/gdata-gd-phone-number.c
index e7b1252..f4d3840 100644
--- a/gdata/gd/gdata-gd-phone-number.c
+++ b/gdata/gd/gdata-gd-phone-number.c
@@ -63,7 +63,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDPhoneNumber, gdata_gd_phone_number, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_PHONE_NUMBER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_PHONE_NUMBER, GDataGDPhoneNumberPrivate))
 
 static void
 gdata_gd_phone_number_class_init (GDataGDPhoneNumberClass *klass)
diff --git a/gdata/gd/gdata-gd-postal-address.c b/gdata/gd/gdata-gd-postal-address.c
index 98f2bc9..6923b58 100644
--- a/gdata/gd/gdata-gd-postal-address.c
+++ b/gdata/gd/gdata-gd-postal-address.c
@@ -88,7 +88,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDPostalAddress, gdata_gd_postal_address, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_POSTAL_ADDRESS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_POSTAL_ADDRESS, GDataGDPostalAddressPrivate))
 
 static void
 gdata_gd_postal_address_class_init (GDataGDPostalAddressClass *klass)
diff --git a/gdata/gd/gdata-gd-reminder.c b/gdata/gd/gdata-gd-reminder.c
index a5d0a23..daa7fce 100644
--- a/gdata/gd/gdata-gd-reminder.c
+++ b/gdata/gd/gdata-gd-reminder.c
@@ -58,7 +58,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDReminder, gdata_gd_reminder, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_REMINDER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_REMINDER, GDataGDReminderPrivate))
 
 static void
 gdata_gd_reminder_class_init (GDataGDReminderClass *klass)
diff --git a/gdata/gd/gdata-gd-when.c b/gdata/gd/gdata-gd-when.c
index 361dc2a..487592d 100644
--- a/gdata/gd/gdata-gd-when.c
+++ b/gdata/gd/gdata-gd-when.c
@@ -66,7 +66,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDWhen, gdata_gd_when, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_WHEN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_WHEN, GDataGDWhenPrivate))
 
 static void
 gdata_gd_when_class_init (GDataGDWhenClass *klass)
diff --git a/gdata/gd/gdata-gd-where.c b/gdata/gd/gdata-gd-where.c
index 995f7d2..ccf79eb 100644
--- a/gdata/gd/gdata-gd-where.c
+++ b/gdata/gd/gdata-gd-where.c
@@ -58,7 +58,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDWhere, gdata_gd_where, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_WHERE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_WHERE, GDataGDWherePrivate))
 
 static void
 gdata_gd_where_class_init (GDataGDWhereClass *klass)
diff --git a/gdata/gd/gdata-gd-who.c b/gdata/gd/gdata-gd-who.c
index 32b2948..3c6e200 100644
--- a/gdata/gd/gdata-gd-who.c
+++ b/gdata/gd/gdata-gd-who.c
@@ -58,7 +58,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataGDWho, gdata_gd_who, GDATA_TYPE_PARSABLE)
-#define GDATA_GD_WHO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GD_WHO, GDataGDWhoPrivate))
 
 static void
 gdata_gd_who_class_init (GDataGDWhoClass *klass)
diff --git a/gdata/gdata-access-rule.c b/gdata/gdata-access-rule.c
index 29f6ce3..06445fb 100644
--- a/gdata/gdata-access-rule.c
+++ b/gdata/gdata-access-rule.c
@@ -61,7 +61,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataAccessRule, gdata_access_rule, GDATA_TYPE_ENTRY)
-#define GDATA_ACCESS_RULE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_ACCESS_RULE, GDataAccessRulePrivate))
 
 static void
 gdata_access_rule_class_init (GDataAccessRuleClass *klass)
@@ -165,7 +164,7 @@ gdata_access_rule_set_property (GObject *object, guint property_id, const GValue
 static void
 gdata_access_rule_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataAccessRulePrivate *priv = GDATA_ACCESS_RULE_GET_PRIVATE (object);
+	GDataAccessRulePrivate *priv = GDATA_ACCESS_RULE (object)->priv;
 
 	switch (property_id) {
 		case PROP_ROLE:
@@ -193,7 +192,7 @@ gdata_access_rule_init (GDataAccessRule *self)
 static void
 gdata_access_rule_finalize (GObject *object)
 {
-	GDataAccessRulePrivate *priv = GDATA_ACCESS_RULE_GET_PRIVATE (object);
+	GDataAccessRulePrivate *priv = GDATA_ACCESS_RULE (object)->priv;
 
 	g_free (priv->role);
 	g_free (priv->scope_type); 
diff --git a/gdata/gdata-download-stream.c b/gdata/gdata-download-stream.c
index cc3c31c..377377d 100644
--- a/gdata/gdata-download-stream.c
+++ b/gdata/gdata-download-stream.c
@@ -85,7 +85,6 @@ 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))
-#define GDATA_DOWNLOAD_STREAM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOWNLOAD_STREAM, GDataDownloadStreamPrivate))
 
 static void
 gdata_download_stream_class_init (GDataDownloadStreamClass *klass)
@@ -180,7 +179,7 @@ gdata_download_stream_init (GDataDownloadStream *self)
 static void
 gdata_download_stream_dispose (GObject *object)
 {
-	GDataDownloadStreamPrivate *priv = GDATA_DOWNLOAD_STREAM_GET_PRIVATE (object);
+	GDataDownloadStreamPrivate *priv = GDATA_DOWNLOAD_STREAM (object)->priv;
 
 	if (priv->service != NULL)
 		g_object_unref (priv->service);
@@ -197,7 +196,7 @@ gdata_download_stream_dispose (GObject *object)
 static void
 gdata_download_stream_finalize (GObject *object)
 {
-	GDataDownloadStreamPrivate *priv = GDATA_DOWNLOAD_STREAM_GET_PRIVATE (object);
+	GDataDownloadStreamPrivate *priv = GDATA_DOWNLOAD_STREAM (object)->priv;
 
 	g_thread_join (priv->network_thread);
 	g_static_mutex_free (&(priv->content_mutex));
@@ -212,7 +211,7 @@ gdata_download_stream_finalize (GObject *object)
 static void
 gdata_download_stream_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataDownloadStreamPrivate *priv = GDATA_DOWNLOAD_STREAM_GET_PRIVATE (object);
+	GDataDownloadStreamPrivate *priv = GDATA_DOWNLOAD_STREAM (object)->priv;
 
 	switch (property_id) {
 		case PROP_SERVICE:
diff --git a/gdata/gdata-entry.c b/gdata/gdata-entry.c
index 7a8cbe6..c83dede 100644
--- a/gdata/gdata-entry.c
+++ b/gdata/gdata-entry.c
@@ -80,7 +80,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataEntry, gdata_entry, GDATA_TYPE_PARSABLE)
-#define GDATA_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_ENTRY, GDataEntryPrivate))
 
 static void
 gdata_entry_class_init (GDataEntryClass *klass)
@@ -270,7 +269,7 @@ gdata_entry_dispose (GObject *object)
 static void
 gdata_entry_finalize (GObject *object)
 {
-	GDataEntryPrivate *priv = GDATA_ENTRY_GET_PRIVATE (object);
+	GDataEntryPrivate *priv = GDATA_ENTRY (object)->priv;
 
 	g_free (priv->title);
 	g_free (priv->summary);
@@ -286,7 +285,7 @@ gdata_entry_finalize (GObject *object)
 static void
 gdata_entry_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataEntryPrivate *priv = GDATA_ENTRY_GET_PRIVATE (object);
+	GDataEntryPrivate *priv = GDATA_ENTRY (object)->priv;
 
 	switch (property_id) {
 		case PROP_TITLE:
diff --git a/gdata/gdata-feed.c b/gdata/gdata-feed.c
index b2ac68c..3766a73 100644
--- a/gdata/gdata-feed.c
+++ b/gdata/gdata-feed.c
@@ -88,7 +88,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataFeed, gdata_feed, GDATA_TYPE_PARSABLE)
-#define GDATA_FEED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_FEED, GDataFeedPrivate))
 
 static void
 gdata_feed_class_init (GDataFeedClass *klass)
diff --git a/gdata/gdata-parsable.c b/gdata/gdata-parsable.c
index 008e57d..ef7e45c 100644
--- a/gdata/gdata-parsable.c
+++ b/gdata/gdata-parsable.c
@@ -56,7 +56,6 @@ struct _GDataParsablePrivate {
 };
 
 G_DEFINE_ABSTRACT_TYPE (GDataParsable, gdata_parsable, G_TYPE_OBJECT)
-#define GDATA_PARSABLE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_PARSABLE, GDataParsablePrivate))
 
 static void
 gdata_parsable_class_init (GDataParsableClass *klass)
@@ -79,7 +78,7 @@ gdata_parsable_init (GDataParsable *self)
 static void
 gdata_parsable_finalize (GObject *object)
 {
-	GDataParsablePrivate *priv = GDATA_PARSABLE_GET_PRIVATE (object);
+	GDataParsablePrivate *priv = GDATA_PARSABLE (object)->priv;
 
 	g_string_free (priv->extra_xml, TRUE);
 	g_hash_table_destroy (priv->extra_namespaces);
diff --git a/gdata/gdata-query.c b/gdata/gdata-query.c
index 3df1389..65219f4 100644
--- a/gdata/gdata-query.c
+++ b/gdata/gdata-query.c
@@ -108,7 +108,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataQuery, gdata_query, G_TYPE_OBJECT)
-#define GDATA_QUERY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_QUERY, GDataQueryPrivate))
 
 static void
 gdata_query_class_init (GDataQueryClass *klass)
@@ -311,7 +310,7 @@ gdata_query_init (GDataQuery *self)
 static void
 gdata_query_finalize (GObject *object)
 {
-	GDataQueryPrivate *priv = GDATA_QUERY_GET_PRIVATE (object);
+	GDataQueryPrivate *priv = GDATA_QUERY (object)->priv;
 
 	g_free (priv->q);
 	g_free (priv->categories);
@@ -330,7 +329,7 @@ gdata_query_finalize (GObject *object)
 static void
 gdata_query_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataQueryPrivate *priv = GDATA_QUERY_GET_PRIVATE (object);
+	GDataQueryPrivate *priv = GDATA_QUERY (object)->priv;
 
 	switch (property_id) {
 		case PROP_Q:
diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
index b5e90c5..8f2091e 100644
--- a/gdata/gdata-service.c
+++ b/gdata/gdata-service.c
@@ -96,7 +96,6 @@ enum {
 static guint service_signals[LAST_SIGNAL] = { 0, };
 
 G_DEFINE_TYPE (GDataService, gdata_service, G_TYPE_OBJECT)
-#define GDATA_SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_SERVICE, GDataServicePrivate))
 
 static void
 gdata_service_class_init (GDataServiceClass *klass)
@@ -241,7 +240,7 @@ gdata_service_init (GDataService *self)
 static void
 gdata_service_dispose (GObject *object)
 {
-	GDataServicePrivate *priv = GDATA_SERVICE_GET_PRIVATE (object);
+	GDataServicePrivate *priv = GDATA_SERVICE (object)->priv;
 
 	if (priv->session != NULL)
 		g_object_unref (priv->session);
@@ -254,7 +253,7 @@ gdata_service_dispose (GObject *object)
 static void
 gdata_service_finalize (GObject *object)
 {
-	GDataServicePrivate *priv = GDATA_SERVICE_GET_PRIVATE (object);
+	GDataServicePrivate *priv = GDATA_SERVICE (object)->priv;
 
 	g_free (priv->username);
 	g_free (priv->password);
@@ -268,7 +267,7 @@ gdata_service_finalize (GObject *object)
 static void
 gdata_service_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataServicePrivate *priv = GDATA_SERVICE_GET_PRIVATE (object);
+	GDataServicePrivate *priv = GDATA_SERVICE (object)->priv;
 
 	switch (property_id) {
 		case PROP_CLIENT_ID:
@@ -296,7 +295,7 @@ gdata_service_get_property (GObject *object, guint property_id, GValue *value, G
 static void
 gdata_service_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-	GDataServicePrivate *priv = GDATA_SERVICE_GET_PRIVATE (object);
+	GDataServicePrivate *priv = GDATA_SERVICE (object)->priv;
 
 	switch (property_id) {
 		case PROP_CLIENT_ID:
diff --git a/gdata/gdata-upload-stream.c b/gdata/gdata-upload-stream.c
index dd1e141..b65abaf 100644
--- a/gdata/gdata-upload-stream.c
+++ b/gdata/gdata-upload-stream.c
@@ -108,7 +108,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataUploadStream, gdata_upload_stream, G_TYPE_OUTPUT_STREAM)
-#define GDATA_UPLOAD_STREAM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_UPLOAD_STREAM, GDataUploadStreamPrivate))
 
 static void
 gdata_upload_stream_class_init (GDataUploadStreamClass *klass)
@@ -208,7 +207,7 @@ gdata_upload_stream_init (GDataUploadStream *self)
 static void
 gdata_upload_stream_dispose (GObject *object)
 {
-	GDataUploadStreamPrivate *priv = GDATA_UPLOAD_STREAM_GET_PRIVATE (object);
+	GDataUploadStreamPrivate *priv = GDATA_UPLOAD_STREAM (object)->priv;
 
 	/* Close the stream before unreffing things like priv->service, which stops crashes like bgo#602156 if the stream is unreffed in the middle
 	 * of network operations */
@@ -234,7 +233,7 @@ gdata_upload_stream_dispose (GObject *object)
 static void
 gdata_upload_stream_finalize (GObject *object)
 {
-	GDataUploadStreamPrivate *priv = GDATA_UPLOAD_STREAM_GET_PRIVATE (object);
+	GDataUploadStreamPrivate *priv = GDATA_UPLOAD_STREAM (object)->priv;
 
 	g_thread_join (priv->network_thread);
 	g_static_mutex_free (&(priv->response_mutex));
@@ -253,7 +252,7 @@ gdata_upload_stream_finalize (GObject *object)
 static void
 gdata_upload_stream_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataUploadStreamPrivate *priv = GDATA_UPLOAD_STREAM_GET_PRIVATE (object);
+	GDataUploadStreamPrivate *priv = GDATA_UPLOAD_STREAM (object)->priv;
 
 	switch (property_id) {
 		case PROP_SERVICE:
diff --git a/gdata/georss/gdata-georss-where.c b/gdata/georss/gdata-georss-where.c
index b6ed56e..15593ec 100644
--- a/gdata/georss/gdata-georss-where.c
+++ b/gdata/georss/gdata-georss-where.c
@@ -55,7 +55,6 @@ struct _GDataGeoRSSWherePrivate {
 };
 
 G_DEFINE_TYPE (GDataGeoRSSWhere, gdata_georss_where, GDATA_TYPE_PARSABLE)
-#define GDATA_GEORSS_WHERE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_GEORSS_WHERE, GDataGeoRSSWherePrivate))
 
 static void
 gdata_georss_where_class_init (GDataGeoRSSWhereClass *klass)
diff --git a/gdata/media/gdata-media-category.c b/gdata/media/gdata-media-category.c
index 6302714..72cf956 100644
--- a/gdata/media/gdata-media-category.c
+++ b/gdata/media/gdata-media-category.c
@@ -59,7 +59,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataMediaCategory, gdata_media_category, GDATA_TYPE_PARSABLE)
-#define GDATA_MEDIA_CATEGORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_MEDIA_CATEGORY, GDataMediaCategoryPrivate))
 
 static void
 gdata_media_category_class_init (GDataMediaCategoryClass *klass)
diff --git a/gdata/media/gdata-media-content.c b/gdata/media/gdata-media-content.c
index 0842b5b..53e3434 100644
--- a/gdata/media/gdata-media-content.c
+++ b/gdata/media/gdata-media-content.c
@@ -72,7 +72,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataMediaContent, gdata_media_content, GDATA_TYPE_PARSABLE)
-#define GDATA_MEDIA_CONTENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_MEDIA_CONTENT, GDataMediaContentPrivate))
 
 static void
 gdata_media_content_class_init (GDataMediaContentClass *klass)
diff --git a/gdata/media/gdata-media-credit.c b/gdata/media/gdata-media-credit.c
index 04b11c2..5784f8e 100644
--- a/gdata/media/gdata-media-credit.c
+++ b/gdata/media/gdata-media-credit.c
@@ -58,7 +58,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataMediaCredit, gdata_media_credit, GDATA_TYPE_PARSABLE)
-#define GDATA_MEDIA_CREDIT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_MEDIA_CREDIT, GDataMediaCreditPrivate))
 
 static void
 gdata_media_credit_class_init (GDataMediaCreditClass *klass)
diff --git a/gdata/media/gdata-media-group.c b/gdata/media/gdata-media-group.c
index b06e241..0f741ae 100644
--- a/gdata/media/gdata-media-group.c
+++ b/gdata/media/gdata-media-group.c
@@ -64,7 +64,6 @@ struct _GDataMediaGroupPrivate {
 };
 
 G_DEFINE_TYPE (GDataMediaGroup, gdata_media_group, GDATA_TYPE_PARSABLE)
-#define GDATA_MEDIA_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_MEDIA_GROUP, GDataMediaGroupPrivate))
 
 static void
 gdata_media_group_class_init (GDataMediaGroupClass *klass)
diff --git a/gdata/media/gdata-media-thumbnail.c b/gdata/media/gdata-media-thumbnail.c
index a091555..d1b5e1a 100644
--- a/gdata/media/gdata-media-thumbnail.c
+++ b/gdata/media/gdata-media-thumbnail.c
@@ -59,7 +59,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataMediaThumbnail, gdata_media_thumbnail, GDATA_TYPE_PARSABLE)
-#define GDATA_MEDIA_THUMBNAIL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_MEDIA_THUMBNAIL, GDataMediaThumbnailPrivate))
 
 static void
 gdata_media_thumbnail_class_init (GDataMediaThumbnailClass *klass)
diff --git a/gdata/services/calendar/gdata-calendar-calendar.c b/gdata/services/calendar/gdata-calendar-calendar.c
index 282eb60..b7ada7d 100644
--- a/gdata/services/calendar/gdata-calendar-calendar.c
+++ b/gdata/services/calendar/gdata-calendar-calendar.c
@@ -73,7 +73,6 @@ 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))
-#define GDATA_CALENDAR_CALENDAR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CALENDAR_CALENDAR, GDataCalendarCalendarPrivate))
 
 static void
 gdata_calendar_calendar_class_init (GDataCalendarCalendarClass *klass)
@@ -197,7 +196,7 @@ gdata_calendar_calendar_access_handler_init (GDataAccessHandlerIface *iface)
 static void
 gdata_calendar_calendar_finalize (GObject *object)
 {
-	GDataCalendarCalendarPrivate *priv = GDATA_CALENDAR_CALENDAR_GET_PRIVATE (object);
+	GDataCalendarCalendarPrivate *priv = GDATA_CALENDAR_CALENDAR (object)->priv;
 
 	g_free (priv->timezone);
 	g_free (priv->access_level);
@@ -209,7 +208,7 @@ gdata_calendar_calendar_finalize (GObject *object)
 static void
 gdata_calendar_calendar_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataCalendarCalendarPrivate *priv = GDATA_CALENDAR_CALENDAR_GET_PRIVATE (object);
+	GDataCalendarCalendarPrivate *priv = GDATA_CALENDAR_CALENDAR (object)->priv;
 
 	switch (property_id) {
 		case PROP_TIMEZONE:
diff --git a/gdata/services/calendar/gdata-calendar-event.c b/gdata/services/calendar/gdata-calendar-event.c
index eca717e..9a00a4c 100644
--- a/gdata/services/calendar/gdata-calendar-event.c
+++ b/gdata/services/calendar/gdata-calendar-event.c
@@ -86,7 +86,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataCalendarEvent, gdata_calendar_event, GDATA_TYPE_ENTRY)
-#define GDATA_CALENDAR_EVENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CALENDAR_EVENT, GDataCalendarEventPrivate))
 
 static void
 gdata_calendar_event_class_init (GDataCalendarEventClass *klass)
@@ -338,7 +337,7 @@ gdata_calendar_event_finalize (GObject *object)
 static void
 gdata_calendar_event_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataCalendarEventPrivate *priv = GDATA_CALENDAR_EVENT_GET_PRIVATE (object);
+	GDataCalendarEventPrivate *priv = GDATA_CALENDAR_EVENT (object)->priv;
 
 	switch (property_id) {
 		case PROP_EDITED:
diff --git a/gdata/services/calendar/gdata-calendar-feed.c b/gdata/services/calendar/gdata-calendar-feed.c
index 591a9a3..2e8b5de 100644
--- a/gdata/services/calendar/gdata-calendar-feed.c
+++ b/gdata/services/calendar/gdata-calendar-feed.c
@@ -49,7 +49,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataCalendarFeed, gdata_calendar_feed, GDATA_TYPE_FEED)
-#define GDATA_CALENDAR_FEED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CALENDAR_FEED, GDataCalendarFeedPrivate))
 
 static void
 gdata_calendar_feed_class_init (GDataCalendarFeedClass *klass)
@@ -100,7 +99,7 @@ gdata_calendar_feed_init (GDataCalendarFeed *self)
 static void
 gdata_calendar_feed_finalize (GObject *object)
 {
-	GDataCalendarFeedPrivate *priv = GDATA_CALENDAR_FEED_GET_PRIVATE (object);
+	GDataCalendarFeedPrivate *priv = GDATA_CALENDAR_FEED (object)->priv;
 
 	g_free (priv->timezone);
 
@@ -111,7 +110,7 @@ gdata_calendar_feed_finalize (GObject *object)
 static void
 gdata_calendar_feed_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataCalendarFeedPrivate *priv = GDATA_CALENDAR_FEED_GET_PRIVATE (object);
+	GDataCalendarFeedPrivate *priv = GDATA_CALENDAR_FEED (object)->priv;
 
 	switch (property_id) {
 		case PROP_TIMEZONE:
diff --git a/gdata/services/calendar/gdata-calendar-query.c b/gdata/services/calendar/gdata-calendar-query.c
index 9610e5b..6fa50a7 100644
--- a/gdata/services/calendar/gdata-calendar-query.c
+++ b/gdata/services/calendar/gdata-calendar-query.c
@@ -68,7 +68,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataCalendarQuery, gdata_calendar_query, GDATA_TYPE_QUERY)
-#define GDATA_CALENDAR_QUERY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CALENDAR_QUERY, GDataCalendarQueryPrivate))
 
 static void
 gdata_calendar_query_class_init (GDataCalendarQueryClass *klass)
@@ -209,7 +208,7 @@ gdata_calendar_query_init (GDataCalendarQuery *self)
 static void
 gdata_calendar_query_finalize (GObject *object)
 {
-	GDataCalendarQueryPrivate *priv = GDATA_CALENDAR_QUERY_GET_PRIVATE (object);
+	GDataCalendarQueryPrivate *priv = GDATA_CALENDAR_QUERY (object)->priv;
 
 	g_free (priv->order_by);
 	g_free (priv->sort_order);
@@ -222,7 +221,7 @@ gdata_calendar_query_finalize (GObject *object)
 static void
 gdata_calendar_query_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataCalendarQueryPrivate *priv = GDATA_CALENDAR_QUERY_GET_PRIVATE (object);
+	GDataCalendarQueryPrivate *priv = GDATA_CALENDAR_QUERY (object)->priv;
 
 	switch (property_id) {
 		case PROP_FUTURE_EVENTS:
diff --git a/gdata/services/calendar/gdata-calendar-service.c b/gdata/services/calendar/gdata-calendar-service.c
index ea296a8..240f087 100644
--- a/gdata/services/calendar/gdata-calendar-service.c
+++ b/gdata/services/calendar/gdata-calendar-service.c
@@ -45,7 +45,6 @@
 /* Standards reference here: http://code.google.com/apis/calendar/docs/2.0/reference.html */
 
 G_DEFINE_TYPE (GDataCalendarService, gdata_calendar_service, GDATA_TYPE_SERVICE)
-#define GDATA_CALENDAR_SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CALENDAR_SERVICE, GDataCalendarServicePrivate))
 
 static void
 gdata_calendar_service_class_init (GDataCalendarServiceClass *klass)
diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c
index 68d6259..fda55f2 100644
--- a/gdata/services/contacts/gdata-contacts-contact.c
+++ b/gdata/services/contacts/gdata-contacts-contact.c
@@ -78,7 +78,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataContactsContact, gdata_contacts_contact, GDATA_TYPE_ENTRY)
-#define GDATA_CONTACTS_CONTACT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CONTACTS_CONTACT, GDataContactsContactPrivate))
 
 static void
 gdata_contacts_contact_class_init (GDataContactsContactClass *klass)
@@ -230,7 +229,7 @@ gdata_contacts_contact_finalize (GObject *object)
 static void
 gdata_contacts_contact_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataContactsContactPrivate *priv = GDATA_CONTACTS_CONTACT_GET_PRIVATE (object);
+	GDataContactsContactPrivate *priv = GDATA_CONTACTS_CONTACT (object)->priv;
 
 	switch (property_id) {
 		case PROP_EDITED:
diff --git a/gdata/services/contacts/gdata-contacts-query.c b/gdata/services/contacts/gdata-contacts-query.c
index 6af5d8d..71558bc 100644
--- a/gdata/services/contacts/gdata-contacts-query.c
+++ b/gdata/services/contacts/gdata-contacts-query.c
@@ -60,7 +60,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataContactsQuery, gdata_contacts_query, GDATA_TYPE_QUERY)
-#define GDATA_CONTACTS_QUERY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CONTACTS_QUERY, GDataContactsQueryPrivate))
 
 static void
 gdata_contacts_query_class_init (GDataContactsQueryClass *klass)
@@ -141,7 +140,7 @@ gdata_contacts_query_init (GDataContactsQuery *self)
 static void
 gdata_contacts_query_finalize (GObject *object)
 {
-	GDataContactsQueryPrivate *priv = GDATA_CONTACTS_QUERY_GET_PRIVATE (object);
+	GDataContactsQueryPrivate *priv = GDATA_CONTACTS_QUERY (object)->priv;
 
 	g_free (priv->order_by);
 	g_free (priv->sort_order);
@@ -154,7 +153,7 @@ gdata_contacts_query_finalize (GObject *object)
 static void
 gdata_contacts_query_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataContactsQueryPrivate *priv = GDATA_CONTACTS_QUERY_GET_PRIVATE (object);
+	GDataContactsQueryPrivate *priv = GDATA_CONTACTS_QUERY (object)->priv;
 
 	switch (property_id) {
 		case PROP_ORDER_BY:
diff --git a/gdata/services/contacts/gdata-contacts-service.c b/gdata/services/contacts/gdata-contacts-service.c
index 56037a1..1ff414e 100644
--- a/gdata/services/contacts/gdata-contacts-service.c
+++ b/gdata/services/contacts/gdata-contacts-service.c
@@ -44,7 +44,6 @@
 #include "gdata-query.h"
 
 G_DEFINE_TYPE (GDataContactsService, gdata_contacts_service, GDATA_TYPE_SERVICE)
-#define GDATA_CONTACTS_SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_CONTACTS_SERVICE, GDataContactsServicePrivate))
 
 static void
 gdata_contacts_service_class_init (GDataContactsServiceClass *klass)
diff --git a/gdata/services/documents/gdata-documents-entry.c b/gdata/services/documents/gdata-documents-entry.c
index c62bf8a..0b6e0bf 100644
--- a/gdata/services/documents/gdata-documents-entry.c
+++ b/gdata/services/documents/gdata-documents-entry.c
@@ -74,7 +74,6 @@ 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))
-#define GDATA_DOCUMENTS_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOCUMENTS_ENTRY, GDataDocumentsEntryPrivate))
 
 static void
 gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass)
@@ -273,7 +272,7 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 static void
 gdata_documents_entry_finalize (GObject *object)
 {
-	GDataDocumentsEntryPrivate *priv = GDATA_DOCUMENTS_ENTRY_GET_PRIVATE (object);
+	GDataDocumentsEntryPrivate *priv = GDATA_DOCUMENTS_ENTRY (object)->priv;
 
 	g_free (priv->document_id);
 
@@ -284,7 +283,7 @@ gdata_documents_entry_finalize (GObject *object)
 static void
 gdata_entry_dispose (GObject *object)
 {
-	GDataDocumentsEntryPrivate *priv = GDATA_DOCUMENTS_ENTRY_GET_PRIVATE (object);
+	GDataDocumentsEntryPrivate *priv = GDATA_DOCUMENTS_ENTRY (object)->priv;
 
 	if (priv->last_modified_by != NULL)
 		g_object_unref (priv->last_modified_by);
@@ -297,7 +296,7 @@ gdata_entry_dispose (GObject *object)
 static void
 gdata_documents_entry_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataDocumentsEntryPrivate *priv = GDATA_DOCUMENTS_ENTRY_GET_PRIVATE (object);
+	GDataDocumentsEntryPrivate *priv = GDATA_DOCUMENTS_ENTRY (object)->priv;
 
 	switch (property_id) {
 		case PROP_DOCUMENT_ID:
diff --git a/gdata/services/documents/gdata-documents-feed.c b/gdata/services/documents/gdata-documents-feed.c
index cac9951..5969c23 100644
--- a/gdata/services/documents/gdata-documents-feed.c
+++ b/gdata/services/documents/gdata-documents-feed.c
@@ -52,7 +52,6 @@
 static gboolean parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *root_node, gpointer user_data, GError **error);
 
 G_DEFINE_TYPE (GDataDocumentsFeed, gdata_documents_feed, GDATA_TYPE_FEED)
-#define GDATA_DOCUMENTS_FEED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOCUMENTS_FEED, GDataDocumentsFeedPrivate))
 
 static void
 gdata_documents_feed_class_init (GDataDocumentsFeedClass *klass)
diff --git a/gdata/services/documents/gdata-documents-folder.c b/gdata/services/documents/gdata-documents-folder.c
index 377faf7..ce342c0 100644
--- a/gdata/services/documents/gdata-documents-folder.c
+++ b/gdata/services/documents/gdata-documents-folder.c
@@ -46,7 +46,6 @@
 static void get_xml (GDataParsable *parsable, GString *xml_string);
 
 G_DEFINE_TYPE (GDataDocumentsFolder, gdata_documents_folder, GDATA_TYPE_DOCUMENTS_ENTRY)
-#define GDATA_DOCUMENTS_FOLDER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOCUMENTS_ENTRY, GDataDocumentsEntryPrivate))
 
 static void
 gdata_documents_folder_class_init (GDataDocumentsFolderClass *klass)
diff --git a/gdata/services/documents/gdata-documents-presentation.c b/gdata/services/documents/gdata-documents-presentation.c
index a8b85cd..c1eab8b 100644
--- a/gdata/services/documents/gdata-documents-presentation.c
+++ b/gdata/services/documents/gdata-documents-presentation.c
@@ -55,7 +55,6 @@ static const gchar *export_formats[] = {
 };
 
 G_DEFINE_TYPE (GDataDocumentsPresentation, gdata_documents_presentation, GDATA_TYPE_DOCUMENTS_ENTRY)
-#define GDATA_DOCUMENTS_PRESENTATION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOCUMENTS_PRESENTATION, GDataDocumentsPresentationPrivate))
 
 static void
 gdata_documents_presentation_class_init (GDataDocumentsPresentationClass *klass)
diff --git a/gdata/services/documents/gdata-documents-query.c b/gdata/services/documents/gdata-documents-query.c
index 9df9e3f..7e006ea 100644
--- a/gdata/services/documents/gdata-documents-query.c
+++ b/gdata/services/documents/gdata-documents-query.c
@@ -71,7 +71,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataDocumentsQuery, gdata_documents_query, GDATA_TYPE_QUERY)
-#define GDATA_DOCUMENTS_QUERY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOCUMENTS_QUERY, GDataDocumentsQueryPrivate))
 
 static void
 gdata_documents_query_class_init (GDataDocumentsQueryClass *klass)
@@ -163,7 +162,7 @@ gdata_documents_query_init (GDataDocumentsQuery *self)
 static void
 gdata_documents_query_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataDocumentsQueryPrivate *priv = GDATA_DOCUMENTS_QUERY_GET_PRIVATE (object);
+	GDataDocumentsQueryPrivate *priv = GDATA_DOCUMENTS_QUERY (object)->priv;
 
 	switch (property_id) {
 		case PROP_SHOW_DELETED:
@@ -219,7 +218,7 @@ gdata_documents_query_set_property (GObject *object, guint property_id, const GV
 static void
 gdata_documents_query_finalize (GObject *object)
 {
-	GDataDocumentsQueryPrivate *priv = GDATA_DOCUMENTS_QUERY_GET_PRIVATE (object);
+	GDataDocumentsQueryPrivate *priv = GDATA_DOCUMENTS_QUERY (object)->priv;
 
 	g_free (priv->folder_id);
 	g_free (priv->title);
diff --git a/gdata/services/documents/gdata-documents-service.c b/gdata/services/documents/gdata-documents-service.c
index af490ca..3431fe5 100644
--- a/gdata/services/documents/gdata-documents-service.c
+++ b/gdata/services/documents/gdata-documents-service.c
@@ -73,7 +73,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataDocumentsService, gdata_documents_service, GDATA_TYPE_SERVICE)
-#define GDATA_DOCUMENTS_SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOCUMENTS_SERVICE, GDataDocumentsServicePrivate))
 
 static void
 gdata_documents_service_class_init (GDataDocumentsServiceClass *klass)
@@ -138,7 +137,7 @@ gdata_documents_service_new (const gchar *client_id)
 static void
 gdata_documents_service_dispose (GObject *object)
 {
-	GDataDocumentsServicePrivate *priv = GDATA_DOCUMENTS_SERVICE_GET_PRIVATE (object);
+	GDataDocumentsServicePrivate *priv = GDATA_DOCUMENTS_SERVICE (object)->priv;
 
 	if (priv->spreadsheet_service != NULL)
 		g_object_unref (priv->spreadsheet_service);
@@ -150,7 +149,7 @@ gdata_documents_service_dispose (GObject *object)
 static void
 gdata_documents_service_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataDocumentsServicePrivate *priv = GDATA_DOCUMENTS_SERVICE_GET_PRIVATE (object);
+	GDataDocumentsServicePrivate *priv = GDATA_DOCUMENTS_SERVICE (object)->priv;
 
 	switch (property_id) {
 		case PROP_SPREADSHEET_SERVICE:
@@ -321,7 +320,7 @@ static void
 notify_authenticated_cb (GObject *service, GParamSpec *pspec, GObject *self)
 {
 	GDataService *spreadsheet_service;
-	GDataDocumentsServicePrivate *priv = GDATA_DOCUMENTS_SERVICE_GET_PRIVATE (GDATA_DOCUMENTS_SERVICE (service));
+	GDataDocumentsServicePrivate *priv = GDATA_DOCUMENTS_SERVICE (service)->priv;
 
 	if (priv->spreadsheet_service != NULL)
 		g_object_unref (priv->spreadsheet_service);
diff --git a/gdata/services/documents/gdata-documents-spreadsheet.c b/gdata/services/documents/gdata-documents-spreadsheet.c
index 6458608..bc070b9 100644
--- a/gdata/services/documents/gdata-documents-spreadsheet.c
+++ b/gdata/services/documents/gdata-documents-spreadsheet.c
@@ -55,7 +55,6 @@ static const struct { const gchar *extension; const gchar *fmcmd; } export_forma
 };
 
 G_DEFINE_TYPE (GDataDocumentsSpreadsheet, gdata_documents_spreadsheet, GDATA_TYPE_DOCUMENTS_ENTRY)
-#define GDATA_DOCUMENTS_SPREADSHEET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOCUMENTS_SPREADSHEET, GDataDocumentsSpreadsheetPrivate))
 
 static void
 gdata_documents_spreadsheet_class_init (GDataDocumentsSpreadsheetClass *klass)
diff --git a/gdata/services/documents/gdata-documents-text.c b/gdata/services/documents/gdata-documents-text.c
index 1c82753..3738262 100644
--- a/gdata/services/documents/gdata-documents-text.c
+++ b/gdata/services/documents/gdata-documents-text.c
@@ -57,7 +57,6 @@ static const gchar *export_formats[] = {
 };
 
 G_DEFINE_TYPE (GDataDocumentsText, gdata_documents_text, GDATA_TYPE_DOCUMENTS_ENTRY)
-#define GDATA_DOCUMENTS_TEXT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_DOCUMENTS_TEXT, GDataDocumentsTextClass))
 
 static void
 gdata_documents_text_class_init (GDataDocumentsTextClass *klass)
diff --git a/gdata/services/picasaweb/gdata-picasaweb-album.c b/gdata/services/picasaweb/gdata-picasaweb-album.c
index 67e980d..32aa4a8 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-album.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-album.c
@@ -97,7 +97,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataPicasaWebAlbum, gdata_picasaweb_album, GDATA_TYPE_ENTRY)
-#define GDATA_PICASAWEB_ALBUM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_PICASAWEB_ALBUM, GDataPicasaWebAlbumPrivate))
 
 static void
 gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
@@ -442,7 +441,7 @@ gdata_picasaweb_album_init (GDataPicasaWebAlbum *self)
 static void
 gdata_picasaweb_album_dispose (GObject *object)
 {
-	GDataPicasaWebAlbumPrivate *priv = GDATA_PICASAWEB_ALBUM_GET_PRIVATE (object);
+	GDataPicasaWebAlbumPrivate *priv = GDATA_PICASAWEB_ALBUM (object)->priv;
 
 	if (priv->media_group != NULL)
 		g_object_unref (priv->media_group);
@@ -459,7 +458,7 @@ gdata_picasaweb_album_dispose (GObject *object)
 static void
 gdata_picasaweb_album_finalize (GObject *object)
 {
-	GDataPicasaWebAlbumPrivate *priv = GDATA_PICASAWEB_ALBUM_GET_PRIVATE (object);
+	GDataPicasaWebAlbumPrivate *priv = GDATA_PICASAWEB_ALBUM (object)->priv;
 
 	g_free (priv->album_id);
 	g_free (priv->user);
@@ -473,7 +472,7 @@ gdata_picasaweb_album_finalize (GObject *object)
 static void
 gdata_picasaweb_album_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataPicasaWebAlbumPrivate *priv = GDATA_PICASAWEB_ALBUM_GET_PRIVATE (object);
+	GDataPicasaWebAlbumPrivate *priv = GDATA_PICASAWEB_ALBUM (object)->priv;
 
 	switch (property_id) {
 		case PROP_ALBUM_ID:
diff --git a/gdata/services/picasaweb/gdata-picasaweb-file.c b/gdata/services/picasaweb/gdata-picasaweb-file.c
index bb43bf5..a12d9c9 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-file.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-file.c
@@ -113,7 +113,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataPicasaWebFile, gdata_picasaweb_file, GDATA_TYPE_ENTRY)
-#define GDATA_PICASAWEB_FILE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_PICASAWEB_FILE, GDataPicasaWebFilePrivate))
 
 static void
 gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
@@ -622,7 +621,7 @@ gdata_picasaweb_file_init (GDataPicasaWebFile *self)
 static void
 gdata_picasaweb_file_dispose (GObject *object)
 {
-	GDataPicasaWebFilePrivate *priv = GDATA_PICASAWEB_FILE_GET_PRIVATE (object);
+	GDataPicasaWebFilePrivate *priv = GDATA_PICASAWEB_FILE (object)->priv;
 
 	if (priv->media_group != NULL)
 		g_object_unref (priv->media_group);
@@ -643,7 +642,7 @@ gdata_picasaweb_file_dispose (GObject *object)
 static void
 gdata_picasaweb_file_finalize (GObject *object)
 {
-	GDataPicasaWebFilePrivate *priv = GDATA_PICASAWEB_FILE_GET_PRIVATE (object);
+	GDataPicasaWebFilePrivate *priv = GDATA_PICASAWEB_FILE (object)->priv;
 
 	g_free (priv->file_id);
 	g_free (priv->version);
@@ -659,7 +658,7 @@ gdata_picasaweb_file_finalize (GObject *object)
 static void
 gdata_picasaweb_file_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataPicasaWebFilePrivate *priv = GDATA_PICASAWEB_FILE_GET_PRIVATE (object);
+	GDataPicasaWebFilePrivate *priv = GDATA_PICASAWEB_FILE (object)->priv;
 
 	switch (property_id) {
 		case PROP_FILE_ID:
diff --git a/gdata/services/picasaweb/gdata-picasaweb-query.c b/gdata/services/picasaweb/gdata-picasaweb-query.c
index 77542ae..01c7248 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-query.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-query.c
@@ -71,7 +71,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataPicasaWebQuery, gdata_picasaweb_query, GDATA_TYPE_QUERY)
-#define GDATA_PICASAWEB_QUERY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_PICASAWEB_QUERY, GDataPicasaWebQueryPrivate))
 
 static void
 gdata_picasaweb_query_class_init (GDataPicasaWebQueryClass *klass)
@@ -171,7 +170,7 @@ gdata_picasaweb_query_init (GDataPicasaWebQuery *self)
 static void
 gdata_picasaweb_query_finalize (GObject *object)
 {
-	GDataPicasaWebQueryPrivate *priv = GDATA_PICASAWEB_QUERY_GET_PRIVATE (object);
+	GDataPicasaWebQueryPrivate *priv = GDATA_PICASAWEB_QUERY (object)->priv;
 
 	g_free (priv->thumbnail_size);
 	g_free (priv->image_size);
@@ -185,7 +184,7 @@ gdata_picasaweb_query_finalize (GObject *object)
 static void
 gdata_picasaweb_query_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataPicasaWebQueryPrivate *priv = GDATA_PICASAWEB_QUERY_GET_PRIVATE (object);
+	GDataPicasaWebQueryPrivate *priv = GDATA_PICASAWEB_QUERY (object)->priv;
 
 	switch (property_id) {
 		case PROP_VISIBILITY:
diff --git a/gdata/services/picasaweb/gdata-picasaweb-user.c b/gdata/services/picasaweb/gdata-picasaweb-user.c
index 5513360..93d03bb 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-user.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-user.c
@@ -61,7 +61,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataPicasaWebUser, gdata_picasaweb_user, GDATA_TYPE_ENTRY)
-#define GDATA_PICASAWEB_USER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_PICASAWEB_USER, GDataPicasaWebUserPrivate))
 
 static void
 gdata_picasaweb_user_class_init (GDataPicasaWebUserClass *klass)
@@ -174,7 +173,7 @@ gdata_picasaweb_user_init (GDataPicasaWebUser *self)
 static void
 gdata_picasaweb_user_finalize (GObject *object)
 {
-	GDataPicasaWebUserPrivate *priv = GDATA_PICASAWEB_USER_GET_PRIVATE (object);
+	GDataPicasaWebUserPrivate *priv = GDATA_PICASAWEB_USER (object)->priv;
 
 	g_free (priv->user);
 	g_free (priv->nickname);
@@ -187,7 +186,7 @@ gdata_picasaweb_user_finalize (GObject *object)
 static void
 gdata_picasaweb_user_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataPicasaWebUserPrivate *priv = GDATA_PICASAWEB_USER_GET_PRIVATE (object);
+	GDataPicasaWebUserPrivate *priv = GDATA_PICASAWEB_USER (object)->priv;
 
 	switch (property_id) {
 		case PROP_USER:
diff --git a/gdata/services/youtube/gdata-youtube-content.c b/gdata/services/youtube/gdata-youtube-content.c
index f1c4e75..4e8cce7 100644
--- a/gdata/services/youtube/gdata-youtube-content.c
+++ b/gdata/services/youtube/gdata-youtube-content.c
@@ -51,7 +51,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataYouTubeContent, gdata_youtube_content, GDATA_TYPE_MEDIA_CONTENT)
-#define GDATA_YOUTUBE_CONTENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_CONTENT, GDataYouTubeContentPrivate))
 
 static void
 gdata_youtube_content_class_init (GDataYouTubeContentClass *klass)
diff --git a/gdata/services/youtube/gdata-youtube-control.c b/gdata/services/youtube/gdata-youtube-control.c
index 0cb052c..69ced11 100644
--- a/gdata/services/youtube/gdata-youtube-control.c
+++ b/gdata/services/youtube/gdata-youtube-control.c
@@ -55,7 +55,6 @@ struct _GDataYouTubeControlPrivate {
 };
 
 G_DEFINE_TYPE (GDataYouTubeControl, gdata_youtube_control, GDATA_TYPE_PARSABLE)
-#define GDATA_YOUTUBE_CONTROL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_CONTROL, GDataYouTubeControlPrivate))
 
 static void
 gdata_youtube_control_class_init (GDataYouTubeControlClass *klass)
diff --git a/gdata/services/youtube/gdata-youtube-credit.c b/gdata/services/youtube/gdata-youtube-credit.c
index 0809caa..9a44ad3 100644
--- a/gdata/services/youtube/gdata-youtube-credit.c
+++ b/gdata/services/youtube/gdata-youtube-credit.c
@@ -52,7 +52,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataYouTubeCredit, gdata_youtube_credit, GDATA_TYPE_MEDIA_CREDIT)
-#define GDATA_YOUTUBE_CREDIT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_CREDIT, GDataYouTubeCreditPrivate))
 
 static void
 gdata_youtube_credit_class_init (GDataYouTubeCreditClass *klass)
diff --git a/gdata/services/youtube/gdata-youtube-group.c b/gdata/services/youtube/gdata-youtube-group.c
index 3f21761..bd3e509 100644
--- a/gdata/services/youtube/gdata-youtube-group.c
+++ b/gdata/services/youtube/gdata-youtube-group.c
@@ -53,7 +53,6 @@ struct _GDataYouTubeGroupPrivate {
 };
 
 G_DEFINE_TYPE (GDataYouTubeGroup, gdata_youtube_group, GDATA_TYPE_MEDIA_GROUP)
-#define GDATA_YOUTUBE_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_GROUP, GDataYouTubeGroupPrivate))
 
 static void
 gdata_youtube_group_class_init (GDataYouTubeGroupClass *klass)
diff --git a/gdata/services/youtube/gdata-youtube-query.c b/gdata/services/youtube/gdata-youtube-query.c
index be014ab..6c5a58e 100644
--- a/gdata/services/youtube/gdata-youtube-query.c
+++ b/gdata/services/youtube/gdata-youtube-query.c
@@ -77,7 +77,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataYouTubeQuery, gdata_youtube_query, GDATA_TYPE_QUERY)
-#define GDATA_YOUTUBE_QUERY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_QUERY, GDataYouTubeQueryPrivate))
 
 static void
 gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
@@ -310,7 +309,7 @@ gdata_youtube_query_init (GDataYouTubeQuery *self)
 static void
 gdata_youtube_query_finalize (GObject *object)
 {
-	GDataYouTubeQueryPrivate *priv = GDATA_YOUTUBE_QUERY_GET_PRIVATE (object);
+	GDataYouTubeQueryPrivate *priv = GDATA_YOUTUBE_QUERY (object)->priv;
 
 	g_free (priv->language);
 	g_free (priv->order_by);
@@ -323,7 +322,7 @@ gdata_youtube_query_finalize (GObject *object)
 static void
 gdata_youtube_query_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataYouTubeQueryPrivate *priv = GDATA_YOUTUBE_QUERY_GET_PRIVATE (object);
+	GDataYouTubeQueryPrivate *priv = GDATA_YOUTUBE_QUERY (object)->priv;
 
 	switch (property_id) {
 		case PROP_FORMAT:
diff --git a/gdata/services/youtube/gdata-youtube-service.c b/gdata/services/youtube/gdata-youtube-service.c
index 39a94f4..1a54e91 100644
--- a/gdata/services/youtube/gdata-youtube-service.c
+++ b/gdata/services/youtube/gdata-youtube-service.c
@@ -70,7 +70,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataYouTubeService, gdata_youtube_service, GDATA_TYPE_SERVICE)
-#define GDATA_YOUTUBE_SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_SERVICE, GDataYouTubeServicePrivate))
 
 static void
 gdata_youtube_service_class_init (GDataYouTubeServiceClass *klass)
@@ -126,7 +125,7 @@ gdata_youtube_service_init (GDataYouTubeService *self)
 static void
 gdata_youtube_service_finalize (GObject *object)
 {
-	GDataYouTubeServicePrivate *priv = GDATA_YOUTUBE_SERVICE_GET_PRIVATE (object);
+	GDataYouTubeServicePrivate *priv = GDATA_YOUTUBE_SERVICE (object)->priv;
 
 	g_free (priv->youtube_user);
 	g_free (priv->developer_key);
@@ -138,7 +137,7 @@ gdata_youtube_service_finalize (GObject *object)
 static void
 gdata_youtube_service_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-	GDataYouTubeServicePrivate *priv = GDATA_YOUTUBE_SERVICE_GET_PRIVATE (object);
+	GDataYouTubeServicePrivate *priv = GDATA_YOUTUBE_SERVICE (object)->priv;
 
 	switch (property_id) {
 		case PROP_DEVELOPER_KEY:
@@ -157,7 +156,7 @@ gdata_youtube_service_get_property (GObject *object, guint property_id, GValue *
 static void
 gdata_youtube_service_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-	GDataYouTubeServicePrivate *priv = GDATA_YOUTUBE_SERVICE_GET_PRIVATE (object);
+	GDataYouTubeServicePrivate *priv = GDATA_YOUTUBE_SERVICE (object)->priv;
 
 	switch (property_id) {
 		case PROP_DEVELOPER_KEY:
diff --git a/gdata/services/youtube/gdata-youtube-state.c b/gdata/services/youtube/gdata-youtube-state.c
index 139d95c..a9290e0 100644
--- a/gdata/services/youtube/gdata-youtube-state.c
+++ b/gdata/services/youtube/gdata-youtube-state.c
@@ -57,7 +57,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataYouTubeState, gdata_youtube_state, GDATA_TYPE_PARSABLE)
-#define GDATA_YOUTUBE_STATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_STATE, GDataYouTubeStatePrivate))
 
 static void
 gdata_youtube_state_class_init (GDataYouTubeStateClass *klass)
diff --git a/gdata/services/youtube/gdata-youtube-video.c b/gdata/services/youtube/gdata-youtube-video.c
index 11fbf33..9185599 100644
--- a/gdata/services/youtube/gdata-youtube-video.c
+++ b/gdata/services/youtube/gdata-youtube-video.c
@@ -134,7 +134,6 @@ enum {
 };
 
 G_DEFINE_TYPE (GDataYouTubeVideo, gdata_youtube_video, GDATA_TYPE_ENTRY)
-#define GDATA_YOUTUBE_VIDEO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_VIDEO, GDataYouTubeVideoPrivate))
 
 static void
 gdata_youtube_video_class_init (GDataYouTubeVideoClass *klass)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]