[libgdata] [picasaweb] Move initialisation code into constructor() in PicasaWeb service

[Philip Withnall <pwithnall src gnome org>]

commit 03034722aac6d625ca30ddb04425a90536f2db44
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Aug 11 22:19:07 2010 +0100

    [picasaweb] Move initialisation code into constructor() in PicasaWeb service

 gdata/services/picasaweb/gdata-picasaweb-album.c |   32 +++++++++++++++------
 gdata/services/picasaweb/gdata-picasaweb-file.c  |   32 +++++++++++++++------
 2 files changed, 46 insertions(+), 18 deletions(-)
---
diff --git a/gdata/services/picasaweb/gdata-picasaweb-album.c b/gdata/services/picasaweb/gdata-picasaweb-album.c
index 81e17ed..f790ccd 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-album.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-album.c
@@ -97,6 +97,7 @@
 #include "gdata-picasaweb-enums.h"
 #include "georss/gdata-georss-where.h"
 
+static GObject *gdata_picasaweb_album_constructor (GType type, guint n_construct_params, GObjectConstructParam *construct_params);
 static void gdata_picasaweb_album_dispose (GObject *object);
 static void gdata_picasaweb_album_finalize (GObject *object);
 static void gdata_picasaweb_album_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
@@ -154,6 +155,7 @@ gdata_picasaweb_album_class_init (GDataPicasaWebAlbumClass *klass)
 
 	g_type_class_add_private (klass, sizeof (GDataPicasaWebAlbumPrivate));
 
+	gobject_class->constructor = gdata_picasaweb_album_constructor;
 	gobject_class->get_property = gdata_picasaweb_album_get_property;
 	gobject_class->set_property = gdata_picasaweb_album_set_property;
 	gobject_class->dispose = gdata_picasaweb_album_dispose;
@@ -489,6 +491,26 @@ gdata_picasaweb_album_init (GDataPicasaWebAlbum *self)
 	g_signal_connect (self, "notify::visibility", G_CALLBACK (notify_visibility_cb), NULL);
 }
 
