Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-gtk-security-options-view.c

diff --git a/src/widgets/modest-gtk-security-options-view.c b/src/widgets/modest-gtk-security-options-view.c
index aaabee8..a0c1e9e 100644 (file)
--- a/src/widgets/modest-gtk-security-options-view.c
+++ b/src/widgets/modest-gtk-security-options-view.c
@@ -35,7 +35,7 @@
 #include "modest-account-protocol.h"
 #include "widgets/modest-ui-constants.h"
 #include "widgets/modest-validating-entry.h"
 #include "modest-account-protocol.h"
 #include "widgets/modest-ui-constants.h"
 #include "widgets/modest-validating-entry.h"

-#include "widgets/modest-secureauth-combo-box.h"
+#include "modest-toolkit-utils.h"

 
 #define PORT_MIN 1
 #define PORT_MAX 65535
 
 #define PORT_MIN 1
 #define PORT_MAX 65535

@@ -103,7 +103,6 @@ on_auth_changed (GtkWidget *widget,
                 ModestGtkSecurityOptionsView *self)
 {
        ModestSecurityOptionsViewPrivate* ppriv;
                 ModestGtkSecurityOptionsView *self)
 {
        ModestSecurityOptionsViewPrivate* ppriv;

-       ModestSecureauthComboBox *combo;

        ModestProtocolRegistry *protocol_registry;
        ModestProtocolType auth_proto;
        gboolean secureauth_used;
        ModestProtocolRegistry *protocol_registry;
        ModestProtocolType auth_proto;
        gboolean secureauth_used;

@@ -111,9 +110,8 @@ on_auth_changed (GtkWidget *widget,
 
        ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
        protocol_registry = modest_runtime_get_protocol_registry ();
 
        ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
        protocol_registry = modest_runtime_get_protocol_registry ();

-       combo = MODEST_SECUREAUTH_COMBO_BOX (ppriv->auth_view);

 
 

-       auth_proto = modest_secureauth_combo_box_get_active_secureauth (combo);
+       auth_proto = modest_secureauth_selector_get_active_secureauth (ppriv->auth_view);

        secureauth_used = modest_protocol_registry_protocol_type_is_secure (protocol_registry, 
                                                                            auth_proto);
 
        secureauth_used = modest_protocol_registry_protocol_type_is_secure (protocol_registry, 
                                                                            auth_proto);
 

@@ -140,15 +138,15 @@ create_incoming_security (ModestSecurityOptionsView* self,
 
        /* Create widgets for incoming security */
        ppriv->security_view = modest_toolkit_factory_create_serversecurity_selector (modest_runtime_get_toolkit_factory ());
 
        /* Create widgets for incoming security */
        ppriv->security_view = modest_toolkit_factory_create_serversecurity_selector (modest_runtime_get_toolkit_factory ());

-       combo_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
-                                                            _("mcen_li_emailsetup_secure_connection"), FALSE,
-                                                            ppriv->security_view);
+       combo_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+                                                              _("mcen_li_emailsetup_secure_connection"), FALSE,
+                                                              ppriv->security_view);

 
        if (ppriv->full) {              
                ppriv->port_view = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (), PORT_MIN, PORT_MAX);
 
        if (ppriv->full) {              
                ppriv->port_view = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (), PORT_MIN, PORT_MAX);

-               entry_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
-                                                                    _("mcen_fi_emailsetup_port"), FALSE,
-                                                                    ppriv->port_view);
+               entry_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+                                                                      _("mcen_fi_emailsetup_port"), FALSE,
+                                                                      ppriv->port_view);

        }
 
        ppriv->auth_view = modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (), 
        }
 
        ppriv->auth_view = modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (), 

