[evolution-kolab] KolabMailAccess: removed 'kolab_' prefix from static function names



commit 3cb3abb8d2f2e53bf09222cf9fb69bb5ec2fa19b
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Jul 12 18:57:48 2012 +0200

    KolabMailAccess: removed 'kolab_' prefix from static function names
    
    * keep 'kolab_' function name prefix only for API functions
      and for GObject init/finalize functions
    * this follows upstream convention

 src/libekolab/kolab-mail-access.c |  330 ++++++++++++++++++------------------
 1 files changed, 165 insertions(+), 165 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-access.c b/src/libekolab/kolab-mail-access.c
index 2b60919..9c0f985 100644
--- a/src/libekolab/kolab-mail-access.c
+++ b/src/libekolab/kolab-mail-access.c
@@ -83,10 +83,10 @@ G_DEFINE_TYPE_WITH_CODE (
 /*----------------------------------------------------------------------------*/
 /* object state transition */
 
-static GHashTable* kolab_mail_access_new_strans_table (void);
+static GHashTable* mail_access_new_strans_table (void);
 
 static KolabMailAccessState*
-kolab_mail_access_state_new (void)
+mail_access_state_new (void)
 {
 	KolabMailAccessState *state = g_new0 (KolabMailAccessState, 1);
 	state->opmode = KOLAB_MAIL_ACCESS_OPMODE_NEW;
@@ -94,7 +94,7 @@ kolab_mail_access_state_new (void)
 }
 
 static void
-kolab_mail_access_state_free (KolabMailAccessState *state)
+mail_access_state_free (KolabMailAccessState *state)
 {
 	if (state == NULL)
 		return;
@@ -106,10 +106,10 @@ kolab_mail_access_state_free (KolabMailAccessState *state)
 /* authentication attempts */
 
 static ESourceAuthenticationResult
-kolab_mail_access_try_password_sync (ESourceAuthenticator *authenticator,
-                                     const GString *password,
-                                     GCancellable *cancellable,
-                                     GError **error)
+mail_access_try_password_sync (ESourceAuthenticator *authenticator,
+                               const GString *password,
+                               GCancellable *cancellable,
+                               GError **error)
 {
 	/* FIXME This needs to test the provided password and return:
 	 *
@@ -142,7 +142,7 @@ kolab_mail_access_try_password_sync (ESourceAuthenticator *authenticator,
 static void
 kolab_mail_access_authenticator_init (ESourceAuthenticatorInterface *interface)
 {
-	interface->try_password_sync = kolab_mail_access_try_password_sync;
+	interface->try_password_sync = mail_access_try_password_sync;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -167,8 +167,8 @@ kolab_mail_access_init (KolabMailAccess *object)
 	priv->sidecache = KOLAB_MAIL_SIDE_CACHE (g_object_new (KOLAB_TYPE_MAIL_SIDE_CACHE, NULL));
 	priv->synchronizer = KOLAB_MAIL_SYNCHRONIZER (g_object_new (KOLAB_TYPE_MAIL_SYNCHRONIZER, NULL));
 
-	priv->state = kolab_mail_access_state_new ();
-	priv->stranstbl = kolab_mail_access_new_strans_table ();
+	priv->state = mail_access_state_new ();
+	priv->stranstbl = mail_access_new_strans_table ();
 
 	priv->handles = NULL;
 	g_mutex_init (&(priv->big_lock));
@@ -222,7 +222,7 @@ kolab_mail_access_finalize (GObject *object)
 	self = KOLAB_MAIL_ACCESS (object);
 	priv = KOLAB_MAIL_ACCESS_PRIVATE (self);
 
-	kolab_mail_access_state_free (priv->state);
+	mail_access_state_free (priv->state);
 
 	if (priv->handles)
 		g_hash_table_destroy (priv->handles);
@@ -252,9 +252,9 @@ kolab_mail_access_class_init (KolabMailAccessClass *klass)
 /* mailobject search/retrieve/store/delete */
 
 static gchar*
-kolab_mail_access_foldername_new_from_sourcename (KolabMailAccess *self,
-                                                  const gchar *sourcename,
-                                                  GError **err)
+mail_access_foldername_new_from_sourcename (KolabMailAccess *self,
+                                            const gchar *sourcename,
+                                            GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	gboolean exists = FALSE;
@@ -291,9 +291,9 @@ kolab_mail_access_foldername_new_from_sourcename (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_local_handle_attach_summary (KolabMailAccess *self,
-                                               KolabMailHandle *kmailhandle,
-                                               GError **err)
+mail_access_local_handle_attach_summary (KolabMailAccess *self,
+                                         KolabMailHandle *kmailhandle,
+                                         GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	const KolabMailSummary *summary = NULL;
@@ -365,10 +365,10 @@ kolab_mail_access_local_handle_attach_summary (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_update_handles_from_infodb (KolabMailAccess *self,
-                                              const gchar *foldername,
-                                              const gchar *sexp,
-                                              GError **err)
+mail_access_update_handles_from_infodb (KolabMailAccess *self,
+                                        const gchar *foldername,
+                                        const gchar *sexp,
+                                        GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	GHashTable *handles_tbl = NULL;
@@ -424,11 +424,11 @@ kolab_mail_access_update_handles_from_infodb (KolabMailAccess *self,
 }
 
 static KolabMailHandle*
-kolab_mail_access_local_handle_get_by_uid (KolabMailAccess *self,
-                                           const gchar *uid,
-                                           const gchar *foldername,
-                                           gboolean err_if_not_exists,
-                                           GError **err)
+mail_access_local_handle_get_by_uid (KolabMailAccess *self,
+                                     const gchar *uid,
+                                     const gchar *foldername,
+                                     gboolean err_if_not_exists,
+                                     GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	GHashTable *handles_tbl = NULL;
@@ -484,9 +484,9 @@ kolab_mail_access_local_handle_get_by_uid (KolabMailAccess *self,
 }
 
 static KolabMailHandle*
-kolab_mail_access_local_handle_get (KolabMailAccess *self,
-                                    const KolabMailHandle *kmailhandle,
-                                    GError **err)
+mail_access_local_handle_get (KolabMailAccess *self,
+                              const KolabMailHandle *kmailhandle,
+                              GError **err)
 {
 	KolabMailHandle *local_handle = NULL;
 	const gchar *uid = NULL;
@@ -516,11 +516,11 @@ kolab_mail_access_local_handle_get (KolabMailAccess *self,
 		return NULL;
 	}
 
-	local_handle = kolab_mail_access_local_handle_get_by_uid (self,
-	                                                          uid,
-	                                                          foldername,
-	                                                          FALSE,
-	                                                          &tmp_err);
+	local_handle = mail_access_local_handle_get_by_uid (self,
+	                                                    uid,
+	                                                    foldername,
+	                                                    FALSE,
+	                                                    &tmp_err);
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);
 		return NULL;
@@ -533,11 +533,11 @@ kolab_mail_access_local_handle_get (KolabMailAccess *self,
 /* mail/folder store/delete */
 
 static gboolean
-kolab_mail_access_local_store (KolabMailAccess *self,
-                               KolabMailHandle *kmailhandle,
-                               const gchar *foldername,
-                               GCancellable *cancellable,
-                               GError **err)
+mail_access_local_store (KolabMailAccess *self,
+                         KolabMailHandle *kmailhandle,
+                         const gchar *foldername,
+                         GCancellable *cancellable,
+                         GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	KolabMailHandle *local_handle = NULL;
@@ -569,9 +569,9 @@ kolab_mail_access_local_store (KolabMailAccess *self,
 	}
 
 	/* get (and replace) local handle */
-	local_handle = kolab_mail_access_local_handle_get (self,
-	                                                   kmailhandle,
-	                                                   &tmp_err);
+	local_handle = mail_access_local_handle_get (self,
+	                                             kmailhandle,
+	                                             &tmp_err);
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);
 		return FALSE;
@@ -737,11 +737,11 @@ kolab_mail_access_local_store (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_local_delete (KolabMailAccess *self,
-                                KolabMailHandle *kmailhandle,
-                                const gchar *foldername,
-                                GCancellable *cancellable,
-                                GError **err)
+mail_access_local_delete (KolabMailAccess *self,
+                          KolabMailHandle *kmailhandle,
+                          const gchar *foldername,
+                          GCancellable *cancellable,
+                          GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	KolabObjectCacheLocation location = KOLAB_OBJECT_CACHE_LOCATION_NONE;
@@ -768,9 +768,9 @@ kolab_mail_access_local_delete (KolabMailAccess *self,
 
 	if (kmailhandle != NULL) {
 		/* check whether we have a summary for the mail handle */
-		ok = kolab_mail_access_local_handle_attach_summary (self,
-		                                                    kmailhandle,
-		                                                    &tmp_err);
+		ok = mail_access_local_handle_attach_summary (self,
+		                                              kmailhandle,
+		                                              &tmp_err);
 		if (! ok) {
 			g_propagate_error (err, tmp_err);
 			return FALSE;
@@ -974,9 +974,9 @@ static gint opmode_values[] = {
 };
 
 static gboolean
-kolab_mail_access_strans_configured_offline (KolabMailAccess *self,
-                                             GCancellable *cancellable,
-                                             GError **err)
+mail_access_strans_configured_offline (KolabMailAccess *self,
+                                       GCancellable *cancellable,
+                                       GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	GList *folders_lst = NULL;
@@ -1072,10 +1072,10 @@ kolab_mail_access_strans_configured_offline (KolabMailAccess *self,
 	folders_lst_ptr = folders_lst;
 	while (folders_lst_ptr != NULL) {
 		gchar *foldername = (gchar *)(folders_lst_ptr->data);
-		ok = kolab_mail_access_update_handles_from_infodb (self,
-		                                                   foldername,
-		                                                   NULL, /* sexp */
-		                                                   &tmp_err);
+		ok = mail_access_update_handles_from_infodb (self,
+		                                             foldername,
+		                                             NULL, /* sexp */
+		                                             &tmp_err);
 		if (! ok)
 			break;
 		folders_lst_ptr = g_list_next (folders_lst_ptr);
@@ -1093,9 +1093,9 @@ kolab_mail_access_strans_configured_offline (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_strans_offline_online (KolabMailAccess *self,
-                                         GCancellable *cancellable,
-                                         GError **err)
+mail_access_strans_offline_online (KolabMailAccess *self,
+                                   GCancellable *cancellable,
+                                   GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	GList *folders_lst = NULL;
@@ -1166,10 +1166,10 @@ kolab_mail_access_strans_offline_online (KolabMailAccess *self,
 	folders_lst_ptr = folders_lst;
 	while (folders_lst_ptr != NULL) {
 		gchar *foldername = (gchar *)(folders_lst_ptr->data);
-		ok = kolab_mail_access_update_handles_from_infodb (self,
-		                                                   foldername,
-		                                                   NULL, /* sexp */
-		                                                   &tmp_err);
+		ok = mail_access_update_handles_from_infodb (self,
+		                                             foldername,
+		                                             NULL, /* sexp */
+		                                             &tmp_err);
 		if (! ok)
 			break;
 		folders_lst_ptr = g_list_next (folders_lst_ptr);
@@ -1187,9 +1187,9 @@ kolab_mail_access_strans_offline_online (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_strans_configured_online (KolabMailAccess *self,
-                                            GCancellable *cancellable,
-                                            GError **err)
+mail_access_strans_configured_online (KolabMailAccess *self,
+                                      GCancellable *cancellable,
+                                      GError **err)
 {
 	gboolean ok = FALSE;
 	GError *tmp_err = NULL;
@@ -1198,17 +1198,17 @@ kolab_mail_access_strans_configured_online (KolabMailAccess *self,
 	/* cancellable may be NULL */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-	ok = kolab_mail_access_strans_configured_offline (self,
-	                                                  cancellable,
-	                                                  &tmp_err);
+	ok = mail_access_strans_configured_offline (self,
+	                                            cancellable,
+	                                            &tmp_err);
 	if (! ok) {
 		g_propagate_error (err, tmp_err);
 		return FALSE;
 	}
 
-	ok = kolab_mail_access_strans_offline_online (self,
-	                                              cancellable,
-	                                              &tmp_err);
+	ok = mail_access_strans_offline_online (self,
+	                                        cancellable,
+	                                        &tmp_err);
 	if (! ok) {
 		g_propagate_error (err, tmp_err);
 		return FALSE;
@@ -1218,9 +1218,9 @@ kolab_mail_access_strans_configured_online (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_strans_online_offline (KolabMailAccess *self,
-                                         GCancellable *cancellable,
-                                         GError **err)
+mail_access_strans_online_offline (KolabMailAccess *self,
+                                   GCancellable *cancellable,
+                                   GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	GList *folders_lst = NULL;
@@ -1306,10 +1306,10 @@ kolab_mail_access_strans_online_offline (KolabMailAccess *self,
 	folders_lst_ptr = folders_lst;
 	while (folders_lst_ptr != NULL) {
 		gchar *foldername = (gchar *)(folders_lst_ptr->data);
-		ok = kolab_mail_access_update_handles_from_infodb (self,
-		                                                   foldername,
-		                                                   NULL, /* sexp */
-		                                                   &tmp_err);
+		ok = mail_access_update_handles_from_infodb (self,
+		                                             foldername,
+		                                             NULL, /* sexp */
+		                                             &tmp_err);
 		if (! ok)
 			break;
 		folders_lst_ptr = g_list_next (folders_lst_ptr);
@@ -1327,9 +1327,9 @@ kolab_mail_access_strans_online_offline (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_strans_offline_shutdown (KolabMailAccess *self,
-                                           GCancellable *cancellable,
-                                           GError **err)
+mail_access_strans_offline_shutdown (KolabMailAccess *self,
+                                     GCancellable *cancellable,
+                                     GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	gboolean ok = FALSE;
@@ -1420,9 +1420,9 @@ kolab_mail_access_strans_offline_shutdown (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_strans_online_shutdown (KolabMailAccess *self,
-                                          GCancellable *cancellable,
-                                          GError **err)
+mail_access_strans_online_shutdown (KolabMailAccess *self,
+                                    GCancellable *cancellable,
+                                    GError **err)
 {
 	gboolean ok = FALSE;
 	GError *tmp_err = NULL;
@@ -1431,17 +1431,17 @@ kolab_mail_access_strans_online_shutdown (KolabMailAccess *self,
 	/* cancellable may be NULL */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-	ok = kolab_mail_access_strans_online_offline (self,
-	                                              cancellable,
-	                                              &tmp_err);
+	ok = mail_access_strans_online_offline (self,
+	                                        cancellable,
+	                                        &tmp_err);
 	if (! ok) {
 		g_propagate_error (err, tmp_err);
 		return FALSE;
 	}
 
-	ok = kolab_mail_access_strans_offline_shutdown (self,
-	                                                cancellable,
-	                                                &tmp_err);
+	ok = mail_access_strans_offline_shutdown (self,
+	                                          cancellable,
+	                                          &tmp_err);
 	if (! ok) {
 		g_propagate_error (err, tmp_err);
 		return FALSE;
@@ -1451,9 +1451,9 @@ kolab_mail_access_strans_online_shutdown (KolabMailAccess *self,
 }
 
 static gboolean
-kolab_mail_access_strans_shutdown_configured (KolabMailAccess *self,
-                                              GCancellable *cancellable,
-                                              GError **err)
+mail_access_strans_shutdown_configured (KolabMailAccess *self,
+                                        GCancellable *cancellable,
+                                        GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 
@@ -1483,7 +1483,7 @@ kolab_mail_access_strans_shutdown_configured (KolabMailAccess *self,
 }
 
 static GHashTable*
-kolab_mail_access_new_strans_table (void)
+mail_access_new_strans_table (void)
 {
 	GHashTable *stranstbl = NULL;
 	GHashTable *tmp_tbl = NULL;
@@ -1499,13 +1499,13 @@ kolab_mail_access_new_strans_table (void)
 	tmp_tbl = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, g_free);
 	/* configured -> offline */
 	tmp_stf = g_new0 (KolabMailAccessSTFWrap, 1);
-	tmp_stf->fn = kolab_mail_access_strans_configured_offline;
+	tmp_stf->fn = mail_access_strans_configured_offline;
 	g_hash_table_insert (tmp_tbl,
 	                     &opmode_values[KOLAB_MAIL_ACCESS_OPMODE_OFFLINE],
 	                     tmp_stf);
 	/* configured -> online */
 	tmp_stf = g_new0 (KolabMailAccessSTFWrap, 1);
-	tmp_stf->fn = kolab_mail_access_strans_configured_online;
+	tmp_stf->fn = mail_access_strans_configured_online;
 	g_hash_table_insert (tmp_tbl,
 	                     &opmode_values[KOLAB_MAIL_ACCESS_OPMODE_ONLINE],
 	                     tmp_stf);
@@ -1518,13 +1518,13 @@ kolab_mail_access_new_strans_table (void)
 	tmp_tbl = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, g_free);
 	/* offline -> online */
 	tmp_stf = g_new0 (KolabMailAccessSTFWrap, 1);
-	tmp_stf->fn = kolab_mail_access_strans_offline_online;
+	tmp_stf->fn = mail_access_strans_offline_online;
 	g_hash_table_insert (tmp_tbl,
 	                     &opmode_values[KOLAB_MAIL_ACCESS_OPMODE_ONLINE],
 	                     tmp_stf);
 	/* offline -> shutdown */
 	tmp_stf = g_new0 (KolabMailAccessSTFWrap, 1);
-	tmp_stf->fn = kolab_mail_access_strans_offline_shutdown;
+	tmp_stf->fn = mail_access_strans_offline_shutdown;
 	g_hash_table_insert (tmp_tbl,
 	                     &opmode_values[KOLAB_MAIL_ACCESS_OPMODE_SHUTDOWN],
 	                     tmp_stf);
@@ -1537,13 +1537,13 @@ kolab_mail_access_new_strans_table (void)
 	tmp_tbl = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, g_free);
 	/* online -> offline */
 	tmp_stf = g_new0 (KolabMailAccessSTFWrap, 1);
-	tmp_stf->fn = kolab_mail_access_strans_online_offline;
+	tmp_stf->fn = mail_access_strans_online_offline;
 	g_hash_table_insert (tmp_tbl,
 	                     &opmode_values[KOLAB_MAIL_ACCESS_OPMODE_OFFLINE],
 	                     tmp_stf);
 	/* online -> shutdown */
 	tmp_stf = g_new0 (KolabMailAccessSTFWrap, 1);
-	tmp_stf->fn = kolab_mail_access_strans_online_shutdown;
+	tmp_stf->fn = mail_access_strans_online_shutdown;
 	g_hash_table_insert (tmp_tbl,
 	                     &opmode_values[KOLAB_MAIL_ACCESS_OPMODE_SHUTDOWN],
 	                     tmp_stf);
@@ -1556,7 +1556,7 @@ kolab_mail_access_new_strans_table (void)
 	tmp_tbl = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, g_free);
 	/* shutdown -> configured */
 	tmp_stf = g_new0 (KolabMailAccessSTFWrap, 1);
-	tmp_stf->fn = kolab_mail_access_strans_shutdown_configured;
+	tmp_stf->fn = mail_access_strans_shutdown_configured;
 	g_hash_table_insert (tmp_tbl,
 	                     &opmode_values[KOLAB_MAIL_ACCESS_OPMODE_CONFIGURED],
 	                     tmp_stf);
@@ -1569,9 +1569,9 @@ kolab_mail_access_new_strans_table (void)
 }
 
 static KolabMailAccessStateTransitionFunc
-kolab_mail_access_get_strans_func (KolabMailAccess *self,
-                                   KolabMailAccessOpmodeID opmode,
-                                   GError **err)
+mail_access_get_strans_func (KolabMailAccess *self,
+                             KolabMailAccessOpmodeID opmode,
+                             GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
 	KolabMailAccessSTFWrap *stf = NULL;
@@ -1902,7 +1902,7 @@ kolab_mail_access_set_opmode (KolabMailAccess *self,
 		goto exit;
 
 	/* get transition function for (current opmode) -> (opmode) */
-	strans_fn = kolab_mail_access_get_strans_func (self, opmode, &tmp_err);
+	strans_fn = mail_access_get_strans_func (self, opmode, &tmp_err);
 	if (strans_fn == NULL) {
 		strans_ok = FALSE;
 		goto exit;
@@ -2030,9 +2030,9 @@ kolab_mail_access_query_uids (KolabMailAccess *self,
 	if (priv->state->opmode <= KOLAB_MAIL_ACCESS_OPMODE_CONFIGURED)
 		goto exit;
 
-	foldername = kolab_mail_access_foldername_new_from_sourcename (self,
-	                                                               sourcename,
-	                                                               &tmp_err);
+	foldername = mail_access_foldername_new_from_sourcename (self,
+	                                                         sourcename,
+	                                                         &tmp_err);
 	if (foldername == NULL)
 		goto exit;
 
@@ -2112,9 +2112,9 @@ kolab_mail_access_query_changed_uids (KolabMailAccess *self,
 	if (priv->state->opmode <= KOLAB_MAIL_ACCESS_OPMODE_CONFIGURED)
 		goto exit;
 
-	foldername = kolab_mail_access_foldername_new_from_sourcename (self,
-	                                                               sourcename,
-	                                                               &tmp_err);
+	foldername = mail_access_foldername_new_from_sourcename (self,
+	                                                         sourcename,
+	                                                         &tmp_err);
 	if (tmp_err != NULL)
 		goto exit;
 
@@ -2127,10 +2127,10 @@ kolab_mail_access_query_changed_uids (KolabMailAccess *self,
 		if (! ok)
 			goto exit;
 
-		ok = kolab_mail_access_update_handles_from_infodb (self,
-		                                                   foldername,
-		                                                   sexp,
-		                                                   &tmp_err);
+		ok = mail_access_update_handles_from_infodb (self,
+		                                             foldername,
+		                                             sexp,
+		                                             &tmp_err);
 		if (! ok)
 			goto exit;
 	}
@@ -2212,9 +2212,9 @@ kolab_mail_access_get_handle (KolabMailAccess *self,
 		goto exit;
 
 	/* map Evo calendar name to Kolab folder name */
-	foldername = kolab_mail_access_foldername_new_from_sourcename (self,
-	                                                               sourcename,
-	                                                               &tmp_err);
+	foldername = mail_access_foldername_new_from_sourcename (self,
+	                                                         sourcename,
+	                                                         &tmp_err);
 	if (tmp_err != NULL)
 		goto exit;
 
@@ -2365,9 +2365,9 @@ kolab_mail_access_store_handle (KolabMailAccess *self,
 	/* folder check */
 
 	/* sourcename data */
-	sourcename_fn = kolab_mail_access_foldername_new_from_sourcename (self,
-	                                                                  sourcename,
-	                                                                  &tmp_err);
+	sourcename_fn = mail_access_foldername_new_from_sourcename (self,
+	                                                            sourcename,
+	                                                            &tmp_err);
 	if (sourcename_fn == NULL)
 		goto exit;
 
@@ -2403,11 +2403,11 @@ kolab_mail_access_store_handle (KolabMailAccess *self,
 	}
 
 	/* store operation */
-	ok = kolab_mail_access_local_store (self,
-	                                    kmailhandle,
-	                                    sourcename_fn,
-	                                    cancellable,
-	                                    &tmp_err);
+	ok = mail_access_local_store (self,
+	                              kmailhandle,
+	                              sourcename_fn,
+	                              cancellable,
+	                              &tmp_err);
 	if (! ok)
 		goto exit;
 
@@ -2498,9 +2498,9 @@ kolab_mail_access_retrieve_handle (KolabMailAccess *self,
 		goto exit;
 
 	/* lookup mail handle in local databases */
-	local_handle = kolab_mail_access_local_handle_get (self,
-	                                                   kmailhandle,
-	                                                   &tmp_err);
+	local_handle = mail_access_local_handle_get (self,
+	                                             kmailhandle,
+	                                             &tmp_err);
 	if (tmp_err != NULL)
 		goto exit;
 
@@ -2513,9 +2513,9 @@ kolab_mail_access_retrieve_handle (KolabMailAccess *self,
 	}
 
 	/* check whether we have a summary for the mail handle */
-	ok = kolab_mail_access_local_handle_attach_summary (self,
-	                                                    local_handle,
-	                                                    &tmp_err);
+	ok = mail_access_local_handle_attach_summary (self,
+	                                              local_handle,
+	                                              &tmp_err);
 	if (! ok)
 		goto exit;
 
@@ -2658,9 +2658,9 @@ kolab_mail_access_delete_handle (KolabMailAccess *self,
 		goto exit;
 
 	/* lookup mail handle in local databases */
-	local_handle = kolab_mail_access_local_handle_get (self,
-	                                                   kmailhandle,
-	                                                   &tmp_err);
+	local_handle = mail_access_local_handle_get (self,
+	                                             kmailhandle,
+	                                             &tmp_err);
 	if (tmp_err != NULL)
 		goto exit;
 
@@ -2676,11 +2676,11 @@ kolab_mail_access_delete_handle (KolabMailAccess *self,
 	foldername = g_strdup (kolab_mail_handle_get_foldername (kmailhandle));
 
 	/* delete local handle */
-	ok = kolab_mail_access_local_delete (self,
-	                                     local_handle,
-	                                     foldername,
-	                                     cancellable,
-	                                     &tmp_err);
+	ok = mail_access_local_delete (self,
+	                               local_handle,
+	                               foldername,
+	                               cancellable,
+	                               &tmp_err);
 	if (! ok) {
 		g_warning ("%s: UID (%s) Folder (%s) error destroying: %s",
 		           __func__, uid, foldername, tmp_err->message);
@@ -2756,18 +2756,18 @@ kolab_mail_access_delete_by_uid (KolabMailAccess *self,
 	if (priv->state->opmode <= KOLAB_MAIL_ACCESS_OPMODE_CONFIGURED)
 		goto exit;
 
-	foldername = kolab_mail_access_foldername_new_from_sourcename (self,
-	                                                               sourcename,
-	                                                               &tmp_err);
+	foldername = mail_access_foldername_new_from_sourcename (self,
+	                                                         sourcename,
+	                                                         &tmp_err);
 	if (tmp_err != NULL)
 		goto exit;
 
 	/* lookup mail handle in local databases */
-	local_handle = kolab_mail_access_local_handle_get_by_uid (self,
-	                                                          uid,
-	                                                          foldername,
-	                                                          FALSE,
-	                                                          &tmp_err);
+	local_handle = mail_access_local_handle_get_by_uid (self,
+	                                                    uid,
+	                                                    foldername,
+	                                                    FALSE,
+	                                                    &tmp_err);
 	if (tmp_err != NULL)
 		goto exit;
 
@@ -2778,11 +2778,11 @@ kolab_mail_access_delete_by_uid (KolabMailAccess *self,
 	}
 
 	/* delete local handle */
-	ok = kolab_mail_access_local_delete (self,
-	                                     local_handle,
-	                                     foldername,
-	                                     cancellable,
-	                                     &tmp_err);
+	ok = mail_access_local_delete (self,
+	                               local_handle,
+	                               foldername,
+	                               cancellable,
+	                               &tmp_err);
 	if (! ok)
 		goto exit;
 
@@ -2949,11 +2949,11 @@ kolab_mail_access_create_source (KolabMailAccess *self,
 		goto exit;
 
 	/* create folder */
-	ok = kolab_mail_access_local_store (self,
-	                                    NULL,
-	                                    sourcename,
-	                                    cancellable,
-	                                    &tmp_err);
+	ok = mail_access_local_store (self,
+	                              NULL,
+	                              sourcename,
+	                              cancellable,
+	                              &tmp_err);
  exit:
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);
@@ -3029,11 +3029,11 @@ kolab_mail_access_delete_source (KolabMailAccess *self,
 		goto exit;
 
 	/* delete folder */
-	ok = kolab_mail_access_local_delete (self,
-	                                     NULL,
-	                                     sourcename,
-	                                     cancellable,
-	                                     &tmp_err);
+	ok = mail_access_local_delete (self,
+	                               NULL,
+	                               sourcename,
+	                               cancellable,
+	                               &tmp_err);
  exit:
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);



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