make default inbox really work for multiple POP3 account (on popular demand)
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Wed, 26 Dec 2001 20:09:20 +0000 (20:09 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Wed, 26 Dec 2001 20:09:20 +0000 (20:09 +0000)
ChangeLog.claws
configure.in
src/inc.c
src/prefs_account.c

index 2abe698..01d6b35 100644 (file)
@@ -1,3 +1,10 @@
+2001-12-26 [alfons]    0.6.6claws23
+
+       * src/prefs_account.c
+       * src/inc.c
+               allow default inbox to reside in another mailbox (only
+               works for POP3 accounts)
+
 2001-12-26 [alfons]    0.6.6claws22
        
        * src/textview.c
index fd268bc..d3d08dc 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws22
+EXTRA_VERSION=claws23
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index 5ce34b1..e315bca 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -882,9 +882,10 @@ gint inc_drop_message(const gchar *file, Pop3State *state)
        gint val;
        gint msgnum;
 
-       /* get default inbox (perhaps per account) */
+       /* CLAWS: get default inbox (perhaps per account) */
        if (state->ac_prefs->inbox) {
-               inbox = folder_find_item_from_path(state->ac_prefs->inbox);
+               /* CLAWS: get destination folder / mailbox */
+               inbox = folder_find_item_from_identifier(state->ac_prefs->inbox);
                if (!inbox)
                        inbox = folder_get_default_inbox();
        } else
@@ -894,8 +895,8 @@ gint inc_drop_message(const gchar *file, Pop3State *state)
                return -1;
        }
 
+       /* CLAWS: claws uses a global .processing folder for the filtering. */
        if (global_processing == NULL) {
-               /* old filtering */
                if (state->ac_prefs->filter_on_recv) {
                        dropfolder =
                                filter_get_dest_folder(prefs_common.fltlist, file);
@@ -907,7 +908,6 @@ gint inc_drop_message(const gchar *file, Pop3State *state)
                } else
                        dropfolder = inbox;
        } else {
-               /* CLAWS: new filtering */
                dropfolder = folder_get_default_processing();
        }
 
index 17dc10e..dffb3e7 100644 (file)
@@ -1584,10 +1584,14 @@ static void prefs_account_cancel(void)
 static void prefs_account_select_inbox_cb(void)
 {
        FolderItem *item;
+       gchar      *path;
 
        item = foldersel_folder_sel(NULL, NULL);
-       if (item)
-               gtk_entry_set_text(GTK_ENTRY(receive.inbox_entry), item->path);
+       if (item) {
+               path = folder_item_get_identifier(item);
+               gtk_entry_set_text(GTK_ENTRY(receive.inbox_entry), path);
+               g_free(path);
+       }       
 }
 
 static void prefs_account_edit_custom_header(void)