2007-01-15 [colin] 2.7.1cvs4
authorColin Leroy <colin@colino.net>
Mon, 15 Jan 2007 17:37:43 +0000 (17:37 +0000)
committerColin Leroy <colin@colino.net>
Mon, 15 Jan 2007 17:37:43 +0000 (17:37 +0000)
* src/imap.c
Fix 'Check for new folders' when IMAP subdirectory
is set
* src/etpan/imap-thread.c
Fix build

ChangeLog
PATCHSETS
configure.ac
src/etpan/imap-thread.c
src/imap.c

index 478885d2900f8a0eee5bb1a4bec6f8b861f8c121..51d6cbad0cc883ddefc71ffacc6226314c5fe2e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-15 [colin]     2.7.1cvs4
+
+       * src/imap.c
+               Fix 'Check for new folders' when IMAP subdirectory
+               is set
+       * src/etpan/imap-thread.c
+               Fix build
+
 2007-01-15 [colin]     2.7.1cvs3
 
        * src/etpan/imap-thread.c
index 68a13b6dd0fc35e268d41c57f6f537e16d62a90d..c5ab83eaadc56ce28be4156ff5d8923c254e18cc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.42.2.25 -r 1.42.2.26 NEWS;  cvs diff -u -r 1.8.2.29 -r 1.8.2.30 README;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 RELEASE_NOTES;  cvs diff -u -r 1.654.2.2312 -r 1.654.2.2313 configure.ac;  ) > 2.7.1cvs1.patchset
 ( cvs diff -u -r 1.16.2.9 -r 1.16.2.10 src/matcher_parser_lex.l;  cvs diff -u -r 1.8.2.6 -r 1.8.2.7 src/quote_fmt_lex.l;  cvs diff -u -r 1.25.2.19 -r 1.25.2.20 src/matcher_parser_parse.y;  ) > 2.7.1cvs2.patchset
 ( cvs diff -u -r 1.1.4.68 -r 1.1.4.69 src/etpan/imap-thread.c;  ) > 2.7.1cvs3.patchset
+( cvs diff -u -r 1.179.2.148 -r 1.179.2.149 src/imap.c;  cvs diff -u -r 1.1.4.69 -r 1.1.4.70 src/etpan/imap-thread.c;  ) > 2.7.1cvs4.patchset
index fa99776e64906a68f9c49d3689570feff56c3046..01cbc7bf55a607f9eb79ec62891002449326aeb4 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index e4effe412d1b6cde21e70e7ec589dc22c3a8040b..22d238842517de20dc0e8077c3e8f9415e63d258 100644 (file)
@@ -2689,7 +2689,7 @@ int socket_connect_cmd(mailimap * imap, const char * command,
        if (r != MAILIMAP_NO_ERROR_AUTHENTICATED
        &&  r != MAILIMAP_NO_ERROR_NON_AUTHENTICATED) {
                mailstream_close(s);
-               imap->stream = NULL;
+               imap->imap_stream = NULL;
                return r;
        }
        
index 0f1d50d30ab431d92759a748f1b3e62aaf7cc496..a7901272ec055d26cefaee14b7008d3b48d61c1e 100644 (file)
@@ -1549,6 +1549,9 @@ static gint imap_scan_tree(Folder *folder)
 
        if (folder->node)
                item = FOLDER_ITEM(folder->node->data);
+       if (item && !item->path && root_folder) {
+               item->path = g_strdup(root_folder);
+       }
        if (!item || ((item->path || root_folder) &&
                      strcmp2(item->path, root_folder) != 0)) {
                folder_tree_destroy(folder);