[evolution-kolab] Remove kolab_util_backend_foldername_new_from_sourcename().

[Matthew Barnes <mbarnes src gnome org>]

commit f06effc6737f676eae98216fd332853d468c8bef
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jun 27 11:51:27 2012 -0400

    Remove kolab_util_backend_foldername_new_from_sourcename().
    
    The function was just returning a duplicate of the input string.
    Christian assures me "foldernames" and "sourcenames" are effectively
    synonymous, so we can simplify the code a bit.

 src/libekolab/kolab-mail-access.c  |   59 +++++-------------------------------
 src/libekolab/kolab-util-backend.c |   14 --------
 src/libekolab/kolab-util-backend.h |    3 --
 3 files changed, 8 insertions(+), 68 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-access.c b/src/libekolab/kolab-mail-access.c
index b386649..b74405d 100644
--- a/src/libekolab/kolab-mail-access.c
+++ b/src/libekolab/kolab-mail-access.c
@@ -206,7 +206,6 @@ kolab_mail_access_foldername_new_from_sourcename (KolabMailAccess *self,
                                                   GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
-	gchar *foldername = NULL;
 	gboolean exists = FALSE;
 	GError *tmp_err = NULL;
 
@@ -219,21 +218,12 @@ kolab_mail_access_foldername_new_from_sourcename (KolabMailAccess *self,
 	if (sourcename == NULL)
 		return NULL;
 
-	/* map Evo sourcename to Kolab foldername */
-	foldername = kolab_util_backend_foldername_new_from_sourcename (sourcename,
-	                                                                &tmp_err);
-	if (foldername == NULL) {
-		g_propagate_error (err, tmp_err);
-		return NULL;
-	}
-
 	/* foldername may exist in KolabMailSideCache only */
 	exists = kolab_mail_info_db_exists_foldername (priv->infodb,
-	                                               foldername,
+	                                               sourcename,
 	                                               &tmp_err);
 	/* error checks */
 	if (tmp_err != NULL) {
-		g_free (foldername);
 		g_propagate_error (err, tmp_err);
 		return NULL;
 	}
@@ -242,12 +232,11 @@ kolab_mail_access_foldername_new_from_sourcename (KolabMailAccess *self,
 		             KOLAB_BACKEND_ERROR,
 		             KOLAB_BACKEND_ERROR_INFODB_NOFOLDER,
 		             _("Folder name '%s' is unknown to internal database"),
-		             foldername);
-		g_free (foldername);
+		             sourcename);
 		return NULL;
 	}
 
-	return foldername;
+	return g_strdup (sourcename);
 }
 
 static gboolean
