X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-gtk-security-options-view.c;h=a0c1e9e436d8bd91566a0b4551c9c180d93fdb2b;hp=25bd7c3931d86e8c58877d7351736ba9caf53076;hb=HEAD;hpb=0983f59c33bf2dc9e896b4754979a674b6e87651

diff --git a/src/widgets/modest-gtk-security-options-view.c b/src/widgets/modest-gtk-security-options-view.c
index 25bd7c3..a0c1e9e 100644
--- a/src/widgets/modest-gtk-security-options-view.c
+++ b/src/widgets/modest-gtk-security-options-view.c
@@ -35,6 +35,7 @@
 #include "modest-account-protocol.h"
 #include "widgets/modest-ui-constants.h"
 #include "widgets/modest-validating-entry.h"
+#include "modest-toolkit-utils.h"
 
 #define PORT_MIN 1
 #define PORT_MAX 65535
@@ -137,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 ());
-	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);
-		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 (), 
@@ -184,7 +185,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);
 }
 
 /*
@@ -239,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);
-	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 */
 	ppriv->auth_view = modest_toolkit_factory_create_secureauth_selector (modest_runtime_get_toolkit_factory ());
-	auth_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
-							    _("mcen_li_emailsetup_secure_authentication"), FALSE,
-							    ppriv->auth_view);
+	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;
@@ -256,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: */
+#ifdef MAEMO_CHANGES
 		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_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
@@ -277,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 */
-#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);
 
-		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);
-		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 */