X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-settings-dialog.c;h=12656cb6fe522b9569d6b3ee9a352e50188ff9fd;hp=34f183f4e94199814123f55899c98fd093cf5b28;hb=fcbc6a6dfa1a10921d2ca889256a21b192adbe98;hpb=afc5a07e90bac68b3b9ac41971559365147ba2ca

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 34f183f..12656cb 100644
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -260,19 +260,30 @@ static GtkWidget* create_caption_new_with_asterisk(ModestAccountSettingsDialog *
 static void
 on_entry_invalid_account_title_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data)
 {
-	gchar *message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"),
-					  "\\ / : * ? \" < > | ^");
-	show_error (GTK_WIDGET (self), message);
+	gchar *tmp, *msg;
+			
+	tmp = g_strndup (account_title_forbidden_chars, ACCOUNT_TITLE_FORBIDDEN_CHARS_LENGTH);
+	msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+
+	show_error (GTK_WIDGET (self), msg);
+
+	g_free (msg);
+	g_free (tmp);
 }
 
 static void
 on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data)
 {
-	gchar *message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"),
-					  "< >");
-	show_error (GTK_WIDGET (self), message);
-}
+	gchar *tmp, *msg;
+			
+	tmp = g_strndup (user_name_forbidden_chars, USER_NAME_FORBIDDEN_CHARS_LENGTH);
+	msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+
+	show_error (GTK_WIDGET (self), msg);
 
+	g_free (msg);
+	g_free (tmp);
+}
 
 
 static void
@@ -1368,7 +1379,7 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo
 		}
 		
 		const gboolean has_specific = 
-			modest_account_mgr_get_has_connection_specific_smtp (
+			modest_account_mgr_get_use_connection_specific_smtp (
 				dialog->account_manager, 
 				account_name);
 		gtk_toggle_button_set_active (
@@ -1560,6 +1571,8 @@ save_configuration (ModestAccountSettingsDialog *dialog)
 	account_title = NULL;
 	
 	/* Save connection-specific SMTP server accounts: */
+        modest_account_mgr_set_use_connection_specific_smtp(dialog->account_manager, account_name,
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbox_outgoing_smtp_specific)));
 	if (dialog->specific_window) {
 		return modest_connection_specific_smtp_window_save_server_accounts (
 			MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window), account_name);