* src/folder.c

* src/folderview.c
* src/imap.c
        fix imap folder rescanning

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 091c18e8cb3124ffddc2d8e38526eb6c38ae9f18..440491dd2b9ad92bbbbb73ce804a07a9d432b483 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-07-26 [christoph] 0.8.0claws14
+
+       * src/folder.c
+       * src/folderview.c
+       * src/imap.c
+               fix imap folder rescanning
+
 2002-07-25 [christoph] 0.8.0claws13
 
        * src/filter.c

diff --git a/configure.in b/configure.in
index 295769fee6f9299a59f425d32d8eef46c3374a1f..f0f42e8ca9e4c53caec3813788b94f22c23289fa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws13
+EXTRA_VERSION=claws14
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index e749d6528a12ab671bee256d74409883a9a48a4e..cf2fb562b810c0fbbd260dfbda7f6de483391192 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -328,6 +328,9 @@ gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
 
 void folder_tree_destroy(Folder *folder)
 {
+       g_return_if_fail(folder != NULL);
+       g_return_if_fail(folder->node != NULL);
+       
        prefs_scoring_clear();
        prefs_filtering_clear();
 
@@ -449,7 +452,7 @@ void folder_scan_tree(Folder *folder)
        folder_tree_destroy(folder);
 
        folder->scan_tree(folder);
-       
+
        g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
        folder_persist_prefs_free(pptable);
 

diff --git a/src/folderview.c b/src/folderview.c
index 490b9281c3134180972c593e12baf96a644e6114..efb5661cdb454a2fd1732a21587a72648d9e16d1 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1639,7 +1639,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
        }
 
-       if((item->folder->type == F_IMAP) || (item->folder->type == F_NEWS)) {
+       if(((item->folder->type == F_IMAP) && !item->no_select) || (item->folder->type == F_NEWS)) {
                folder_item_scan(item);
        }
 

diff --git a/src/imap.c b/src/imap.c
index c3d32ef90b45babb62a7512454d2f977b144358a..4345162aa08db970bc1ed5a83faf8a9922bd3f76 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -359,6 +359,9 @@ static gboolean imap_reset_uid_lists_func(GNode *node, gpointer data)
 
 static void imap_reset_uid_lists(Folder *folder)
 {
+       if(folder->node == NULL)
+               return;
+       
        /* Destroy all uid lists and rest last uid */
        g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, imap_reset_uid_lists_func, NULL); 
 }
@@ -1065,9 +1068,9 @@ void imap_scan_tree(Folder *folder)
                debug_print("IMAP root directory: %s\n", root_folder);
        }
 
-       folder_tree_destroy(folder);
        item = folder_item_new(folder, folder->name, root_folder);
        item->folder = folder;
+       item->no_select = TRUE;
        folder->node = g_node_new(item);
 
        imap_scan_tree_recursive(session, item);