[evolution-kolab] camel_settings_load_from_url() no longer exists.

[Matthew Barnes <mbarnes src gnome org>]

commit 01d8d0d58c931c19fbd6f1893c69d492801a6b12
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jul 2 08:13:38 2012 -0400

    camel_settings_load_from_url() no longer exists.

 src/libekolab/kolab-mail-imap-client.c |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-imap-client.c b/src/libekolab/kolab-mail-imap-client.c
index de67183..79adc81 100644
--- a/src/libekolab/kolab-mail-imap-client.c
+++ b/src/libekolab/kolab-mail-imap-client.c
@@ -716,44 +716,21 @@ kolab_mail_imap_client_configure_store_settings (KolabMailImapClient *self,
 	KolabMailImapClientPrivate *priv = NULL;
 	CamelService *service = NULL;
 	CamelSettings *camel_settings = NULL;
-	CamelURL *camel_url = NULL;
 	CamelNetworkSecurityMethod security_method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
 	guint16 port = 0;
 	KolabTLSVariantID tlsvariant = KOLAB_TLS_VARIANT_NONE;
 	GError *tmp_err = NULL;
 
-	/* TODO rework this function for new CamelSettings API
-	 *
-	 * Set the details for the settings object directly
-	 * instead of using the camel_settings_load_from_url()
-	 * function, which is a transient one only and
-	 * scheduled for removal
-	 */
-
 	g_assert (KOLAB_IS_MAIL_IMAP_CLIENT (self));
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = KOLAB_MAIL_IMAP_CLIENT_PRIVATE (self);
 
-	/* FIXME this is a transient thing, we should set
-	 *       the CamelSettings values directly from
-	 *       KolabSettingsHandler
-	 */
-	camel_url = \
-		kolab_util_backend_camel_url_new_from_settings (priv->ksettings,
-		                                                &tmp_err);
-	if (camel_url == NULL) {
-		g_propagate_error (err, tmp_err);
-		return FALSE;
-	}
-
 	/* create new settings object for service */
 	service = CAMEL_SERVICE (priv->store);
 	camel_service_set_settings (service, NULL);
 	camel_settings = camel_service_get_settings (service);
 
-	camel_settings_load_from_url (camel_settings, camel_url);
-
 	/* get the details not (or no longer) covered by
 	 * CamelURL. Should be done for all details this
 	 * way, instead of using the (deprecated) CamelURL
@@ -765,7 +742,6 @@ kolab_mail_imap_client_configure_store_settings (KolabMailImapClient *self,
 	                                                    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 FALSE;
 	}
@@ -791,7 +767,6 @@ kolab_mail_imap_client_configure_store_settings (KolabMailImapClient *self,
 		                                                      &tmp_err);
 	}
 	if (tmp_err != NULL) {
-		camel_url_free (camel_url);
 		g_propagate_error (err, tmp_err);
 		return FALSE;
 	}
@@ -805,8 +780,6 @@ kolab_mail_imap_client_configure_store_settings (KolabMailImapClient *self,
 	/* re-set the settings for our service (store) */
 	camel_service_set_settings (service, camel_settings);
 
-	camel_url_free (camel_url);
-
 	return TRUE;
 }