2006-12-11 [colin] 2.6.1cvs16

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 330f258429eb97eeaa4b7d87622304207fe88d3d..001ea408bc03d74d09bbe5ac4b5cd9b2262be79e 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2521,6 +2521,14 @@ static gint prefs_account_apply(void)
                alertpanel_error(_("POP3 server is not entered."));
                return -1;
        }
+       if (protocol == A_POP3 || protocol == A_LOCAL) {
+               const gchar *mailbox = gtk_entry_get_text(GTK_ENTRY(receive.inbox_entry));
+               FolderItem *inbox =  folder_find_item_from_identifier(mailbox);
+               if (inbox == NULL) {
+                       alertpanel_error(_("The default inbox folder doesn't exist."));
+                       return -1;
+               }
+       }
        if (protocol == A_IMAP4 &&
            *gtk_entry_get_text(GTK_ENTRY(basic.recvserv_entry)) == '\0') {
                alertpanel_error(_("IMAP4 server is not entered."));
@@ -2842,6 +2850,7 @@ static void prefs_account_set_optmenu_from_string(PrefParam *pparam)
                if (id != NULL && strcmp(id, prefsid) == 0) {
                        found = TRUE;
                        gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
+                       privacy_system_activated(GTK_MENU_ITEM(item));
                }
                i++;
        }
@@ -2858,6 +2867,7 @@ static void prefs_account_set_optmenu_from_string(PrefParam *pparam)
                g_free(name);
 
                gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
+               privacy_system_activated(GTK_MENU_ITEM(menuitem));
        }
 
        g_list_free(children);