X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwidgets%2Fmodest-security-options-view.c;h=7e59adfe1f177f3e580499ab6137bd0cb035a18e;hb=5105120893f16827cd7ebc7f9e3cad264e933802;hp=c56a2fb7bd3a454994f1727e8ec54cf8045f19ed;hpb=f26bfbe154a21ab3482010919af7d394c0d2dd9c;p=modest

diff --git a/src/widgets/modest-security-options-view.c b/src/widgets/modest-security-options-view.c
index c56a2fb..7e59adf 100644
--- a/src/widgets/modest-security-options-view.c
+++ b/src/widgets/modest-security-options-view.c
@@ -28,19 +28,14 @@
  */
 
 #include <string.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "modest-utils.h"
 #include "modest-runtime.h"
 #include "modest-platform.h"
 #include "modest-security-options-view.h"
 #include "modest-security-options-view-priv.h"
 #ifdef MODEST_TOOLKIT_HILDON2
-#include "modest-serversecurity-picker.h"
-#include "modest-secureauth-picker.h"
 #include <modest-hildon-includes.h>
-#else
-#include "widgets/modest-serversecurity-combo-box.h"
-#include "widgets/modest-secureauth-combo-box.h"
 #endif
 
 /* list my signals */
@@ -77,11 +72,7 @@ modest_security_options_view_load_settings (ModestSecurityOptionsView* self,
 
 	/* Update UI */
 	modest_security_options_view_set_server_type (self, server_proto);
-#ifdef MODEST_TOOLKIT_HILDON2
-	modest_serversecurity_picker_set_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view), secure_protocol);
-#else
-	modest_serversecurity_combo_box_set_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view), secure_protocol);
-#endif
+	modest_serversecurity_selector_set_active_serversecurity (priv->security_view, secure_protocol);
 
 /* 		update_incoming_server_title (dialog, dialog->incoming_protocol); */
 
@@ -105,21 +96,11 @@ modest_security_options_view_load_settings (ModestSecurityOptionsView* self,
 		/* Active the authentication checkbox */
 		if (modest_protocol_registry_protocol_type_is_secure (modest_runtime_get_protocol_registry (), 
 								      secure_auth))
-#ifdef MODEST_TOOLKIT_HILDON2
-			hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->auth_view),
-							TRUE);
-#else
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->auth_view),
-						      TRUE);
-#endif
+			modest_togglable_set_active (priv->auth_view,
+						     TRUE);
 	} else {
-#ifdef MODEST_TOOLKIT_HILDON2
-		modest_secureauth_picker_set_active_secureauth (
-		   MODEST_SECUREAUTH_PICKER (priv->auth_view), secure_auth);
-#else
-		modest_secureauth_combo_box_set_active_secureauth (
-		   MODEST_SECUREAUTH_COMBO_BOX (priv->auth_view), secure_auth);
-#endif
+		modest_secureauth_selector_set_active_secureauth (
+			priv->auth_view, secure_auth);
 	}
 
 	MODEST_SECURITY_OPTIONS_VIEW_GET_CLASS (self)->load_settings (self, settings);
