X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-connection-specific-smtp-edit-window.c;h=1bd7789ba3f91657f8143dcdb7dccc9caf6753f0;hp=4b1500162749b681983fdfd48b0c663252235d79;hb=816ff8e4dd15115b09ed6eb066fcfdda2f45698a;hpb=7e7be75d6f353df4d1c605d5df3011457f51a926

diff --git a/src/maemo/modest-connection-specific-smtp-edit-window.c b/src/maemo/modest-connection-specific-smtp-edit-window.c
index 4b15001..1bd7789 100644
--- a/src/maemo/modest-connection-specific-smtp-edit-window.c
+++ b/src/maemo/modest-connection-specific-smtp-edit-window.c
@@ -2,11 +2,8 @@
 
 #include "modest-connection-specific-smtp-edit-window.h"
 #include <hildon-widgets/hildon-caption.h>
-#include "maemo/easysetup/modest-easysetup-country-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-provider-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-servertype-combo-box.h"
-#include "widgets/modest-easysetup-serversecurity-combo-box.h"
-#include "widgets/modest-easysetup-secureauth-combo-box.h"
+#include "widgets/modest-serversecurity-combo-box.h"
+#include "widgets/modest-secureauth-combo-box.h"
 #include "widgets/modest-validating-entry.h"
 #include <modest-account-mgr-helpers.h>
 #include <gtk/gtkbutton.h>
@@ -97,8 +94,8 @@ on_combo_security_changed (GtkComboBox *widget, gpointer user_data)
 		CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
 	
 	const gint port_number = 
-		easysetup_serversecurity_combo_box_get_active_serversecurity_port (
-			EASYSETUP_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
+		modest_serversecurity_combo_box_get_active_serversecurity_port (
+			MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
 
 	if(port_number != 0) {
 		gchar* str = g_strdup_printf ("%d", port_number);
@@ -135,7 +132,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
 	
 	/* The secure authentication widgets: */
 	if (!priv->combo_outgoing_auth)
-		priv->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ());
+		priv->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
 	caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
 		priv->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL);
 	gtk_widget_show (priv->combo_outgoing_auth);
@@ -171,11 +168,11 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
 	
 	/* The secure connection widgets: */	
 	if (!priv->combo_outgoing_security)
-		priv->combo_outgoing_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
-	easysetup_serversecurity_combo_box_fill (
-		EASYSETUP_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP);
-	easysetup_serversecurity_combo_box_set_active_serversecurity (
-		EASYSETUP_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_SECURITY_NONE);
+		priv->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
+	modest_serversecurity_combo_box_fill (
+		MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP);
+	modest_serversecurity_combo_box_set_active_serversecurity (
+		MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_SECURITY_NONE);
 	caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), 
 		priv->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL);
 	gtk_widget_show (priv->combo_outgoing_security);
@@ -224,11 +221,11 @@ modest_connection_specific_smtp_edit_window_set_connection (
 		gtk_entry_set_text (GTK_ENTRY (priv->entry_user_username), data->username);	
 		gtk_entry_set_text (GTK_ENTRY (priv->entry_user_password), data->password);
 	
-		easysetup_serversecurity_combo_box_set_active_serversecurity (
-		EASYSETUP_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), data->security);
+		modest_serversecurity_combo_box_set_active_serversecurity (
+		MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), data->security);
 	
-		easysetup_secureauth_combo_box_set_active_secureauth (
-		EASYSETUP_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth), data->secure_auth);
+		modest_secureauth_combo_box_set_active_secureauth (
+		MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth), data->secure_auth);
 		
 		/* port: */
 		gchar * port_str = g_strdup_printf ("%d", data->port);
@@ -257,11 +254,11 @@ modest_connection_specific_smtp_edit_window_get_settings (
 	result->username = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username)));	
 	result->password = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password)));
 	
-	result->security = easysetup_serversecurity_combo_box_get_active_serversecurity (
-		EASYSETUP_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
+	result->security = modest_serversecurity_combo_box_get_active_serversecurity (
+		MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
 	
-	result->secure_auth = easysetup_secureauth_combo_box_get_active_secureauth (
-		EASYSETUP_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth));
+	result->secure_auth = modest_secureauth_combo_box_get_active_secureauth (
+		MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth));
 		
 	/* port: */
 	const gchar * port_str = gtk_entry_get_text (GTK_ENTRY (priv->entry_port));