#include "modest-account-assistant.h"
#include "modest-store-widget.h"
#include "modest-transport-widget.h"
-#include "modest-proto.h"
+#include "modest-text-utils.h"
+#include <modest-protocol-info.h>
#include <string.h>
gint pageno;
pageno = gtk_assistant_get_current_page (GTK_ASSISTANT(self));
- page = gtk_assistant_get_nth_page (GTK_ASSISTANT(self), pageno);
- gtk_assistant_set_page_complete (GTK_ASSISTANT(self), page, complete);
+ if (pageno != -1) {
+ page = gtk_assistant_get_nth_page (GTK_ASSISTANT(self), pageno);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT(self), page, complete);
+ }
}
/* FIXME: regexp check for email address */
txt = gtk_entry_get_text (GTK_ENTRY(priv->email));
- if (!txt || strlen(txt) == 0) {
+ if (!modest_text_utils_validate_email_address (txt))
set_current_page_complete (self, FALSE);
- return;
- }
- set_current_page_complete (self, TRUE);
+ else
+ set_current_page_complete (self, TRUE);
}
{
ModestAccountAssistantPrivate *priv;
gchar *chosen;
+ ModestProtocol proto;
priv = MODEST_ACCOUNT_ASSISTANT_GET_PRIVATE(self);
chosen = gtk_combo_box_get_active_text (GTK_COMBO_BOX(combo));
-
if (priv->store_widget)
gtk_container_remove (GTK_CONTAINER(priv->store_holder),
priv->store_widget);
+
+ proto = modest_protocol_info_get_protocol (chosen);
/* FIXME: we could have these widgets cached instead of
creating them every time */
- priv->store_widget = modest_store_widget_new (priv->factory, chosen);
- if (!strcmp (chosen, MODEST_PROTO_POP) || !strcmp (chosen, MODEST_PROTO_IMAP)) {
+ priv->store_widget = modest_store_widget_new (priv->factory, proto);
+ if (proto == MODEST_PROTOCOL_STORE_POP || proto == MODEST_PROTOCOL_STORE_IMAP) {
g_signal_connect (priv->store_widget,
"data_changed",
G_CALLBACK (receiving_page_update_completeness),
priv->transport_widget);
priv->transport_widget = modest_transport_widget_new (priv->factory,
- chosen);
+ modest_protocol_info_get_protocol(chosen));
gtk_container_add (GTK_CONTAINER(priv->transport_holder),
priv->transport_widget);
on_apply (ModestAccountAssistant *self, gpointer user_data)
{
ModestAccountAssistantPrivate *priv;
+ ModestProtocol proto;
gchar *store_name, *transport_name;
- const gchar *account_name, *username, *servername, *proto;
+ const gchar *account_name, *username, *servername;
ModestStoreWidget *store;
ModestTransportWidget *transport;
/* create server account -> store */
store = MODEST_STORE_WIDGET(priv->store_widget);
- proto = modest_store_widget_get_proto (store);
+ proto = modest_store_widget_get_proto (store);
username = modest_store_widget_get_username (store);
servername = modest_store_widget_get_servername (store);
- store_name = g_strdup_printf ("%s:%s@%s", proto, username, servername);
+ store_name = g_strdup_printf ("%s:%s@%s", modest_protocol_info_get_protocol_name(proto),
+ username, servername);
modest_account_mgr_add_server_account (priv->account_mgr, store_name, servername,
- username, NULL, proto);
+ username, NULL, proto);
/* create server account -> transport */
transport = MODEST_TRANSPORT_WIDGET(priv->transport_widget);
proto = modest_transport_widget_get_proto (transport);
-
- if (!strcmp (proto, MODEST_PROTO_SMTP)) {
+
+ if (proto == MODEST_PROTOCOL_TRANSPORT_SMTP) {
servername = modest_transport_widget_get_servername (transport);
if (modest_transport_widget_get_requires_auth (transport))
username = modest_transport_widget_get_username (transport);
servername = "localhost";
}
- transport_name = g_strdup_printf ("%s:%s@%s", proto, username, servername);
-
+ transport_name = g_strdup_printf ("%s:%s@%s",
+ modest_protocol_info_get_protocol_name(proto),
+ username, servername);
modest_account_mgr_add_server_account (priv->account_mgr,
transport_name,
servername,