[evolution-kolab] Remove kolab_util_backend_sourcename_new_from_foldername().

[Matthew Barnes <mbarnes src gnome org>]

commit 46bdd5f6279cfa88ab8e65b3831a3a95b842483b
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jun 27 11:39:04 2012 -0400

    Remove kolab_util_backend_sourcename_new_from_foldername().
    
    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       |   17 +----------------
 src/libekolab/kolab-mail-synchronizer.c |    9 +--------
 src/libekolab/kolab-util-backend.c      |   20 --------------------
 src/libekolab/kolab-util-backend.h      |    1 -
 4 files changed, 2 insertions(+), 45 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-access.c b/src/libekolab/kolab-mail-access.c
index d1a4ed7..b386649 100644
--- a/src/libekolab/kolab-mail-access.c
+++ b/src/libekolab/kolab-mail-access.c
@@ -2800,7 +2800,6 @@ kolab_mail_access_query_sources (KolabMailAccess *self,
 	GList *sources = NULL;
 	GList *folders = NULL;
 	GList *folders_ptr = NULL;
-	gchar *tmp_sn = NULL;
 	const gchar *tmp_fn = NULL;
 	GError *tmp_err = NULL;
 
@@ -2828,21 +2827,7 @@ kolab_mail_access_query_sources (KolabMailAccess *self,
 			           __func__);
 			goto folder_skip;
 		}
-		tmp_sn = kolab_util_backend_sourcename_new_from_foldername (tmp_fn,
-		                                                            &tmp_err);
-		if (tmp_err != NULL) {
-			g_warning ("%s: %s", __func__, tmp_err->message);
-			g_error_free (tmp_err);
-			tmp_err = NULL;
-			goto folder_skip;
-		}
-		if (tmp_sn == NULL) {
-			g_warning ("%s: no sourcename for folder [%s]",
-			           __func__, tmp_fn);
-			goto folder_skip;
-		}
-
-		sources = g_list_prepend (sources, tmp_sn);
+		sources = g_list_prepend (sources, g_strdup (tmp_fn));
 
 	folder_skip:
 		folders_ptr = g_list_next (folders_ptr);
diff --git a/src/libekolab/kolab-mail-synchronizer.c b/src/libekolab/kolab-mail-synchronizer.c
index a8f0c67..f10adb7 100644
--- a/src/libekolab/kolab-mail-synchronizer.c
+++ b/src/libekolab/kolab-mail-synchronizer.c
@@ -1842,7 +1842,6 @@ kolab_mail_synchronizer_transaction_prepare (KolabMailSynchronizer *self,
 	GList *changed_uids_lst = NULL;
 	gchar *uid = NULL;
 	gchar *new_uid = NULL;
-	gchar *sourcename = NULL;
 	gboolean record_locally_created = FALSE;
 	gboolean uidval_changed = FALSE;
 	gboolean can_act = FALSE;
@@ -1910,13 +1909,9 @@ kolab_mail_synchronizer_transaction_prepare (KolabMailSynchronizer *self,
 		goto cleanup;
 	}
 
-	sourcename = kolab_util_backend_sourcename_new_from_foldername (foldername,
-	                                                                &tmp_err);
-	if (sourcename == NULL)
-		goto cleanup;
 	sync_id_ptr = kolab_settings_handler_get_value (priv->ksettings,
 	                                                KOLAB_SETTINGS_HANDLER_TBL_SYNCSTRATEGY,
-	                                                sourcename,
+	                                                foldername,
 	                                                &tmp_err);
 	if (tmp_err != NULL) {
 		sync_id = KOLAB_SYNC_STRATEGY_DEFAULT;
@@ -2197,8 +2192,6 @@ kolab_mail_synchronizer_transaction_prepare (KolabMailSynchronizer *self,
 		g_free (uid);
 	if (new_uid != NULL)
 		g_free (new_uid);
-	if (sourcename != NULL)
-		g_free (sourcename);
 	return can_act;
 }
 
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index 18163d8..07f0761 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -79,26 +79,6 @@ kolab_util_backend_error_quark (void)
 /* calendar name <-> folder name translation */
 
 gchar*
-kolab_util_backend_sourcename_new_from_foldername (const gchar *foldername,
-                                                   GError **err)
-{
-	/* foldername can be NULL */
-	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
-
-	/* FIXME do input sanitization here, provide real implementation */
-
-	/* TODO
-	 * - do we need a full mapping of calendar names to folder names?
-	 * - can we use Camel infrastructure for checking of mailbox names?
-	 */
-
-	if (foldername == NULL)
-		return NULL;
-
-	return g_strdup (foldername);
-}
-
-gchar*
 kolab_util_backend_foldername_new_from_sourcename (const gchar *sourcename,
                                                    GError **err)
 {
diff --git a/src/libekolab/kolab-util-backend.h b/src/libekolab/kolab-util-backend.h
index fa0cf51..dbd1e2e 100644
--- a/src/libekolab/kolab-util-backend.h
+++ b/src/libekolab/kolab-util-backend.h
@@ -75,7 +75,6 @@ GQuark kolab_util_backend_error_quark (void) G_GNUC_CONST;
 /*----------------------------------------------------------------------------*/
 /* calendar name <-> folder name translation */
 
-gchar* kolab_util_backend_sourcename_new_from_foldername (const gchar *foldername, GError **err);
 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);