From: Colin Leroy Date: Sat, 16 Sep 2006 16:34:35 +0000 (+0000) Subject: 2006-09-16 [colin] 2.4.0cvs195 X-Git-Tag: rel_2_5_0~21 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a6536e7f46e7677f2cb5987a8b7bed9fa76f2025 2006-09-16 [colin] 2.4.0cvs195 * src/folderview.c Fix "real-time" sorting by freezing/thawing --- diff --git a/ChangeLog b/ChangeLog index c1dde9d9a..b65925290 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-16 [colin] 2.4.0cvs195 + + * src/folderview.c + Fix "real-time" sorting by freezing/thawing + 2006-09-16 [colin] 2.4.0cvs194 * manual/faq.xml diff --git a/PATCHSETS b/PATCHSETS index a149fd78c..366cefc8a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1886,3 +1886,4 @@ ( cvs diff -u -r 1.115.2.103 -r 1.115.2.104 src/main.c; ) > 2.4.0cvs192.patchset ( cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/wizard.c; ) > 2.4.0cvs193.patchset ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/faq.xml; ) > 2.4.0cvs194.patchset +( cvs diff -u -r 1.207.2.120 -r 1.207.2.121 src/folderview.c; ) > 2.4.0cvs195.patchset diff --git a/configure.ac b/configure.ac index 5323eb435..50b4562cf 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=194 +EXTRA_VERSION=195 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folderview.c b/src/folderview.c index f75828655..10aac2ff9 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -1799,15 +1799,18 @@ static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root, GtkCTree *ctree = GTK_CTREE(folderview->ctree); GtkCTreeNode *prev = NULL; + gtk_clist_freeze(GTK_CLIST(ctree)); gtk_sctree_sort_recursive(ctree, root); - - if (root && GTK_CTREE_ROW(root)->parent) return; - + if (root && GTK_CTREE_ROW(root)->parent) { + gtk_clist_thaw(GTK_CLIST(ctree)); + return; + } set_special_folder(ctree, folder->inbox, root, &prev); set_special_folder(ctree, folder->outbox, root, &prev); set_special_folder(ctree, folder->draft, root, &prev); set_special_folder(ctree, folder->queue, root, &prev); set_special_folder(ctree, folder->trash, root, &prev); + gtk_clist_thaw(GTK_CLIST(ctree)); } static void folderview_append_folder(FolderView *folderview, Folder *folder)