GNOME.org
 

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

commit d57fb405f2c1ac8ad3612f5e0638072b4bb277ad
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Dec 6 16:33:10 2011 +0100

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

 src/camel/camel-kolab-imapx-folder.c   |   10 +++---
 src/camel/camel-kolab-imapx-folder.h   |    2 +-
 src/camel/camel-kolab-imapx-server.c   |   37 ++++++-------------
 src/camel/camel-kolab-imapx-server.h   |   10 +++---
 src/camel/camel-kolab-imapx-settings.c |    7 +---
 src/camel/camel-kolab-imapx-store.c    |   63 +++++++++++++++-----------------
 src/camel/camel-kolab-imapx-store.h    |   10 +++---
 7 files changed, 60 insertions(+), 79 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-folder.c b/src/camel/camel-kolab-imapx-folder.c
index d7b367f..ab20ffa 100644
--- a/src/camel/camel-kolab-imapx-folder.c
+++ b/src/camel/camel-kolab-imapx-folder.c
@@ -67,9 +67,9 @@ G_DEFINE_TYPE (CamelKolabIMAPXFolder, camel_kolab_imapx_folder, CAMEL_TYPE_IMAPX
 /* object/class init */
 
 static void
-camel_kolab_imapx_folder_init (CamelKolabIMAPXFolder *object)
+camel_kolab_imapx_folder_init (CamelKolabIMAPXFolder *self)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_FOLDER (object));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_FOLDER (self));
 }
 
 static void
@@ -103,16 +103,16 @@ camel_kolab_imapx_folder_class_init (CamelKolabIMAPXFolderClass *klass)
 /* API functions */
 
 guint64
-camel_kolab_imapx_folder_get_uidvalidity (CamelKolabIMAPXFolder *folder,
+camel_kolab_imapx_folder_get_uidvalidity (CamelKolabIMAPXFolder *self,
                                           GError **err)
 {
 	guint64 uval = 0;
 	GError *tmp_err = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_FOLDER (folder));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_FOLDER (self));
 	g_return_val_if_fail (err == NULL || *err == NULL, 0);
 
-	uval = camel_imapx_extd_folder_get_uidvalidity (CAMEL_IMAPX_EXTD_FOLDER (folder),
+	uval = camel_imapx_extd_folder_get_uidvalidity (CAMEL_IMAPX_EXTD_FOLDER (self),
 	                                                &tmp_err);
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);
diff --git a/src/camel/camel-kolab-imapx-folder.h b/src/camel/camel-kolab-imapx-folder.h
index 56b750c..5439393 100644
--- a/src/camel/camel-kolab-imapx-folder.h
+++ b/src/camel/camel-kolab-imapx-folder.h
@@ -93,7 +93,7 @@ GType
 camel_kolab_imapx_folder_get_type (void);
 
 guint64
