[evolution-kolab/account-mgmt] Remove KOLAB_SETTINGS_HANDLER_UINT_FIELD_TLS_VARIANT.



commit a74d9a19c33629f6a2103fd548579169d57fc16d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jul 2 09:32:28 2012 -0400

    Remove KOLAB_SETTINGS_HANDLER_UINT_FIELD_TLS_VARIANT.
    
    Use CamelNetworkSettings:security-method instead.

 src/libekolab/kolab-settings-handler.c |    6 ++----
 src/libekolab/kolab-settings-handler.h |    1 -
 src/libekolab/kolab-util-backend.c     |   11 -----------
 3 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/src/libekolab/kolab-settings-handler.c b/src/libekolab/kolab-settings-handler.c
index 069d0fb..06ba4f0 100644
--- a/src/libekolab/kolab-settings-handler.c
+++ b/src/libekolab/kolab-settings-handler.c
@@ -106,13 +106,11 @@ static KolabSettingsHandlerCharSetFunc _kolab_settings_handler_char_set_funcs[]
 };
 
 static KolabSettingsHandlerGetFunc _kolab_settings_handler_uint_get_funcs[] = {
-	NULL, /* KOLAB_SETTINGS_HANDLER_UINT_FIELD_FOLDER_CONTEXT */
-	NULL  /* KOLAB_SETTINGS_HANDLER_UINT_FIELD_TLS_VARIANT */
+	NULL /* KOLAB_SETTINGS_HANDLER_UINT_FIELD_FOLDER_CONTEXT */
 };
 
 static KolabSettingsHandlerUintSetFunc _kolab_settings_handler_uint_set_funcs[] = {
-	kolab_settings_handler_uint_set_func_folder_context, /* KOLAB_SETTINGS_HANDLER_UINT_FIELD_FOLDER_CONTEXT */
-	NULL  /* KOLAB_SETTINGS_HANDLER_UINT_FIELD_TLS_VARIANT */
+	kolab_settings_handler_uint_set_func_folder_context /* KOLAB_SETTINGS_HANDLER_UINT_FIELD_FOLDER_CONTEXT */
 };
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/libekolab/kolab-settings-handler.h b/src/libekolab/kolab-settings-handler.h
index 2255d6d..a6c8471 100644
--- a/src/libekolab/kolab-settings-handler.h
+++ b/src/libekolab/kolab-settings-handler.h
@@ -135,7 +135,6 @@ typedef enum {
 
 typedef enum {
 	KOLAB_SETTINGS_HANDLER_UINT_FIELD_FOLDER_CONTEXT = 0,
-	KOLAB_SETTINGS_HANDLER_UINT_FIELD_TLS_VARIANT,
 	KOLAB_SETTINGS_HANDLER_UINT_LAST_FIELD
 } KolabSettingsHandlerUintFieldID;
 
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index 3a673e0..1a800b0 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -334,17 +334,6 @@ kolab_util_backend_prepare_settings (KolabSettingsHandler *ksettings,
 			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,
-		                                             KOLAB_SETTINGS_HANDLER_UINT_FIELD_TLS_VARIANT,
-		                                             enc_value,
-		                                             &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_REQ_PKCS11_PROP);
 		req_pkcs11_value = kolab_util_misc_req_pkcs11_from_property (prop_str);
 		if (req_pkcs11_value == KOLAB_PKCS11_INFRASTRUCTURE_ENABLE) {



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