more sync with sylpheed 0.5.0pre3

diff --git a/ChangeLog b/ChangeLog
index 1684212be2fce133297222ab95e4446f344e48c9..2c571298d97a4b53100fd5aebc1266fa5ef90cd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-29
+
+       * src/imap.c: imap_scan_tree(): fixed a bug that didn't set the
+         root folder correctly.
+
 2001-06-28
 
        * src/folderview.[ch]:

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0b64dfb599039373e47a22d4968d810e64ac7b65..28573ecb9dd9c4b7dcef957721151ab47ee5df8e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,7 @@
+2001-06-29 [paul]
+
+       * more sync with sylpheed 0.5.0pre3
+
 2001-06-29 [paul]
 
        * po/pt_BR.po

diff --git a/ChangeLog.jp b/ChangeLog.jp
index b7f759644f4255cefb219d2c4d9e023b138440a2..27bcee54b5f58164057bf80ba0ed8a0612eca0e4 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2001-06-29
+
+       * src/imap.c: imap_scan_tree(): ¥ë¡¼¥È¥Õ¥©¥ë¥À¤òÀµ¤·¤¯¥»¥Ã¥È¤·¤Æ
+         ¤¤¤Ê¤«¤Ã¤¿¥Ð¥°¤ò½¤Àµ¡£
+
 2001-06-28
 
        * src/folderview.[ch]:

diff --git a/src/imap.c b/src/imap.c
index 915b4af1106b2b273677c6d68e6b57e412e5c2bd..416df1ee1937a5d7c58063f3d887e5ca0bf50ece 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -686,7 +686,6 @@ void imap_scan_tree(Folder *folder)
        FolderItem *item, *inbox;
        IMAPSession *session;
        IMAPNameSpace *namespace = NULL;
-       gchar *imap_dir = "";
        gchar *root_folder = NULL;
 
        g_return_if_fail(folder != NULL);
@@ -699,10 +698,9 @@ void imap_scan_tree(Folder *folder)
                namespace = (IMAPNameSpace *)imapfolder->namespace->data;
 
        if (folder->account->imap_dir && *folder->account->imap_dir) {
-               gchar *tmpdir;
-               Xstrdup_a(tmpdir, folder->account->imap_dir, return);
-               strtailchomp(tmpdir, '/');
-               Xalloca(imap_dir, strlen(tmpdir) + 2, return);
+               gchar *imap_dir;
+               Xstrdup_a(imap_dir, folder->account->imap_dir, return);
+               strtailchomp(imap_dir, '/');
                root_folder = g_strconcat
                        (namespace && namespace->name ? namespace->name : "",
                         imap_dir, NULL);
@@ -710,6 +708,9 @@ void imap_scan_tree(Folder *folder)
                        subst_char(root_folder, namespace->separator, '/');
        }
 
+       if (root_folder)
+               debug_print("IMAP root directory: %s\n", root_folder);
+
        folder_tree_destroy(folder);
        item = folder_item_new(folder->name, root_folder);
        item->folder = folder;