Modified webpage: now tinymail repository is in gitorious.

[modest] / src / hildon2 / modest-maemo-security-options-view.c

diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c
index 4ffbed1..87bb7e2 100644 (file)
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -37,6 +37,8 @@
 #include "widgets/modest-validating-entry.h"
 #include "modest-maemo-utils.h"
 #include "modest-hildon-includes.h"
+#include <modest-toolkit-factory.h>
+#include <modest-toolkit-utils.h>
 
 #define PORT_MIN 1
 #define PORT_MAX 65535
@@ -83,19 +85,10 @@ on_security_changed (GtkWidget *widget,
        is_secure = modest_protocol_registry_protocol_type_has_tag (proto_registry, proto_type, 
                                                                    MODEST_PROTOCOL_REGISTRY_SECURE_PROTOCOLS);
 
-       if (MODEST_SECURITY_OPTIONS_VIEW (self)->type == MODEST_SECURITY_OPTIONS_INCOMING) {
-               /* Activate and dim checkbutton if it's secure */
-               modest_togglable_set_active (ppriv->auth_view,
-                                            is_secure);
-               gtk_widget_set_sensitive (ppriv->auth_view, !is_secure);
-       } else {
-
-       }
-
        if (ppriv->full) {
-               gint port_number = 
+               gint port_number =
                        modest_serversecurity_selector_get_active_serversecurity_port (ppriv->security_view);
-               
+
                if(port_number) {
                        modest_number_entry_set_value (ppriv->port_view,
                                                       port_number);
@@ -123,7 +116,7 @@ on_auth_changed (GtkWidget *widget,
        /* Get captions, well dimm the whole widget */
        user_caption = gtk_widget_get_parent (ppriv->user_entry);
        pwd_caption = gtk_widget_get_parent (ppriv->pwd_entry);
-       
+
        /* Enable / disable */
        gtk_widget_set_sensitive (user_caption, secureauth_used);
        gtk_widget_set_sensitive (pwd_caption, secureauth_used);
@@ -202,7 +195,7 @@ on_entry_max (ModestValidatingEntry *self,
              gpointer user_data)
 {
        modest_platform_information_banner (GTK_WIDGET (self), NULL, 
-                                           _CS("ckdg_ib_maximum_characters_reached"));
+                                           _CS_MAXIMUM_CHARACTERS_REACHED);
 }
 
 /*
@@ -274,7 +267,7 @@ create_outgoing_security (ModestSecurityOptionsView* self,
        ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
        
        /* The secure connection widgets */
-       ppriv->security_view = modest_toolkit_factory_create_serversecurity (modest_runtime_get_toolkit_factory ());
+       ppriv->security_view = modest_toolkit_factory_create_serversecurity_selector (modest_runtime_get_toolkit_factory ());
        modest_serversecurity_selector_fill (ppriv->security_view,
                                              MODEST_PROTOCOLS_TRANSPORT_SMTP);
        if (GTK_IS_COMBO_BOX (ppriv->security_view)) {