@@ -187,7 +185,7 @@ on_entry_max (ModestValidatingEntry *self,
              gpointer user_data)
 {
        modest_platform_information_banner (GTK_WIDGET (self), NULL, 
              gpointer user_data)
 {
        modest_platform_information_banner (GTK_WIDGET (self), NULL, 

-                                           _CS("ckdg_ib_maximum_characters_reached"));
+                                           _CS_MAXIMUM_CHARACTERS_REACHED);

 }
 
 /*
 }
 
 /*

@@ -203,7 +201,6 @@ on_entry_changed (GtkEditable *editable,
        ModestGtkSecurityOptionsViewPrivate *priv;
        ModestSecurityOptionsViewPrivate *ppriv;
        ModestProtocolType auth_proto;
        ModestGtkSecurityOptionsViewPrivate *priv;
        ModestSecurityOptionsViewPrivate *ppriv;
        ModestProtocolType auth_proto;

-       ModestSecureauthComboBox *combo;

        gboolean is_secure;
        ModestProtocolRegistry *protocol_registry;
 
        gboolean is_secure;
        ModestProtocolRegistry *protocol_registry;
 

@@ -213,8 +210,7 @@ on_entry_changed (GtkEditable *editable,
        protocol_registry = modest_runtime_get_protocol_registry ();
 
        /* Outgoing username is mandatory if outgoing auth is secure */
        protocol_registry = modest_runtime_get_protocol_registry ();
 
        /* Outgoing username is mandatory if outgoing auth is secure */

-       combo = MODEST_SECUREAUTH_COMBO_BOX (ppriv->auth_view);
-       auth_proto = modest_secureauth_combo_box_get_active_secureauth (combo);
+       auth_proto = modest_secureauth_selector_get_active_secureauth (ppriv->auth_view);

        is_secure = modest_protocol_registry_protocol_type_is_secure (protocol_registry,
                                                                      auth_proto);
 
        is_secure = modest_protocol_registry_protocol_type_is_secure (protocol_registry,
                                                                      auth_proto);
 

@@ -244,15 +240,15 @@ create_outgoing_security (ModestSecurityOptionsView* self,
        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);
        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);

-       sec_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
-                                                          _("mcen_li_emailsetup_secure_connection"), FALSE,
-                                                          ppriv->security_view);
+       sec_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+                                                            _("mcen_li_emailsetup_secure_connection"), FALSE,
+                                                            ppriv->security_view);

        
        /* The secure authentication widgets */
        
        /* The secure authentication widgets */

-       ppriv->auth_view = GTK_WIDGET (modest_secureauth_combo_box_new ());
-       auth_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
-                                                           _("mcen_li_emailsetup_secure_authentication"), FALSE,
-                                                           ppriv->auth_view);
+       ppriv->auth_view = modest_toolkit_factory_create_secureauth_selector (modest_runtime_get_toolkit_factory ());
+       auth_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+                                                             _("mcen_li_emailsetup_secure_authentication"), FALSE,
+                                                             ppriv->auth_view);

 
        if (ppriv->full) {
                gchar *user_label;
 
        if (ppriv->full) {
                gchar *user_label;

@@ -261,13 +257,15 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                ppriv->user_entry = GTK_WIDGET (modest_validating_entry_new ());
 
                /* Auto-capitalization is the default, so let's turn it off: */
                ppriv->user_entry = GTK_WIDGET (modest_validating_entry_new ());
 
                /* Auto-capitalization is the default, so let's turn it off: */

+#ifdef MAEMO_CHANGES

                hildon_gtk_entry_set_input_mode (GTK_ENTRY (ppriv->user_entry), 
                                                 HILDON_GTK_INPUT_MODE_FULL);
                hildon_gtk_entry_set_input_mode (GTK_ENTRY (ppriv->user_entry), 
                                                 HILDON_GTK_INPUT_MODE_FULL);

+#endif

 
                user_label = g_strdup_printf("%s*", _("mail_fi_username"));
 
                user_label = g_strdup_printf("%s*", _("mail_fi_username"));

-               user_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
-                                                                   user_label, FALSE,
-                                                                   ppriv->user_entry);
+               user_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+                                                                     user_label, FALSE,
+                                                                     ppriv->user_entry);

                g_free (user_label);
        
                /* Prevent the use of some characters. Limit the max
                g_free (user_label);
        
                /* Prevent the use of some characters. Limit the max

@@ -282,22 +280,22 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                ppriv->pwd_entry = gtk_entry_new ();
 
                /* Auto-capitalization is the default, so let's turn it off */
                ppriv->pwd_entry = gtk_entry_new ();
 
                /* Auto-capitalization is the default, so let's turn it off */