@@ -2880,7 +2869,6 @@ kolab_mail_access_create_source (KolabMailAccess *self,
                                  GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
-	gchar *foldername = NULL;
 	gboolean exists = FALSE;
 	gboolean ok = TRUE;
 	GError *tmp_err = NULL;
@@ -2897,15 +2885,9 @@ kolab_mail_access_create_source (KolabMailAccess *self,
 	if (priv->state->opmode <= KOLAB_MAIL_ACCESS_OPMODE_CONFIGURED)
 		goto exit;
 
-	/* map Evo sourcename to Kolab foldername */
-	foldername = kolab_util_backend_foldername_new_from_sourcename (sourcename,
-	                                                                &tmp_err);
-	if (foldername == NULL)
-		goto exit;
-
 	/* check whether folder exists */
 	exists = kolab_mail_info_db_exists_foldername (priv->infodb,
-	                                               foldername,
+	                                               sourcename,
 	                                               &tmp_err);
 	if (tmp_err != NULL) {
 		ok = FALSE;
@@ -2918,13 +2900,10 @@ kolab_mail_access_create_source (KolabMailAccess *self,
 	/* create folder */
 	ok = kolab_mail_access_local_store (self,
 	                                    NULL,
-	                                    foldername,
+	                                    sourcename,
 	                                    cancellable,
 	                                    &tmp_err);
  exit:
-	if (foldername != NULL)
-		g_free (foldername);
-
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);
 		ok = FALSE;
@@ -2970,7 +2949,6 @@ kolab_mail_access_delete_source (KolabMailAccess *self,
                                  GError **err)
 {
 	KolabMailAccessPrivate *priv = NULL;
-	gchar *foldername = NULL;
 	gboolean exists = FALSE;
 	gboolean ok = TRUE;
 	GError *tmp_err = NULL;
@@ -2987,17 +2965,9 @@ kolab_mail_access_delete_source (KolabMailAccess *self,
 	if (priv->state->opmode <= KOLAB_MAIL_ACCESS_OPMODE_CONFIGURED)
 		goto exit;
 
-	/* map Evo sourcename to Kolab foldername */
-	foldername = kolab_util_backend_foldername_new_from_sourcename (sourcename,
-	                                                                &tmp_err);
-	if (foldername == NULL) {
-		ok = FALSE;
-		goto exit;
-	}
-
 	/* check whether folder exists */
 	exists = kolab_mail_info_db_exists_foldername (priv->infodb,
-	                                               foldername,
+	                                               sourcename,
 	                                               &tmp_err);
 	if (tmp_err != NULL) {
 		ok = FALSE;
@@ -3010,13 +2980,10 @@ kolab_mail_access_delete_source (KolabMailAccess *self,
 	/* delete folder */
 	ok = kolab_mail_access_local_delete (self,
 	                                     NULL,
-	                                     foldername,
+	                                     sourcename,
 	                                     cancellable,
 	                                     &tmp_err);
  exit:
-	if (foldername != NULL)
-		g_free (foldername);
-
 	if (tmp_err != NULL) {
 		g_propagate_error (err, tmp_err);
 		ok = FALSE;
@@ -3053,7 +3020,6 @@ kolab_mail_access_source_fbtrigger_needed (KolabMailAccess *self,
 	KolabMailAccessPrivate *priv = NULL;
 	KolabFolderSummary *summary = NULL;
 	KolabFolderTypeID folder_type = KOLAB_FOLDER_TYPE_INVAL;
-	gchar *foldername = NULL;
 	gboolean trigger_needed = FALSE;
 	GError *tmp_err = NULL;
 
@@ -3069,15 +3035,9 @@ kolab_mail_access_source_fbtrigger_needed (KolabMailAccess *self,
 	if (priv->state->opmode <= KOLAB_MAIL_ACCESS_OPMODE_OFFLINE)
 		goto exit;
 
-	/* map Evo sourcename to Kolab foldername */
-	foldername = kolab_util_backend_foldername_new_from_sourcename (sourcename,
-	                                                                &tmp_err);
-	if (foldername == NULL)
-		goto exit;
-
 	/* get folder type */
 	summary = kolab_mail_info_db_query_folder_summary (priv->infodb,
-	                                                   foldername,
+	                                                   sourcename,
 	                                                   &tmp_err);
 	if (summary == NULL)
 		goto exit;
@@ -3097,9 +3057,6 @@ kolab_mail_access_source_fbtrigger_needed (KolabMailAccess *self,
 	trigger_needed = TRUE;
 
  exit:
-	if (foldername != NULL)
-		g_free (foldername);
-
 	if (summary != NULL)
 		kolab_folder_summary_free (summary);
 
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index 07f0761..20c9657 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -76,20 +76,6 @@ kolab_util_backend_error_quark (void)
 }
 
 /*----------------------------------------------------------------------------*/
-/* calendar name <-> folder name translation */
-
-gchar*
-kolab_util_backend_foldername_new_from_sourcename (const gchar *sourcename,
-                                                   GError **err)
-{
-	/* sourcename may be NULL */
-	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
-
-	if (sourcename == NULL)
-		return NULL;
-
-	return g_strdup (sourcename);
-}
 
 /**
  * kolab_util_backend_get_relative_path_from_uri:
diff --git a/src/libekolab/kolab-util-backend.h b/src/libekolab/kolab-util-backend.h
index dbd1e2e..478925a 100644
--- a/src/libekolab/kolab-util-backend.h
+++ b/src/libekolab/kolab-util-backend.h
@@ -73,9 +73,6 @@ typedef enum {
 GQuark kolab_util_backend_error_quark (void) G_GNUC_CONST;
 
 /*----------------------------------------------------------------------------*/
-/* calendar name <-> folder name translation */
-
-gchar* kolab_util_backend_foldername_new_from_sourcename (const gchar *sourcename, GError **err);
 
 gchar *kolab_util_backend_get_relative_path_from_uri (const gchar *uri);
 gchar *kolab_util_backend_get_protocol_from_uri (const gchar *uri);