-/* connection-specific-smtp-window.c */
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include "modest-connection-specific-smtp-edit-window.h"
-#include "maemo/modest-maemo-ui-constants.h"
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
+#include "widgets/modest-ui-constants.h"
+#include "modest-hildon-includes.h"
+#include "modest-runtime.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>
#include <gtk/gtkhbox.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkstock.h>
+#include "modest-text-utils.h"
+#include "modest-maemo-utils.h"
#include <glib/gi18n.h>
+#define PORT_RANGE_MIN 1
+#define PORT_RANGE_MAX 65535
+
G_DEFINE_TYPE (ModestConnectionSpecificSmtpEditWindow, modest_connection_specific_smtp_edit_window, GTK_TYPE_DIALOG);
#define CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE(o) \
GtkWidget *button_ok;
GtkWidget *button_cancel;
+
+ gchar *account_name;
+
+ gboolean is_dirty;
+ gboolean range_error_occured;
+ guint range_error_banner_timeout;
};
static void
static void
modest_connection_specific_smtp_edit_window_dispose (GObject *object)
{
+
+
if (G_OBJECT_CLASS (modest_connection_specific_smtp_edit_window_parent_class)->dispose)
G_OBJECT_CLASS (modest_connection_specific_smtp_edit_window_parent_class)->dispose (object);
}
static void
modest_connection_specific_smtp_edit_window_finalize (GObject *object)
{
+ ModestConnectionSpecificSmtpEditWindow *self = (ModestConnectionSpecificSmtpEditWindow *) object;
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+
+ if (priv->range_error_banner_timeout > 0) {
+ g_source_remove (priv->range_error_banner_timeout);
+ priv->range_error_banner_timeout = 0;
+ }
+ if (priv->account_name) {
+ g_free (priv->account_name);
+ priv->account_name = NULL;
+ }
G_OBJECT_CLASS (modest_connection_specific_smtp_edit_window_parent_class)->finalize (object);
}
};
static void
+on_change(GtkWidget* widget, ModestConnectionSpecificSmtpEditWindow *self)
+{
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+ priv->is_dirty = TRUE;
+}
+
+static void
+on_value_changed(GtkWidget* widget, GValue* value, ModestConnectionSpecificSmtpEditWindow *self)
+{
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+
+ priv->range_error_occured = FALSE;
+ on_change(widget, self);
+}
+
+gboolean
+show_banner_handler (gpointer userdata)
+{
+ ModestConnectionSpecificSmtpEditWindow *self = userdata;
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+ gchar *msg;
+
+ msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_set_a_value_within_range"), PORT_RANGE_MIN, PORT_RANGE_MAX);
+
+ hildon_banner_show_information (NULL, NULL, msg);
+ g_free (msg);
+
+ priv->range_error_banner_timeout = 0;
+ return FALSE;
+}
+
+static gboolean
+on_range_error (GtkWidget *widget, HildonNumberEditorErrorType type, gpointer user_data)
+{
+ ModestConnectionSpecificSmtpEditWindow *self = user_data;
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+
+ /* We want to prevent the closure of the dialog when a range error occured. The problem is that
+ * the hildon number editor already resets the value to the default value, so we have to
+ * remember that such an error occured. */
+ priv->range_error_occured = TRUE;
+ if (priv->range_error_banner_timeout == 0)
+ priv->range_error_banner_timeout = g_timeout_add (200, show_banner_handler, self);
+
+ /* Show error message by not returning TRUE */
+ return TRUE;
+}
+
+static void
+on_response (GtkDialog *dialog, int response_id, gpointer user_data)
+{
+ const gchar *hostname;
+ ModestConnectionSpecificSmtpEditWindow *self = user_data;
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+
+ hostname = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver));
+
+ if ((response_id == GTK_RESPONSE_CANCEL) &&
+ (priv->range_error_banner_timeout > 0)) {
+ g_source_remove (priv->range_error_banner_timeout);
+ priv->range_error_banner_timeout = 0;
+ }
+
+ /* Don't close the dialog if a range error occured */
+ if(response_id == GTK_RESPONSE_OK && priv->range_error_occured)
+ {
+ priv->range_error_occured = FALSE;
+ g_signal_stop_emission_by_name (dialog, "response");
+ gtk_widget_grab_focus (priv->entry_port);
+ return;
+ }
+
+ /* Don't close the dialog if a range error occured */
+ if(response_id == GTK_RESPONSE_OK) {
+ if (hostname && (hostname[0] != '\0') &&
+ (!modest_text_utils_validate_domain_name (hostname))) {
+ g_signal_stop_emission_by_name (dialog, "response");
+ hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_servername"));
+ gtk_widget_grab_focus (priv->entry_outgoingserver);
+ gtk_editable_select_region (GTK_EDITABLE (priv->entry_outgoingserver), 0, -1);
+ return;
+ }
+ }
+
+}
+
+static void on_set_focus_child (GtkContainer *container, GtkWidget *widget, gpointer user_data)
+{
+ ModestConnectionSpecificSmtpEditWindow *self = user_data;
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+
+ /* Another child gained focus. Since the number editor already reset a
+ * possible range error to the default value, we allow closure of the
+ * dialog */
+ priv->range_error_occured = FALSE;
+}
+
+static void
on_combo_security_changed (GtkComboBox *widget, gpointer user_data)
{
ModestConnectionSpecificSmtpEditWindow *self =
ModestConnectionSpecificSmtpEditWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+ on_change(GTK_WIDGET(widget), self);
+
const gint port_number =
modest_serversecurity_combo_box_get_active_serversecurity_port (
MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
static void
modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEditWindow *self)
{
- ModestConnectionSpecificSmtpEditWindowPrivate *priv =
- CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
-
- GtkWidget *box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */
- gtk_container_set_border_width (GTK_CONTAINER (box), MODEST_MARGIN_HALF);
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv;
+ GtkWidget *dialog_box;
+ GtkWidget *scrolled_window, *vbox;
+
+ priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+ dialog_box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */
+ gtk_box_set_spacing (GTK_BOX (dialog_box), MODEST_MARGIN_NONE);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog_box), MODEST_MARGIN_HALF);
+
+ vbox = gtk_vbox_new (FALSE, 0);
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
priv->entry_outgoingserver = gtk_entry_new ();
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
+ g_signal_connect(G_OBJECT(priv->entry_outgoingserver), "changed", G_CALLBACK(on_change), self);
+
GtkWidget *caption = hildon_caption_new (sizegroup,
_("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (priv->entry_outgoingserver);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
- /* Show a default port number when the security method changes, as per the UI spec: */
- g_signal_connect (G_OBJECT (priv->combo_outgoing_security), "changed", (GCallback)on_combo_security_changed, self);
-
-
/* The secure authentication widgets: */
if (!priv->combo_outgoing_auth)
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);
+ g_signal_connect (G_OBJECT (priv->combo_outgoing_auth), "changed", G_CALLBACK(on_change), self);
gtk_widget_show (priv->combo_outgoing_auth);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The username widgets: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username), HILDON_GTK_INPUT_MODE_FULL);
caption = hildon_caption_new (sizegroup, _("mail_fi_username"),
priv->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
+ g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", G_CALLBACK(on_change), self);
gtk_widget_show (priv->entry_user_username);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Prevent the use of some characters in the username,
/* The password widgets: */
priv->entry_user_password = gtk_entry_new ();
/* Auto-capitalization is the default, so let's turn it off: */
- hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_password), HILDON_GTK_INPUT_MODE_FULL);
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_password),
+ HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE);
/* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */
caption = hildon_caption_new (sizegroup,
_("mail_fi_password"), priv->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
+ g_signal_connect(G_OBJECT(priv->entry_user_password), "changed", G_CALLBACK(on_change), self);
gtk_widget_show (priv->entry_user_password);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The secure connection widgets: */
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);
+ MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_CONNECTION_NORMAL);
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);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The port number widgets: */
if (!priv->entry_port)
- priv->entry_port = GTK_WIDGET (hildon_number_editor_new (0, 65535));
+ priv->entry_port = GTK_WIDGET (hildon_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX));
caption = hildon_caption_new (sizegroup,
- _("mcen_li_emailsetup_smtp"), priv->entry_port, NULL, HILDON_CAPTION_OPTIONAL);
+ _("mcen_fi_emailsetup_port"), priv->entry_port, NULL, HILDON_CAPTION_OPTIONAL);
+ gtk_widget_add_events(GTK_WIDGET(priv->entry_port), GDK_FOCUS_CHANGE_MASK);
+ g_signal_connect(G_OBJECT(priv->entry_port), "range-error", G_CALLBACK(on_range_error), self);
+ g_signal_connect(G_OBJECT(priv->entry_port), "notify::value", G_CALLBACK(on_value_changed), self);
gtk_widget_show (priv->entry_port);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
+ /* Show a default port number when the security method changes, as per the UI spec: */
+ g_signal_connect (G_OBJECT (priv->combo_outgoing_security), "changed", (GCallback)on_combo_security_changed, self);
+ on_combo_security_changed (GTK_COMBO_BOX (priv->combo_outgoing_security), self);
+
/* Add the buttons: */
- gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK);
- gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
+
+ priv->is_dirty = FALSE;
+ priv->range_error_occured = FALSE;
+ g_signal_connect(G_OBJECT(self), "response", G_CALLBACK(on_response), self);
+ g_signal_connect(G_OBJECT(vbox), "set-focus-child", G_CALLBACK(on_set_focus_child), self);
+
+ priv->range_error_banner_timeout = 0;
+ priv->account_name = NULL;
+
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), vbox);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_box_pack_start (GTK_BOX (dialog_box), scrolled_window, TRUE, TRUE, 0);
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (vbox),
+ gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+ gtk_widget_show_all (dialog_box);
+ gtk_window_set_default_size (GTK_WINDOW (self), -1, 220);
- gtk_widget_show (box);
+
+ /* When this window is shown, hibernation should not be possible,
+ * because there is no sensible way to save the state: */
+ modest_window_mgr_prevent_hibernation_while_window_is_shown (
+ modest_runtime_get_window_mgr (), GTK_WINDOW (self));
+
+ hildon_help_dialog_help_enable (GTK_DIALOG(self),
+ "applications_email_connectionspecificsmtpconf",
+ modest_maemo_utils_get_osso_context());
}
ModestConnectionSpecificSmtpEditWindow*
void
modest_connection_specific_smtp_edit_window_set_connection (
ModestConnectionSpecificSmtpEditWindow *window, const gchar* iap_id, const gchar* iap_name,
- const ModestServerAccountData *data)
+ ModestServerAccountSettings *server_settings)
{
ModestConnectionSpecificSmtpEditWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
gchar* title = g_strdup_printf (_("mcen_ti_connection_connection_name"), iap_name);
gtk_window_set_title (GTK_WINDOW (window), title);
g_free (title);
-
- if (data)
+
+ if (server_settings)
{
- gtk_entry_set_text (GTK_ENTRY (priv->entry_outgoingserver), data->hostname);
- gtk_entry_set_text (GTK_ENTRY (priv->entry_user_username), data->username);
- gtk_entry_set_text (GTK_ENTRY (priv->entry_user_password), data->password);
+
+ if (priv->account_name)
+ g_free (priv->account_name);
+ priv->account_name = g_strdup (modest_server_account_settings_get_account_name (server_settings));
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_outgoingserver),
+ modest_server_account_settings_get_hostname (server_settings));
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_user_username),
+ modest_server_account_settings_get_username (server_settings));
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_user_password),
+ modest_server_account_settings_get_password (server_settings));
modest_serversecurity_combo_box_set_active_serversecurity (
- MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), data->security);
+ MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security),
+ modest_server_account_settings_get_security (server_settings));
modest_secureauth_combo_box_set_active_secureauth (
- MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth), data->secure_auth);
+ MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth),
+ modest_server_account_settings_get_auth_protocol (server_settings));
/* port: */
hildon_number_editor_set_value (
- HILDON_NUMBER_EDITOR (priv->entry_port), data->port);
+ HILDON_NUMBER_EDITOR (priv->entry_port),
+ modest_server_account_settings_get_port (server_settings));
+
+
+ /* This will cause changed signals so we set dirty back to FALSE */
+ priv->is_dirty = FALSE;
+ if (priv->range_error_banner_timeout > 0) {
+ g_source_remove (priv->range_error_banner_timeout);
+ priv->range_error_banner_timeout = 0;
+ }
+
}
}
-/*
- * The result must be freed with modest_account_mgr_free_server_account_data(). */
-ModestServerAccountData*
-modest_connection_specific_smtp_edit_window_get_settings (
- ModestConnectionSpecificSmtpEditWindow *window,
- ModestAccountMgr *account_manager, const gchar* server_account_name)
+ModestServerAccountSettings*
+modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecificSmtpEditWindow *window)
{
- ModestConnectionSpecificSmtpEditWindowPrivate *priv =
- CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
-
- g_assert (server_account_name);
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv = NULL;
+ ModestServerAccountSettings *server_settings = NULL;
+ const gchar *outgoing_server = NULL;
+
+ priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
+ outgoing_server = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver));
+
+ /* If the outgoing server is NULL, we are removing the connection specific
+ * settings */
+ if ((outgoing_server == NULL) || (outgoing_server[0] == '\0')) {
+ return NULL;
+ }
- /* Use g_slice_new0(), because that's what modest_account_mgr_free_server_account_data()
- * expects us to use. */
- ModestServerAccountData *result = g_slice_new0 (ModestServerAccountData);
+ server_settings = modest_server_account_settings_new ();
- result->hostname = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver)));
- 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)));
+ modest_server_account_settings_set_hostname (server_settings,
+ gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver)));
+ modest_server_account_settings_set_protocol (server_settings,
+ MODEST_PROTOCOL_TRANSPORT_SMTP);
+ modest_server_account_settings_set_username (server_settings,
+ gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username)));
+ modest_server_account_settings_set_password (server_settings,
+ gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password)));
- result->security = modest_serversecurity_combo_box_get_active_serversecurity (
- MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
+ modest_server_account_settings_set_security (server_settings,
+ modest_serversecurity_combo_box_get_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security)));
+ modest_server_account_settings_set_auth_protocol (server_settings,
+ modest_secureauth_combo_box_get_active_secureauth (
+ MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth)));
+ modest_server_account_settings_set_account_name (server_settings,
+ priv->account_name);
- result->secure_auth = modest_secureauth_combo_box_get_active_secureauth (
- MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth));
-
/* port: */
- result->port = hildon_number_editor_get_value (
- HILDON_NUMBER_EDITOR (priv->entry_port));
+ modest_server_account_settings_set_port (server_settings,
+ hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->entry_port)));
- return result;
+ return server_settings;
+}
+
+gboolean modest_connection_specific_smtp_edit_window_is_dirty(
+ ModestConnectionSpecificSmtpEditWindow *window)
+{
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
+
+ return priv->is_dirty;
}
projects / modest / blobdiff