[evolution-kolab/account-mgmt] Remove unused kolab_util_backend_camel_url_new_from_settings().



commit fa3dde7db107c80c1714ec333ea1715f5e589f14
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jul 2 09:15:34 2012 -0400

    Remove unused kolab_util_backend_camel_url_new_from_settings().

 src/libekolab/kolab-util-backend.c |   80 ------------------------------------
 src/libekolab/kolab-util-backend.h |    1 -
 2 files changed, 0 insertions(+), 81 deletions(-)
---
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index 03213a5..3a673e0 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -471,86 +471,6 @@ kolab_util_backend_get_tls_variant_desc (KolabTLSVariantID id)
 	return gettext (kolab_tls_variant_desc[id]);
 }
 
-CamelURL*
-kolab_util_backend_camel_url_new_from_settings (KolabSettingsHandler *ksettings,
-                                                GError **err)
-{
-	KolabTLSVariantID tlsvariant = KOLAB_TLS_VARIANT_NONE;
-	CamelURL *camel_url = NULL;
-	const gchar *variant_str = NULL;
-	const gchar *tmp_str = NULL;
-	GError *tmp_err = NULL;
-
-	g_assert (KOLAB_IS_SETTINGS_HANDLER (ksettings));
-	g_return_val_if_fail (err == NULL || *err == NULL, NULL);
-
-	/* create url string for session getter */
-	camel_url = camel_url_new (KOLAB_CAMELURL_DUMMY_URL, NULL);
-	camel_url_set_protocol (camel_url, KOLAB_CAMEL_PROVIDER_PROTOCOL);
-	tmp_str = kolab_settings_handler_get_char_field (ksettings,
-	                                                 KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_SERVER_NAME,
-	                                                 &tmp_err);
-	if (tmp_err != NULL) {
-		camel_url_free (camel_url);
-		g_propagate_error (err, tmp_err);
-		return NULL;
-	}
-	if (tmp_str == NULL) {
-		camel_url_free (camel_url);
-		/* FIXME mark as a translatable string */
-		g_set_error (err,
-		             KOLAB_BACKEND_ERROR,
-		             KOLAB_BACKEND_ERROR_INTERNAL,
-		             "Internal inconsistency detected: Kolab server name not set");
-		return NULL;
-
-	}
-	camel_url_set_host (camel_url, tmp_str);
-	tmp_str = kolab_settings_handler_get_char_field (ksettings,
-	                                                 KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_NAME,
-	                                                 &tmp_err);
-	if (tmp_err != NULL) {
-		camel_url_free (camel_url);
-		g_propagate_error (err, tmp_err);
-		return NULL;
-	}
-	if (tmp_str == NULL) {
-		camel_url_free (camel_url);
-		/* FIXME mark as a translatable string */
-		g_set_error (err,
-		             KOLAB_BACKEND_ERROR,
-		             KOLAB_BACKEND_ERROR_INTERNAL,
-		             "Internal inconsistency detected: Kolab User ID not set");
-		return NULL;
-
-	}
-	camel_url_set_user (camel_url, tmp_str);
-	tlsvariant = kolab_settings_handler_get_uint_field (ksettings,
-	                                                    KOLAB_SETTINGS_HANDLER_UINT_FIELD_TLS_VARIANT,
-	                                                    &tmp_err);
-	if (tmp_err != NULL) {
-		camel_url_free (camel_url);
-		g_propagate_error (err, tmp_err);
-		return NULL;
-	}
-
-	switch (tlsvariant) {
-	case KOLAB_TLS_VARIANT_SSL:
-		variant_str = KOLAB_CAMELURL_TLSVARIANT_SSL;
-		break;
-	case KOLAB_TLS_VARIANT_STARTTLS:
-		variant_str = KOLAB_CAMELURL_TLSVARIANT_STARTTLS;
-		break;
-	default:
-		variant_str = KOLAB_CAMELURL_TLSVARIANT_NONE;
-	}
-
-	camel_url_set_param (camel_url,
-	                     KOLAB_CAMELURL_PARAM_SSL,
-	                     variant_str);
-	return camel_url;
-}
-
 gchar*
 kolab_util_backend_account_uid_new_from_settings (KolabSettingsHandler *ksettings,
                                                   GError **err)
diff --git a/src/libekolab/kolab-util-backend.h b/src/libekolab/kolab-util-backend.h
index 4e68cd7..2f4fd1c 100644
--- a/src/libekolab/kolab-util-backend.h
+++ b/src/libekolab/kolab-util-backend.h
@@ -92,7 +92,6 @@ gboolean kolab_util_backend_sqlite_db_new_open (KolabUtilSqliteDb **kdb, KolabSe
 const gchar* kolab_util_backend_get_sync_strategy_desc (KolabSyncStrategyID id);
 const gchar* kolab_util_backend_get_tls_variant_desc (KolabTLSVariantID id);
 
-CamelURL* kolab_util_backend_camel_url_new_from_settings (KolabSettingsHandler *ksettings, GError **err);
 gchar* kolab_util_backend_account_uid_new_from_settings (KolabSettingsHandler *ksettings, GError **err);
 
 KolabMailAccessOpmodeID



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