* src/modest-account-mgr-helpers.c:

[modest] / src / maemo / modest-connection-specific-smtp-edit-window.c

diff --git a/src/maemo/modest-connection-specific-smtp-edit-window.c b/src/maemo/modest-connection-specific-smtp-edit-window.c
index 4ea4209..2faf2ac 100644 (file)
--- a/src/maemo/modest-connection-specific-smtp-edit-window.c
+++ b/src/maemo/modest-connection-specific-smtp-edit-window.c
@@ -164,8 +164,18 @@ on_response (GtkDialog *dialog, int response_id, gpointer user_data)
        hostname = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver));
 
        /* Don't close the dialog if a range error occured */
+       if(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 (!modest_text_utils_validate_domain_name (hostname)) { 
+               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);
@@ -174,13 +184,6 @@ on_response (GtkDialog *dialog, int response_id, gpointer user_data)
                }
        }
        
-       /* Don't close the dialog if a range error occured */
-       if(response_id == GTK_RESPONSE_OK && priv->range_error_occured)
-       {
-               g_signal_stop_emission_by_name (dialog, "response");
-               gtk_widget_grab_focus (priv->entry_port);
-               return;
-       }
 }
 
 static void on_set_focus_child (GtkContainer *container, GtkWidget *widget, gpointer user_data)
@@ -317,8 +320,8 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        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;
@@ -382,12 +385,22 @@ modest_connection_specific_smtp_edit_window_get_settings (
        ModestConnectionSpecificSmtpEditWindow *window, 
        ModestAccountMgr *account_manager)
 {
-       ModestConnectionSpecificSmtpEditWindowPrivate *priv = 
-               CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
+       ModestConnectionSpecificSmtpEditWindowPrivate *priv = NULL;
+       ModestServerAccountData *result = 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);
+       result = g_slice_new0 (ModestServerAccountData);
        
        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)));