-#ifdef MODEST_TOOLKIT_HILDON2
+#ifdef MAEMO_CHANGES

                hildon_gtk_entry_set_input_mode (GTK_ENTRY (ppriv->pwd_entry),
                                                 HILDON_GTK_INPUT_MODE_FULL | 
                                                 HILDON_GTK_INPUT_MODE_INVISIBLE);
 #endif
                gtk_entry_set_visibility (GTK_ENTRY (ppriv->pwd_entry), FALSE);
 
                hildon_gtk_entry_set_input_mode (GTK_ENTRY (ppriv->pwd_entry),
                                                 HILDON_GTK_INPUT_MODE_FULL | 
                                                 HILDON_GTK_INPUT_MODE_INVISIBLE);
 #endif
                gtk_entry_set_visibility (GTK_ENTRY (ppriv->pwd_entry), FALSE);
 

-               pwd_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
+               pwd_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,

                                                                   _("mail_fi_password"), FALSE,
                                                                   ppriv->pwd_entry);
 
                ppriv->port_view = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
                                                                               PORT_MIN, PORT_MAX);
                                                                   _("mail_fi_password"), FALSE,
                                                                   ppriv->pwd_entry);
 
                ppriv->port_view = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
                                                                               PORT_MIN, PORT_MAX);

-               port_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
-                                                                   _("mcen_fi_emailsetup_port"), FALSE,
-                                                                   ppriv->port_view);
+               port_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+                                                                     _("mcen_fi_emailsetup_port"), FALSE,
+                                                                     ppriv->port_view);

        }
 
        /* Track changes in UI */
        }
 
        /* Track changes in UI */

@@ -309,8 +307,13 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                                  G_CALLBACK (on_security_changed), self);
        }
        if (ppriv->full) {
                                  G_CALLBACK (on_security_changed), self);
        }
        if (ppriv->full) {

-               g_signal_connect (G_OBJECT (ppriv->auth_view), "changed",
-                                 G_CALLBACK (on_auth_changed), self);
+               if (GTK_IS_COMBO_BOX (ppriv->auth_view)) {
+                       g_signal_connect (G_OBJECT (ppriv->auth_view), "changed",
+                                         G_CALLBACK (on_auth_changed), self);
+               } else {
+                       g_signal_connect (G_OBJECT (ppriv->auth_view), "value-changed",
+                                         G_CALLBACK (on_auth_changed), self);
+               }

                g_signal_connect (G_OBJECT (ppriv->user_entry), "changed",
                                  G_CALLBACK (on_entry_changed), self);
        }
                g_signal_connect (G_OBJECT (ppriv->user_entry), "changed",
                                  G_CALLBACK (on_entry_changed), self);
        }

@@ -319,8 +322,8 @@ create_outgoing_security (ModestSecurityOptionsView* self,
        modest_serversecurity_selector_set_active_serversecurity (
                ppriv->security_view,
                MODEST_PROTOCOLS_CONNECTION_NONE);
        modest_serversecurity_selector_set_active_serversecurity (
                ppriv->security_view,
                MODEST_PROTOCOLS_CONNECTION_NONE);

-       modest_secureauth_combo_box_set_active_secureauth (
-          MODEST_SECUREAUTH_COMBO_BOX (ppriv->auth_view),
+       modest_secureauth_selector_set_active_secureauth (
+          ppriv->auth_view,

           MODEST_PROTOCOLS_AUTH_NONE);
 
        /* Pack into container */
           MODEST_PROTOCOLS_AUTH_NONE);
 
        /* Pack into container */