* src/folderview.c
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Tue, 9 Sep 2003 19:49:02 +0000 (19:49 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Tue, 9 Sep 2003 19:49:02 +0000 (19:49 +0000)
o proper check for root node sorting
o remove unnecessary gtk_ctree_remove_node

(should fix bug #300, "crash while moving folder")

ChangeLog.claws
configure.ac
src/folderview.c

index 5bf1eb9..f16d6bf 100644 (file)
@@ -1,3 +1,11 @@
+2003-09-09 [alfons]    0.9.4claws74
+
+       * src/folderview.c
+               o proper check for root node sorting
+               o remove unnecessary gtk_ctree_remove_node 
+
+       (should fix bug #300, "crash while moving folder")      
+
 2003-09-08 [christoph] 0.9.4claws73
 
        * src/folderview.c
index b654171..e55336c 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=73
+EXTRA_VERSION=74
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 6269ac1..dc1d1bb 100644 (file)
@@ -1319,7 +1319,7 @@ static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
 
        gtk_sctree_sort_recursive(ctree, root);
 
-       if (GTK_CTREE_ROW(root)->parent) return;
+       if (root && GTK_CTREE_ROW(root)->parent) return;
 
        SET_SPECIAL_FOLDER(ctree, folder->inbox);
        SET_SPECIAL_FOLDER(ctree, folder->outbox);
@@ -2562,11 +2562,6 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                folder_item_update_thaw();
-               if (src_node)
-                       gtk_ctree_remove_node(GTK_CTREE(folderview->ctree), src_node);
-               else 
-                       debug_print("can't remove src node: is null\n");
-
                folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
 
                folderview_sort_folders(folderview,