[evolution-kolab/ek-wip-porting-imapx] IMAPX: use identifier 'self' to reference GObject instance

[Christian Hilberg <chilberg src gnome org>]

commit 349224db1c684f281f86c06b220a24b541d71a8b
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Dec 6 16:08:28 2011 +0100

    IMAPX: use identifier 'self' to reference GObject instance
    
    * use the parameter name 'self' as first argument in
      GObjects (the instance parameter)

 .../providers/imapx/camel-imapx-extd-folder.c      |   10 +++---
 .../providers/imapx/camel-imapx-extd-folder.h      |    2 +-
 .../providers/imapx/camel-imapx-extd-server.c      |   36 +++++++------------
 .../providers/imapx/camel-imapx-extd-server.h      |    6 ++--
 src/camel/providers/imapx/camel-imapx-extd-store.c |   16 ++++++++-
 5 files changed, 36 insertions(+), 34 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-extd-folder.c b/src/camel/providers/imapx/camel-imapx-extd-folder.c
index e1a4586..f06f60c 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-folder.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-folder.c
@@ -39,9 +39,9 @@ G_DEFINE_TYPE (CamelIMAPXExtdFolder, camel_imapx_extd_folder, CAMEL_TYPE_IMAPX_F
 /* object/class init */
 
 static void
-camel_imapx_extd_folder_init (CamelIMAPXExtdFolder *object)
+camel_imapx_extd_folder_init (CamelIMAPXExtdFolder *self)
 {
-	g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (object));
+	g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (self));
 }
 
 static void
@@ -75,16 +75,16 @@ camel_imapx_extd_folder_class_init (CamelIMAPXExtdFolderClass *klass)
 /* API functions */
 
 guint64