+static GObject *
+gdata_picasaweb_album_constructor (GType type, guint n_construct_params, GObjectConstructParam *construct_params)
+{
+	GObject *object;
+
+	/* Chain up to the parent class */
+	object = G_OBJECT_CLASS (gdata_picasaweb_album_parent_class)->constructor (type, n_construct_params, construct_params);
+
+	if (_gdata_parsable_is_constructed_from_xml (GDATA_PARSABLE (object)) == FALSE) {
+		GDataPicasaWebAlbumPrivate *priv = GDATA_PICASAWEB_ALBUM (object)->priv;
+
+		/* Set the edited and timestamp properties to the current time (creation time). bgo#599140
+		 * We don't do this in *_init() since that would cause setting it from parse_xml() to fail (duplicate element). */
+		g_get_current_time (&(priv->timestamp));
+		g_get_current_time (&(priv->edited));
+	}
+
+	return object;
+}
+
 static void
 gdata_picasaweb_album_dispose (GObject *object)
 {
@@ -821,7 +843,6 @@ GDataPicasaWebAlbum *
 gdata_picasaweb_album_new (const gchar *id)
 {
 	const gchar *album_id = NULL, *i;
-	GDataPicasaWebAlbum *album;
 
 	if (id != NULL) {
 		album_id = g_strrstr (id, "/");
@@ -836,14 +857,7 @@ gdata_picasaweb_album_new (const gchar *id)
 		}
 	}
 
-	album = GDATA_PICASAWEB_ALBUM (g_object_new (GDATA_TYPE_PICASAWEB_ALBUM, "id", id, "album-id", album_id, NULL));
-
-	/* Set the edited and timestamp properties to the current time (creation time). bgo#599140
-	 * We don't do this in *_init() since that would cause setting it from parse_xml() to fail (duplicate element). */
-	g_get_current_time (&(album->priv->timestamp));
-	g_get_current_time (&(album->priv->edited));
-
-	return album;
+	return GDATA_PICASAWEB_ALBUM (g_object_new (GDATA_TYPE_PICASAWEB_ALBUM, "id", id, "album-id", album_id, NULL));
 }
 
 /**
diff --git a/gdata/services/picasaweb/gdata-picasaweb-file.c b/gdata/services/picasaweb/gdata-picasaweb-file.c
index d982fbe..356ff9e 100644
--- a/gdata/services/picasaweb/gdata-picasaweb-file.c
+++ b/gdata/services/picasaweb/gdata-picasaweb-file.c
@@ -95,6 +95,7 @@
 #include "exif/gdata-exif-tags.h"
 #include "georss/gdata-georss-where.h"
 
+static GObject *gdata_picasaweb_file_constructor (GType type, guint n_construct_params, GObjectConstructParam *construct_params);
 static void gdata_picasaweb_file_dispose (GObject *object);
 static void gdata_picasaweb_file_finalize (GObject *object);
 static void gdata_picasaweb_file_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
@@ -172,6 +173,7 @@ gdata_picasaweb_file_class_init (GDataPicasaWebFileClass *klass)
 
 	g_type_class_add_private (klass, sizeof (GDataPicasaWebFilePrivate));
 
+	gobject_class->constructor = gdata_picasaweb_file_constructor;
 	gobject_class->get_property = gdata_picasaweb_file_get_property;
 	gobject_class->set_property = gdata_picasaweb_file_set_property;
 	gobject_class->dispose = gdata_picasaweb_file_dispose;
@@ -681,6 +683,26 @@ gdata_picasaweb_file_init (GDataPicasaWebFile *self)
 	g_signal_connect (self, "notify::summary", G_CALLBACK (notify_summary_cb), NULL);
 }
 
+static GObject *
+gdata_picasaweb_file_constructor (GType type, guint n_construct_params, GObjectConstructParam *construct_params)
+{
+	GObject *object;
+
+	/* Chain up to the parent class */
+	object = G_OBJECT_CLASS (gdata_picasaweb_file_parent_class)->constructor (type, n_construct_params, construct_params);
+
+	if (_gdata_parsable_is_constructed_from_xml (GDATA_PARSABLE (object)) == FALSE) {
+		GDataPicasaWebFilePrivate *priv = GDATA_PICASAWEB_FILE (object)->priv;
+
+		/* Set the edited and timestamp properties to the current time (creation time). bgo#599140
+		 * We don't do this in *_init() since that would cause setting it from parse_xml() to fail (duplicate element). */
+		g_get_current_time (&(priv->timestamp));
+		g_get_current_time (&(priv->edited));
+	}
+
+	return object;
+}
+
 static void
 gdata_picasaweb_file_dispose (GObject *object)
 {
@@ -1082,7 +1104,6 @@ GDataPicasaWebFile *
 gdata_picasaweb_file_new (const gchar *id)
 {
 	const gchar *file_id = NULL, *i;
-	GDataPicasaWebFile *file;
 
 	if (id != NULL) {
 		file_id = g_strrstr (id, "/");
@@ -1097,14 +1118,7 @@ gdata_picasaweb_file_new (const gchar *id)
 		}
 	}
 
-	file = GDATA_PICASAWEB_FILE (g_object_new (GDATA_TYPE_PICASAWEB_FILE, "id", id, "file-id", file_id, NULL));
-
-	/* Set the edited and timestamp properties to the current time (creation time). bgo#599140
-	 * We don't do this in *_init() since that would cause setting it from parse_xml() to fail (duplicate element). */
-	g_get_current_time (&(file->priv->timestamp));
-	g_get_current_time (&(file->priv->edited));
-
-	return file;
+	return GDATA_PICASAWEB_FILE (g_object_new (GDATA_TYPE_PICASAWEB_FILE, "id", id, "file-id", file_id, NULL));
 }
 
 /**