@@ -150,18 +131,10 @@ modest_security_options_view_save_settings (ModestSecurityOptionsView* self,
 	auth_protocol = MODEST_PROTOCOLS_AUTH_NONE;
 
 	/* Get data */
-#ifdef MODEST_TOOLKIT_HILDON2
-	security_proto = modest_serversecurity_picker_get_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view));
-#else
-	security_proto = modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
-#endif
+	security_proto = modest_serversecurity_selector_get_active_serversecurity (priv->security_view);
 
 	if (self->type == MODEST_SECURITY_OPTIONS_INCOMING) {
-#ifdef MODEST_TOOLKIT_HILDON2
-		if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auth_view))) {
-#else
-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view))) {
-#endif
+		if (modest_togglable_get_active (priv->auth_view)) {
 			if (!modest_protocol_registry_protocol_type_is_secure (proto_registry,
 									       security_proto)) {
 				/* TODO */
@@ -172,13 +145,7 @@ modest_security_options_view_save_settings (ModestSecurityOptionsView* self,
 			}
 		}
 	} else {
-#ifdef MODEST_TOOLKIT_HILDON2
-		auth_protocol = modest_secureauth_picker_get_active_secureauth (
-			MODEST_SECUREAUTH_PICKER (priv->auth_view));
-#else
-		auth_protocol = modest_secureauth_combo_box_get_active_secureauth (
-			MODEST_SECUREAUTH_COMBO_BOX (priv->auth_view));
-#endif
+		auth_protocol = modest_secureauth_selector_get_active_secureauth (priv->auth_view);
 	}
 
 	/* Save settings */
@@ -211,15 +178,9 @@ modest_security_options_view_set_server_type (ModestSecurityOptionsView* self,
  	ModestSecurityOptionsViewPrivate *priv;
 	priv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
 
-#ifdef MODEST_TOOLKIT_HILDON2		
-	modest_serversecurity_picker_fill (MODEST_SERVERSECURITY_PICKER (priv->security_view), server_type);
-	modest_serversecurity_picker_set_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view),
-								MODEST_PROTOCOLS_CONNECTION_NONE);
-#else
-	modest_serversecurity_combo_box_fill (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view), server_type);
-	modest_serversecurity_combo_box_set_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view),
-								   MODEST_PROTOCOLS_CONNECTION_NONE);
-#endif
+	modest_serversecurity_selector_fill (priv->security_view, server_type);
+	modest_serversecurity_selector_set_active_serversecurity (priv->security_view,
+								  MODEST_PROTOCOLS_CONNECTION_NONE);
 }
 
 static void
@@ -233,29 +194,18 @@ get_current_state (ModestSecurityOptionsView* self,
 	proto_registry = modest_runtime_get_protocol_registry ();
 
 	/* Get security */
-#ifdef MODEST_TOOLKIT_HILDON2
-	state->security = 
-		modest_serversecurity_picker_get_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view));
-#else
-	state->security = 
-		modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
-#endif
+	state->security =
+		modest_serversecurity_selector_get_active_serversecurity (priv->security_view);
+	state->port =
+		modest_serversecurity_selector_get_active_serversecurity_port (priv->security_view);
 
 	/* Get auth */
 	if (self->type == MODEST_SECURITY_OPTIONS_OUTGOING) {
-#ifdef MODEST_TOOLKIT_HILDON2
-		state->auth = modest_secureauth_picker_get_active_secureauth (MODEST_SECUREAUTH_PICKER (priv->auth_view));
-#else
-		state->auth = modest_secureauth_combo_box_get_active_secureauth (MODEST_SECUREAUTH_COMBO_BOX (priv->auth_view));
-#endif
+		state->auth = modest_secureauth_selector_get_active_secureauth (priv->auth_view);
 		if (priv->full) {
 		}
 	} else {
-#ifdef MODEST_TOOLKIT_HILDON2
-		if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auth_view)))
-#else
-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view)))
-#endif
+		if (modest_togglable_get_active (priv->auth_view))
 			state->auth = priv->initial_state.auth;
 		else
 			state->auth = MODEST_PROTOCOLS_AUTH_NONE;
@@ -322,21 +272,11 @@ modest_security_options_view_auth_check (ModestSecurityOptionsView* self)
 	protocol_registry = modest_runtime_get_protocol_registry ();
 
 	/* Check if the server supports secure authentication */
-#ifdef MODEST_TOOLKIT_HILDON2
-	security_incoming_type = 
-		modest_serversecurity_picker_get_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view));
-#else
 	security_incoming_type = 
-		modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
-#endif
+		modest_serversecurity_selector_get_active_serversecurity (priv->security_view);
 
-#ifdef MODEST_TOOLKIT_HILDON2
-	auth_active = 
-		hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auth_view));
-#else
 	auth_active = 
-		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view));
-#endif
+		modest_togglable_get_active (priv->auth_view);
 	is_secure = 
 		modest_protocol_registry_protocol_type_has_tag (protocol_registry, 
 								security_incoming_type, 
@@ -356,7 +296,7 @@ modest_security_options_view_get_connection_protocol (ModestSecurityOptionsView
 	g_return_val_if_fail (MODEST_IS_SECURITY_OPTIONS_VIEW (self), MODEST_PROTOCOL_REGISTRY_TYPE_INVALID);
 	priv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
 
-	return modest_serversecurity_picker_get_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view));
+	return modest_serversecurity_selector_get_active_serversecurity (priv->security_view);
 }
 
 static void