-camel_kolab_imapx_folder_get_uidvalidity (CamelKolabIMAPXFolder *folder,
+camel_kolab_imapx_folder_get_uidvalidity (CamelKolabIMAPXFolder *self,
                                           GError **err);
 
 G_END_DECLS
diff --git a/src/camel/camel-kolab-imapx-server.c b/src/camel/camel-kolab-imapx-server.c
index 47c98e1..2337532 100644
--- a/src/camel/camel-kolab-imapx-server.c
+++ b/src/camel/camel-kolab-imapx-server.c
@@ -50,14 +50,11 @@ G_DEFINE_TYPE (CamelKolabIMAPXServer, camel_kolab_imapx_server, CAMEL_TYPE_IMAPX
 /* object/class init */
 
 static void
-camel_kolab_imapx_server_init (CamelKolabIMAPXServer *object)
+camel_kolab_imapx_server_init (CamelKolabIMAPXServer *self)
 {
-	CamelKolabIMAPXServer *self = NULL;
 	CamelKolabIMAPXServerPrivate *priv = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (object));
-
-	self = object;
+	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
 
 	priv->kmd = NULL;
@@ -102,18 +99,16 @@ camel_kolab_imapx_server_class_init (CamelKolabIMAPXServerClass *klass)
 /* API functions */
 
 CamelKolabImapxMetadata*
-camel_kolab_imapx_server_get_metadata (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_get_metadata (CamelKolabIMAPXServer *self,
                                        gboolean do_resect,
                                        GError **err)
 {
-	CamelKolabIMAPXServer *self = NULL;
 	CamelKolabIMAPXServerPrivate *priv = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (server));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
 	(void)do_resect; /* FIXME */
 	g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
-	self = server;
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
 
 	/* FIXME */
@@ -123,18 +118,16 @@ camel_kolab_imapx_server_get_metadata (CamelKolabIMAPXServer *server,
 }
 
 gboolean
-camel_kolab_imapx_server_set_metadata (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_set_metadata (CamelKolabIMAPXServer *self,
                                        CamelKolabImapxMetadata *kmd,
                                        GError **err)
 {
-	CamelKolabIMAPXServer *self = NULL;
 	CamelKolabIMAPXServerPrivate *priv = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (server));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
 	g_assert (kmd != NULL);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-	self = server;
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
 
 	/* FIXME */
@@ -144,14 +137,13 @@ camel_kolab_imapx_server_set_metadata (CamelKolabIMAPXServer *server,
 }
 
 KolabFolderTypeID
-camel_kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *self,
                                          const gchar *foldername,
                                          gboolean do_updatedb,
                                          GCancellable *cancellable,
                                          GError **err)
 {
 	/* TODO better error reporting */
-	CamelKolabIMAPXServer *self = NULL;
 	CamelKolabIMAPXServerPrivate *priv = NULL;
 	CamelIMAPXExtdServer *eserver = NULL;
 	CamelOfflineStore *ostore = NULL;
@@ -162,12 +154,11 @@ camel_kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *server,
 	gboolean db_ok = FALSE;
 	GError *tmp_err = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (server));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
 	g_assert (foldername != NULL);
 	g_assert (G_IS_CANCELLABLE (cancellable));
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-	self = server;
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
 
 	/* hash table lookup */
@@ -258,13 +249,12 @@ camel_kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *server,
 }
 
 gboolean
-camel_kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *self,
                                          const gchar *foldername,
                                          KolabFolderTypeID foldertype,
                                          GCancellable *cancellable,
                                          GError **err)
 {
-	CamelKolabIMAPXServer *self = NULL;
 	CamelKolabIMAPXServerPrivate *priv = NULL;
 	CamelIMAPXExtdServer *eserver = NULL;
 	CamelOfflineStore *ostore = NULL;
@@ -279,12 +269,11 @@ camel_kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *server,
 	gboolean db_ok = FALSE;
 	GError *tmp_err = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (server));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
 	g_assert (foldername != NULL);
 	g_assert (G_IS_CANCELLABLE (cancellable));
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-	self = server;
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
 
 	/* check whether we're online */
@@ -354,11 +343,10 @@ camel_kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *server,
  *            become too long to properly handle it!
  */
 gboolean
-camel_kolab_imapx_server_retrieve_all_folder_types (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_retrieve_all_folder_types (CamelKolabIMAPXServer *self,
                                                     GCancellable *cancellable,
                                                     GError **err)
 {
-	CamelKolabIMAPXServer *self = NULL;
 	CamelKolabIMAPXServerPrivate *priv = NULL;
 	CamelIMAPXExtdServer *eserver = NULL;
 	CamelOfflineStore *ostore = NULL;
@@ -366,11 +354,10 @@ camel_kolab_imapx_server_retrieve_all_folder_types (CamelKolabIMAPXServer *serve
 	camel_imapx_metadata_proto_t proto = CAMEL_IMAPX_METADATA_PROTO_INVAL;
 	GError *tmp_err = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (server));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
 	g_assert (G_IS_CANCELLABLE (cancellable));
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-	self = server;
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
 
 	/* check whether we're online */
diff --git a/src/camel/camel-kolab-imapx-server.h b/src/camel/camel-kolab-imapx-server.h
index 342a5b5..bacd721 100644
--- a/src/camel/camel-kolab-imapx-server.h
+++ b/src/camel/camel-kolab-imapx-server.h
@@ -77,31 +77,31 @@ GType
 camel_kolab_imapx_server_get_type (void);
 
 CamelKolabImapxMetadata*
-camel_kolab_imapx_server_get_metadata (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_get_metadata (CamelKolabIMAPXServer *self,
                                        gboolean do_resect,
                                        GError **err);
 
 gboolean
-camel_kolab_imapx_server_set_metadata (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_set_metadata (CamelKolabIMAPXServer *self,
                                        CamelKolabImapxMetadata *kmd,
                                        GError **err);
 
 KolabFolderTypeID
-camel_kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *self,
                                          const gchar *foldername,
                                          gboolean do_updatedb,
                                          GCancellable *cancellable,
                                          GError **err);
 
 gboolean
-camel_kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *self,
                                          const gchar *foldername,
                                          KolabFolderTypeID foldertype,
                                          GCancellable *cancellable,
                                          GError **err);
 
 gboolean
-camel_kolab_imapx_server_retrieve_all_folder_types (CamelKolabIMAPXServer *server,
+camel_kolab_imapx_server_retrieve_all_folder_types (CamelKolabIMAPXServer *self,
                                                     GCancellable *cancellable,
                                                     GError **err);
 
diff --git a/src/camel/camel-kolab-imapx-settings.c b/src/camel/camel-kolab-imapx-settings.c
index 00807c1..d1fad2d 100644
--- a/src/camel/camel-kolab-imapx-settings.c
+++ b/src/camel/camel-kolab-imapx-settings.c
@@ -46,14 +46,11 @@ G_DEFINE_TYPE (CamelKolabIMAPXSettings, camel_kolab_imapx_settings, CAMEL_TYPE_I
 /* object/class init */
 
 static void
-camel_kolab_imapx_settings_init (CamelKolabIMAPXSettings *object)
+camel_kolab_imapx_settings_init (CamelKolabIMAPXSettings *self)
 {
-	CamelKolabIMAPXSettings *self = NULL;
 	CamelKolabIMAPXSettingsPrivate *priv = NULL;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_SETTINGS (object));
-
-	self = object;
+	g_assert (CAMEL_IS_KOLAB_IMAPX_SETTINGS (self));
 	priv = CAMEL_KOLAB_IMAPX_SETTINGS_PRIVATE (self);
 
 	priv->foo = 0; /* FIXME */
diff --git a/src/camel/camel-kolab-imapx-store.c b/src/camel/camel-kolab-imapx-store.c
index 6af196f..fbcbd5e 100644
--- a/src/camel/camel-kolab-imapx-store.c
+++ b/src/camel/camel-kolab-imapx-store.c
@@ -91,15 +91,12 @@ G_DEFINE_TYPE_WITH_CODE (CamelKolabIMAPXStore,
 /* class functions */
 
 static void
-camel_kolab_imapx_store_init (CamelKolabIMAPXStore *store)
+camel_kolab_imapx_store_init (CamelKolabIMAPXStore *self)
 {
-	CamelKolabIMAPXStore *self = NULL;
 	CamelKolabIMAPXStorePrivate *priv = NULL;
 	gint ii = 0;
 
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
-
-	self = store;
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	priv = CAMEL_KOLAB_IMAPX_STORE_PRIVATE (self);
 
 	/* FIXME get the CamelKolabIMAPXServer instance */
@@ -308,11 +305,11 @@ camel_kolab_imapx_store_name_equal (gconstpointer a,
 }
 
 static gboolean
-camel_kolab_imapx_store_can_refresh_folder (CamelStore *store,
+camel_kolab_imapx_store_can_refresh_folder (CamelStore *self,
                                             CamelFolderInfo *finfo,
                                             GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	g_assert (finfo != NULL);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
@@ -323,13 +320,13 @@ camel_kolab_imapx_store_can_refresh_folder (CamelStore *store,
 }
 
 static CamelFolder*
-camel_kolab_imapx_store_get_folder_sync (CamelStore *store,
+camel_kolab_imapx_store_get_folder_sync (CamelStore *self,
                                          const gchar *foldername,
                                          CamelStoreGetFolderFlags flags,
                                          GCancellable *cancellable,
                                          GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	(void)foldername; /* FIXME */
 	(void)flags; /* FIXME */
 	g_assert (G_IS_CANCELLABLE (cancellable));
@@ -342,13 +339,13 @@ camel_kolab_imapx_store_get_folder_sync (CamelStore *store,
 }
 
 static CamelFolderInfo*
-camel_kolab_imapx_store_get_folder_info_sync (CamelStore *store,
+camel_kolab_imapx_store_get_folder_info_sync (CamelStore *self,
                                               const gchar *top,
                                               CamelStoreGetFolderInfoFlags flags,
                                               GCancellable *cancellable,
                                               GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	(void)top; /* FIXME */ /* top may be NULL */
 	(void)flags; /* FIXME */
 	g_assert (G_IS_CANCELLABLE (cancellable));
@@ -361,11 +358,11 @@ camel_kolab_imapx_store_get_folder_info_sync (CamelStore *store,
 }
 
 static CamelFolder*
-camel_kolab_imapx_store_get_junk_folder_sync (CamelStore *store,
+camel_kolab_imapx_store_get_junk_folder_sync (CamelStore *self,
                                               GCancellable *cancellable,
                                               GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	g_assert (G_IS_CANCELLABLE (cancellable));
 	g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
@@ -376,11 +373,11 @@ camel_kolab_imapx_store_get_junk_folder_sync (CamelStore *store,
 }
 
 static CamelFolder*
-camel_kolab_imapx_store_get_trash_folder_sync (CamelStore *store,
+camel_kolab_imapx_store_get_trash_folder_sync (CamelStore *self,
                                                GCancellable *cancellable,
                                                GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	g_assert (G_IS_CANCELLABLE (cancellable));
 	g_return_val_if_fail (err == NULL || *err == NULL, NULL);
 
@@ -391,13 +388,13 @@ camel_kolab_imapx_store_get_trash_folder_sync (CamelStore *store,
 }
 
 static CamelFolderInfo*
-camel_kolab_imapx_store_create_folder_sync (CamelStore *store,
+camel_kolab_imapx_store_create_folder_sync (CamelStore *self,
                                             const gchar *parentname,
                                             const gchar *foldername,
                                             GCancellable *cancellable,
                                             GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	(void)parentname; /* FIXME */
 	(void)foldername; /* FIXME */
 	g_assert (G_IS_CANCELLABLE (cancellable));
@@ -410,12 +407,12 @@ camel_kolab_imapx_store_create_folder_sync (CamelStore *store,
 }
 
 static gboolean
-camel_kolab_imapx_store_delete_folder_sync (CamelStore *store,
+camel_kolab_imapx_store_delete_folder_sync (CamelStore *self,
                                             const gchar *foldername,
                                             GCancellable *cancellable,
                                             GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	(void)foldername; /* FIXME */
 	g_assert (G_IS_CANCELLABLE (cancellable));
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
@@ -427,13 +424,13 @@ camel_kolab_imapx_store_delete_folder_sync (CamelStore *store,
 }
 
 static gboolean
-camel_kolab_imapx_store_rename_folder_sync (CamelStore *store,
+camel_kolab_imapx_store_rename_folder_sync (CamelStore *self,
                                             const gchar *foldername_old,
                                             const gchar *foldername_new,
                                             GCancellable *cancellable,
                                             GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	(void)foldername_old; /* FIXME */
 	(void)foldername_new; /* FIXME */
 	g_assert (G_IS_CANCELLABLE (cancellable));
@@ -446,11 +443,11 @@ camel_kolab_imapx_store_rename_folder_sync (CamelStore *store,
 }
 
 static gboolean
-camel_kolab_imapx_store_noop_sync (CamelStore *store,
+camel_kolab_imapx_store_noop_sync (CamelStore *self,
                                    GCancellable *cancellable,
                                    GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	g_assert (G_IS_CANCELLABLE (cancellable));
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
@@ -615,12 +612,12 @@ camel_kolab_imapx_store_class_init (CamelKolabIMAPXStoreClass *klass)
 /* API functions */
 
 CamelKolabIMAPXServer*
-camel_kolab_imapx_store_get_server (CamelKolabIMAPXStore *store,
+camel_kolab_imapx_store_get_server (CamelKolabIMAPXStore *self,
                                     const gchar *foldername,
                                     GCancellable *cancellable,
                                     GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	(void)foldername; /* FIXME */
 	g_assert (G_IS_CANCELLABLE (cancellable));
 	g_return_val_if_fail (err == NULL || *err == NULL, NULL);
@@ -632,10 +629,10 @@ camel_kolab_imapx_store_get_server (CamelKolabIMAPXStore *store,
 }
 
 gboolean
-camel_kolab_imapx_store_set_folder_creation_type (CamelKolabIMAPXStore *store,
+camel_kolab_imapx_store_set_folder_creation_type (CamelKolabIMAPXStore *self,
                                                   KolabFolderTypeID type_id)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	g_assert ((type_id > KOLAB_FOLDER_TYPE_UNKNOWN) &&
 	          (type_id < KOLAB_FOLDER_LAST_TYPE));
 
@@ -646,10 +643,10 @@ camel_kolab_imapx_store_set_folder_creation_type (CamelKolabIMAPXStore *store,
 }
 
 gboolean
-camel_kolab_imapx_store_set_folder_context (CamelKolabIMAPXStore *store,
+camel_kolab_imapx_store_set_folder_context (CamelKolabIMAPXStore *self,
                                             KolabFolderContextID context)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	g_assert ((context > KOLAB_FOLDER_CONTEXT_INVAL) &&
 	          (context < KOLAB_FOLDER_LAST_CONTEXT));
 
@@ -660,11 +657,11 @@ camel_kolab_imapx_store_set_folder_context (CamelKolabIMAPXStore *store,
 }
 
 KolabFolderTypeID
-camel_kolab_imapx_store_get_folder_type (CamelKolabIMAPXStore *store,
+camel_kolab_imapx_store_get_folder_type (CamelKolabIMAPXStore *self,
                                          const gchar *foldername,
                                          GError **err)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 	(void)foldername; /* FIXME */
 	g_return_val_if_fail (err == NULL || *err == NULL, KOLAB_FOLDER_TYPE_INVAL);
 
@@ -675,9 +672,9 @@ camel_kolab_imapx_store_get_folder_type (CamelKolabIMAPXStore *store,
 }
 
 GList*
-camel_kolab_imapx_store_resect_folder_list (CamelKolabIMAPXStore *store)
+camel_kolab_imapx_store_resect_folder_list (CamelKolabIMAPXStore *self)
 {
-	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (store));
+	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (self));
 
 	/* FIXME remove me */
 	g_error ("%s: FIXME implement me", __func__);
diff --git a/src/camel/camel-kolab-imapx-store.h b/src/camel/camel-kolab-imapx-store.h
index 722d521..c099e87 100644
--- a/src/camel/camel-kolab-imapx-store.h
+++ b/src/camel/camel-kolab-imapx-store.h
@@ -82,29 +82,29 @@ GType camel_kolab_imapx_store_get_type (void);
 
 /* CamelServer getter */
 CamelKolabIMAPXServer*
-camel_kolab_imapx_store_get_server (CamelKolabIMAPXStore *store,
+camel_kolab_imapx_store_get_server (CamelKolabIMAPXStore *self,
                                     const gchar *foldername,
                                     GCancellable *cancellable,
                                     GError **err);
 
 /* Kolab extension: set type for newly created folders */
 gboolean
-camel_kolab_imapx_store_set_folder_creation_type (CamelKolabIMAPXStore *store,
+camel_kolab_imapx_store_set_folder_creation_type (CamelKolabIMAPXStore *self,
                                                   KolabFolderTypeID type_id);
 
 /* Kolab extension: set the folder context (email, calendar, contacts (defaults to email)) */
 gboolean
-camel_kolab_imapx_store_set_folder_context (CamelKolabIMAPXStore *store,
+camel_kolab_imapx_store_set_folder_context (CamelKolabIMAPXStore *self,
                                             KolabFolderContextID context);
 
 /* Kolab extension: get the folder type id */
 KolabFolderTypeID
-camel_kolab_imapx_store_get_folder_type (CamelKolabIMAPXStore *store,
+camel_kolab_imapx_store_get_folder_type (CamelKolabIMAPXStore *self,
                                          const gchar *foldername,
                                          GError **err);
 
 GList*
-camel_kolab_imapx_store_resect_folder_list (CamelKolabIMAPXStore *store);
+camel_kolab_imapx_store_resect_folder_list (CamelKolabIMAPXStore *self);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]