* src/mbox.c

	drop imported messages in folder selected by user,
	and not in the inbox
	(closes bug [ 625424 ] Import mbox always to "Inbox" folder)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1f69f92cc834defc41d6fa0b48b4022fadf5bb25..8d9935617bf2c435ed60051cd812c4673f3ef54c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-10-18 [alfons]    0.8.5claws47
+
+       * src/mbox.c
+               drop imported messages in folder selected by user,
+               and not in the inbox
+               (closes bug [ 625424 ] Import mbox always to "Inbox" folder)
+

 2002-10-18 [alfons]    0.8.5claws46
 
        * src/compose.c
 2002-10-18 [alfons]    0.8.5claws46
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index e5a789b747ae4d280c3ab6b6e1d5e7e50f4f890b..7b5205ebe6c2aaf263ece202f05ba981400ad69c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws46
+EXTRA_VERSION=claws47

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/mbox.c b/src/mbox.c
index eb8015db4db2a129cb7c80359804bef56eebd856..59cae3b1f81d30b059cadd90356834c8fc62d9f1 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -63,7 +63,6 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox)
        gchar buf[MSGBUFSIZE], from_line[MSGBUFSIZE];
        gchar *tmp_file;
        gint msgs = 0;
        gchar buf[MSGBUFSIZE], from_line[MSGBUFSIZE];
        gchar *tmp_file;
        gint msgs = 0;

-       FolderItem *inbox;

 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(mbox != NULL, -1);
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(mbox != NULL, -1);


@@ -98,7 +97,6 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox)
        }
 
        tmp_file = get_tmp_file();
        }
 
        tmp_file = get_tmp_file();

-       inbox    = folder_get_default_inbox();

 
        do {
                FILE *tmp_fp;
 
        do {
                FILE *tmp_fp;


@@ -227,7 +225,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox)
 
                if (global_processing) {
                        /* CLAWS: new filtering */
 
                if (global_processing) {
                        /* CLAWS: new filtering */

-                       filter_message(global_processing, inbox,
+                       filter_message(global_processing, dest,

                                       msgnum);
                }
 
                                       msgnum);
                }