X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-security-options-view.c;h=9f88f09d87109b60a30910e49b7d4a2a1d736e42;hb=e7d49a2f1e83eb5b8035b416b00230e12213a0ee;hp=571a2939191743797c542aa18aed15015df7f50b;hpb=2940eee6b6e016398a6cc8d404f59143c6140920;p=modest

diff --git a/src/widgets/modest-security-options-view.c b/src/widgets/modest-security-options-view.c
index 571a293..9f88f09 100644
--- a/src/widgets/modest-security-options-view.c
+++ b/src/widgets/modest-security-options-view.c
@@ -234,11 +234,15 @@ get_current_state (ModestSecurityOptionsView* self,
 
 	/* Get security */
 #ifdef MODEST_TOOLKIT_HILDON2
-	state->security = 
+	state->security =
 		modest_serversecurity_picker_get_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view));
+	state->port =
+		modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (priv->security_view));
 #else
-	state->security = 
+	state->security =
 		modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
+	state->port =
+		modest_serversecurity_combo_box_get_active_serversecurity_port (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
 #endif
 
 	/* Get auth */
@@ -348,75 +352,20 @@ modest_security_options_view_auth_check (ModestSecurityOptionsView* self)
 		return FALSE;
 }
 
-/* GList*  */
-/* modest_security_options_view_get_supported_auth_methods (ModestSecurityOptionsView *self, */
-/* 							 const gchar *hostname, */
-/* 							 const gchar *username, */
-/* 							 ModestProtocolType server_type) */
-/* { */
-/* 	GtkWindow *window; */
-/* 	GError *error = NULL; */
-/* 	GList *list_auth_methods, *retval = NULL; */
-/* 	ModestSecurityOptionsViewPrivate *priv; */
-/* 	ModestAccountSettings current_settings; */
-/* 	ModestServerAccountSettings *server_settings; */
-	
-/* 	priv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self); */
-
-/* 	window = GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_WINDOW)); */
-
-/* 	/\* Get current settings *\/ */
-/* 	modest_security_options_view_save_settings (self, &current_settings); */
-
-/* 	if (self->type == MODEST_SECURITY_OPTIONS_INCOMING) */
-/* 		server_settings = modest_account_settings_get_store_settings (&current_settings); */
-/* 	else */
-/* 		server_settings = modest_account_settings_get_transport_settings (&current_settings); */
-
-/* 	list_auth_methods = */
-/* 		modest_utils_get_supported_secure_authentication_methods (server_type, */
-/* 									  hostname, */
-/* 									  modest_server_account_settings_get_port (server_settings), */
-/* 									  username, */
-/* 									  window, */
-/* 									  &error); */
-
-/* 	if (list_auth_methods) { */
-/* 		GList *list = NULL, *method = NULL; */
-/* 		ModestProtocolRegistry *registry = modest_runtime_get_protocol_registry (); */
-
-/* 		for (method = list_auth_methods; method != NULL; method = g_list_next(method)) { */
-/* 			ModestProtocolType auth_protocol_type =  */
-/* 				(ModestProtocolType) (GPOINTER_TO_INT(method->data)); */
-/* 			if (modest_protocol_registry_protocol_type_is_secure (registry,  */
-/* 									      auth_protocol_type)) { */
-/* 				list = g_list_append(list, GINT_TO_POINTER(auth_protocol_type)); */
-/* 			} */
-/* 		} */
-/* 		g_list_free(list_auth_methods); */
-/* 		if (list) { */
-/* 			retval = list; */
-/* 			goto end; */
-/* 		} */
-/* 	} */
-
-/* 	if(error != NULL &&  */
-/* 	   error->domain == modest_utils_get_supported_secure_authentication_error_quark() && */
-/* 	   error->code != MODEST_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED) { */
-/* 		modest_platform_information_banner (GTK_WIDGET(self), */
-/* 						    NULL, */
-/* 						    _("mcen_ib_unableto_discover_auth_methods")); */
-/* 	} */
-
-/* 	if(error != NULL) */
-/* 		g_error_free(error); */
-
-/*  end: */
-/* 	/\* Frees *\/ */
-/* 	g_object_unref (server_settings); */
-
-/* 	return retval; */
-/* } */
+ModestProtocolType 
+modest_security_options_view_get_connection_protocol (ModestSecurityOptionsView *self)
+{
+	ModestSecurityOptionsViewPrivate *priv;
+
+	g_return_val_if_fail (MODEST_IS_SECURITY_OPTIONS_VIEW (self), MODEST_PROTOCOL_REGISTRY_TYPE_INVALID);
+	priv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+	return modest_serversecurity_picker_get_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view));
+#else
+	return modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
+#endif
+}
 
 static void 
 modest_security_options_view_init (ModestSecurityOptionsView *self)