[evolution-kolab/account-mgmt: 29/29] Remove KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_URI.

[Matthew Barnes <mbarnes src gnome org>]

commit d6b1db30217c58dc711b8d33bfc8e9cdca19a60b
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jul 1 17:50:03 2012 -0400

    Remove KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_URI.
    
    ESources don't have URIs anymore.  If a URI is needed it has to be
    constructed from components.

 src/libekolab/kolab-settings-handler.c |    2 --
 src/libekolab/kolab-settings-handler.h |    1 -
 src/libekolab/kolab-util-backend.c     |   10 ----------
 3 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/src/libekolab/kolab-settings-handler.c b/src/libekolab/kolab-settings-handler.c
index 4a24490..deb3f12 100644
--- a/src/libekolab/kolab-settings-handler.c
+++ b/src/libekolab/kolab-settings-handler.c
@@ -85,7 +85,6 @@ static KolabSettingsHandlerGetFunc _kolab_settings_handler_char_get_funcs[] = {
 	NULL, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_SERVER_NAME */
 	NULL, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_NAME */
 	NULL, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_PASSWORD */
-	NULL, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_URI */
 	NULL  /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_PKCS11_USER_PIN */
 };
 
@@ -98,7 +97,6 @@ static KolabSettingsHandlerCharSetFunc _kolab_settings_handler_char_set_funcs[]
 	NULL, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_SERVER_NAME */
 	NULL, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_NAME */
 	NULL, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_PASSWORD */
-	NULL, /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_URI */
 	NULL  /* KOLAB_SETTINGS_HANDLER_CHAR_FIELD_PKCS11_USER_PIN */
 };
 
diff --git a/src/libekolab/kolab-settings-handler.h b/src/libekolab/kolab-settings-handler.h
index 7b6b639..f3565dc 100644
--- a/src/libekolab/kolab-settings-handler.h
+++ b/src/libekolab/kolab-settings-handler.h
@@ -129,7 +129,6 @@ typedef enum {
 	KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_SERVER_NAME,
 	KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_NAME,
 	KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_PASSWORD,
-	KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_URI,
 	KOLAB_SETTINGS_HANDLER_CHAR_FIELD_PKCS11_USER_PIN,
 	KOLAB_SETTINGS_HANDLER_CHAR_LAST_FIELD
 } KolabSettingsHandlerCharFieldID;
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index 4468a71..03213a5 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -334,16 +334,6 @@ kolab_util_backend_prepare_settings (KolabSettingsHandler *ksettings,
 			g_error_free (error);
 			error = NULL;
 		}
-		prop_str = e_source_get_uri (esource);
-		(void)kolab_settings_handler_set_char_field (ksettings,
-		                                             KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_URI,
-		                                             g_strdup (prop_str),
-		                                             &error);
-		if (error != NULL) {
-			g_warning ("%s()[%u] error: %s", __func__, __LINE__, error->message);
-			g_error_free (error);
-			error = NULL;
-		}
 		prop_str = e_source_get_property (esource, KOLAB_TLS_VARIANT_PROP);
 		enc_value = kolab_util_misc_tls_variant_from_property (prop_str);
 		(void)kolab_settings_handler_set_uint_field (ksettings,