sync with 0.7.4cvs51

[claws.git] / src / account.c

diff --git a/src/account.c b/src/account.c
index e9643d9d334ca10b4b3318edccbd4ac9fb7099e9..52066bac7a6564df61b520e3fdcd2b70b0bf815c 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -119,7 +119,7 @@ void account_read_config_all(void)
        debug_print(_("Reading all config for each account...\n"));
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
-       if ((fp = fopen(rcpath, "r")) == NULL) {
+       if ((fp = fopen(rcpath, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
                g_free(rcpath);
                return;
@@ -362,6 +362,56 @@ void account_set_missing_folder(void)
        }
 }
 
+FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
+                                      SpecialFolderItemType type)
+{
+       FolderItem *item = NULL;
+
+       g_return_val_if_fail(ac_prefs != NULL, NULL);
+
+       if (type == F_OUTBOX) {
+               if (ac_prefs->set_sent_folder && ac_prefs->sent_folder) {
+                       item = folder_find_item_from_identifier
+                               (ac_prefs->sent_folder);
+               }
+               if (!item) {
+                       if (ac_prefs->folder)
+                               item = FOLDER(ac_prefs->folder)->outbox;
+                       if (!item)
+                               item = folder_get_default_outbox();
+               }
+       } else if (type == F_DRAFT) {
+               if (ac_prefs->set_draft_folder && ac_prefs->draft_folder) {
+                       item = folder_find_item_from_identifier
+                               (ac_prefs->draft_folder);
+               }
+               if (!item) {
+                       if (ac_prefs->folder)
+                               item = FOLDER(ac_prefs->folder)->draft;
+                       if (!item)
+                               item = folder_get_default_draft();
+               }
+       } else if (type == F_QUEUE) {
+               if (ac_prefs->folder)
+                       item = FOLDER(ac_prefs->folder)->queue;
+               if (!item)
+                       item = folder_get_default_queue();
+       } else if (type == F_TRASH) {
+               if (ac_prefs->set_trash_folder && ac_prefs->trash_folder) {
+                       item = folder_find_item_from_identifier
+                               (ac_prefs->trash_folder);
+               }
+               if (!item) {
+                       if (ac_prefs->folder)
+                               item = FOLDER(ac_prefs->folder)->trash;
+                       if (!item)
+                               item = folder_get_default_trash();
+               }
+       }
+
+       return item;
+}
+
 void account_destroy(PrefsAccount *ac_prefs)
 {
        g_return_if_fail(ac_prefs != NULL);
@@ -415,10 +465,7 @@ static void account_edit_create(void)
                            GTK_SIGNAL_FUNC (account_delete_event), NULL);
        gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
                            GTK_SIGNAL_FUNC (account_key_pressed), NULL);
-       gtk_signal_connect (GTK_OBJECT (window), "focus_in_event",
-                           GTK_SIGNAL_FUNC (manage_window_focus_in), NULL);
-       gtk_signal_connect (GTK_OBJECT (window), "focus_out_event",
-                           GTK_SIGNAL_FUNC (manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT (window);
        gtk_widget_realize(window);
 
        vbox = gtk_vbox_new (FALSE, 10);
@@ -559,7 +606,8 @@ static void account_edit_prefs(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        ac_prefs = gtk_clist_get_row_data(clist, row);
        prev_default = ac_prefs->is_default;
-       Xstrdup_a(ac_name, ac_prefs->account_name, return);
+       Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
+                 return);
 
        prefs_account_open(ac_prefs);
 
@@ -567,7 +615,7 @@ static void account_edit_prefs(void)
                account_set_as_default(ac_prefs);
 
        if ((ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) &&
-           ac_prefs->folder && strcmp(ac_name, ac_prefs->account_name) != 0) {
+           ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
                folder_set_name(FOLDER(ac_prefs->folder),
                                ac_prefs->account_name);
                folderview_rescan_all();
@@ -711,7 +759,8 @@ static void account_selected(GtkCList *clist, gint row, gint column,
 
                ac = gtk_clist_get_row_data(clist, row);
                if (ac->protocol == A_POP3 || ac->protocol == A_APOP ||
-                   ac->protocol == A_IMAP4 || ac->protocol == A_NNTP) {
+                   ac->protocol == A_IMAP4 || ac->protocol == A_NNTP ||
+                   ac->protocol == A_LOCAL) {
                        ac->recv_at_getall ^= TRUE;
                        account_clist_set_row(ac, row);
                }
@@ -754,7 +803,8 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
                             ac_prefs->protocol == A_IMAP4 ?
                             (ac_prefs->ssl_imap ? "IMAP4 (SSL)" : "IMAP4") :
                             ac_prefs->protocol == A_LOCAL ? "Local" :
-                            ac_prefs->protocol == A_NNTP ? "NNTP"  :  "";
+                            ac_prefs->protocol == A_NNTP ? 
+                                 (ac_prefs->ssl_nntp ? "NNTP (SSL)"  :  "NNTP") : "";
 #else
        text[COL_PROTOCOL] = ac_prefs->protocol == A_POP3  ? "POP3" :
                             ac_prefs->protocol == A_APOP  ? "POP3 (APOP)" :
@@ -778,7 +828,8 @@ static gint account_clist_set_row(PrefsAccount *ac_prefs, gint row)
        has_getallbox = (ac_prefs->protocol == A_POP3  ||
                         ac_prefs->protocol == A_APOP  ||
                         ac_prefs->protocol == A_IMAP4 ||
-                        ac_prefs->protocol == A_NNTP);
+                        ac_prefs->protocol == A_NNTP ||
+                        ac_prefs->protocol == A_LOCAL);
        getall = has_getallbox && ac_prefs->recv_at_getall;
 
        if (ac_prefs->is_default)