-camel_imapx_extd_folder_get_uidvalidity (CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_folder_get_uidvalidity (CamelIMAPXExtdFolder *self,
                                          GError **err)
 {
 	guint64 uidvalidity = 0;
 
-	g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
+	g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (self));
 	g_return_val_if_fail (err == NULL || *err == NULL, 0);
 
 	/* FIXME implement me */
-	g_assert_not_reached ();
+	g_error ("%s: FIXME implement me", __func__);
 
 	/* TODO read the uidvalidity value from parent object */
 
diff --git a/src/camel/providers/imapx/camel-imapx-extd-folder.h b/src/camel/providers/imapx/camel-imapx-extd-folder.h
index 999c360..704498d 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-folder.h
+++ b/src/camel/providers/imapx/camel-imapx-extd-folder.h
@@ -73,7 +73,7 @@ GType
 camel_imapx_extd_folder_get_type (void);
 
 guint64
-camel_imapx_extd_folder_get_uidvalidity (CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_folder_get_uidvalidity (CamelIMAPXExtdFolder *self,
                                          GError **err);
 
 G_END_DECLS
diff --git a/src/camel/providers/imapx/camel-imapx-extd-server.c b/src/camel/providers/imapx/camel-imapx-extd-server.c
index f21fce9..d7c0917 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-server.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-server.c
@@ -46,14 +46,11 @@ G_DEFINE_TYPE (CamelIMAPXExtdServer, camel_imapx_extd_server, CAMEL_TYPE_IMAPX_S
 /* object/class init */
 
 static void
-camel_imapx_extd_server_init (CamelIMAPXExtdServer *object)
+camel_imapx_extd_server_init (CamelIMAPXExtdServer *self)
 {
-	CamelIMAPXExtdServer *self = NULL;
 	CamelIMAPXExtdServerPrivate *priv = NULL;
 
-	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (object));
-
-	self = object;
+	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
 	priv = CAMEL_IMAPX_EXTD_SERVER_PRIVATE (self);
 
 	priv->md = NULL;
@@ -98,15 +95,13 @@ camel_imapx_extd_server_class_init (CamelIMAPXExtdServerClass *klass)
 /* API functions */
 
 camel_imapx_metadata_proto_t
-camel_imapx_extd_server_metadata_get_proto (CamelIMAPXExtdServer *server)
+camel_imapx_extd_server_metadata_get_proto (CamelIMAPXExtdServer *self)
 {
-	CamelIMAPXExtdServer *self = NULL;
 	CamelIMAPXExtdServerPrivate *priv = NULL;
 	camel_imapx_metadata_proto_t proto = CAMEL_IMAPX_METADATA_PROTO_INVAL;
 
-	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (server));
+	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
 
-	self = server;
 	priv = CAMEL_IMAPX_EXTD_SERVER_PRIVATE (self);
 
 	if (priv->md == NULL) {
@@ -126,46 +121,41 @@ camel_imapx_extd_server_metadata_get_proto (CamelIMAPXExtdServer *server)
 }
 
 CamelImapxMetadata*
-camel_imapx_extd_server_get_metadata (CamelIMAPXExtdServer *server,
+camel_imapx_extd_server_get_metadata (CamelIMAPXExtdServer *self,
                                       CamelImapxMetadataSpec *spec,
                                       gboolean do_resect,
                                       GError **err)
 {
-	CamelIMAPXExtdServer *self = NULL;
 	CamelIMAPXExtdServerPrivate *priv = NULL;
 
-	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (server));
-	(void)do_resect; /* FIXME */
+	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
 	g_assert (spec != NULL);
-	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+	(void)do_resect; /* FIXME */
+	g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
-	self = server;
 	priv = CAMEL_IMAPX_EXTD_SERVER_PRIVATE (self);
 
 	/* FIXME implement me */
-	g_error ("%s: FIXME: implement me",
-	         __func__);
+	g_error ("%s: FIXME: implement me", __func__);
 
 	return NULL;
 }
 
 gboolean
-camel_imapx_extd_server_set_metadata (CamelIMAPXExtdServer *server,
+camel_imapx_extd_server_set_metadata (CamelIMAPXExtdServer *self,
                                       CamelImapxMetadata *md,
                                       GError **err)
 {
-	CamelIMAPXExtdServer *self = NULL;
 	CamelIMAPXExtdServerPrivate *priv = NULL;
 
-	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (server));
+	g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
+	g_assert (md != NULL);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-	self = server;
 	priv = CAMEL_IMAPX_EXTD_SERVER_PRIVATE (self);
 
 	/* FIXME implement me */
-	g_error ("%s: FIXME: implement me",
-	         __func__);
+	g_error ("%s: FIXME: implement me", __func__);
 
 	return FALSE;
 }
diff --git a/src/camel/providers/imapx/camel-imapx-extd-server.h b/src/camel/providers/imapx/camel-imapx-extd-server.h
index 8b28266..40f9293 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-server.h
+++ b/src/camel/providers/imapx/camel-imapx-extd-server.h
@@ -76,16 +76,16 @@ GType
 camel_imapx_extd_server_get_type (void);
 
 camel_imapx_metadata_proto_t
-camel_imapx_extd_server_metadata_get_proto (CamelIMAPXExtdServer *server);
+camel_imapx_extd_server_metadata_get_proto (CamelIMAPXExtdServer *self);
 
 CamelImapxMetadata*
-camel_imapx_extd_server_get_metadata (CamelIMAPXExtdServer *server,
+camel_imapx_extd_server_get_metadata (CamelIMAPXExtdServer *self,
                                       CamelImapxMetadataSpec *spec,
                                       gboolean do_resect,
                                       GError **err);
 
 gboolean
-camel_imapx_extd_server_set_metadata (CamelIMAPXExtdServer *server,
+camel_imapx_extd_server_set_metadata (CamelIMAPXExtdServer *self,
                                       CamelImapxMetadata *md,
                                       GError **err);
 
diff --git a/src/camel/providers/imapx/camel-imapx-extd-store.c b/src/camel/providers/imapx/camel-imapx-extd-store.c
index 99cd39b..3a7f7e4 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-store.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-store.c
@@ -58,9 +58,12 @@ G_DEFINE_TYPE_WITH_CODE (
 /* object/class init */
 
 static void
-camel_imapx_extd_store_init (CamelIMAPXExtdStore *object)
+camel_imapx_extd_store_init (CamelIMAPXExtdStore *self)
 {
-	g_assert (CAMEL_IS_IMAPX_EXTD_STORE (object));
+	g_assert (CAMEL_IS_IMAPX_EXTD_STORE (self));
+
+	/* FIXME implement me */
+	g_error ("%s: FIXME implement me", __func__);
 }
 
 static void
@@ -83,18 +86,27 @@ static void
 camel_imapx_extd_store_initable_init (GInitableIface *interface)
 {
 	g_assert (interface != NULL);
+
+	/* FIXME implement me */
+	g_error ("%s: FIXME implement me", __func__);
 }
 
 static void
 camel_imapx_extd_store_network_service_init (CamelNetworkServiceInterface *interface)
 {
 	g_assert (CAMEL_IS_NETWORK_SERVICE_INTERFACE (interface));
+
+	/* FIXME implement me */
+	g_error ("%s: FIXME implement me", __func__);
 }
 
 static void
 camel_imapx_extd_store_subscribable_init (CamelSubscribableInterface *interface)
 {
 	g_assert (CAMEL_IS_SUBSCRIBABLE_INTERFACE (interface));
+
+	/* FIXME implement me */
+	g_error ("%s: FIXME implement me", __func__);
 }
 
 static void