2007-01-16 [colin] 2.7.1cvs10

	* src/folderview.c
		Fix annoying vscrollbar going back to top
		on Check for new folders

diff --git a/ChangeLog b/ChangeLog
index 857992ecccf71ad8f775b2481831ee84253b870a..2cdae852c9b1dccd2c11d702bf9098b4b461fef7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-16 [colin]     2.7.1cvs10
+
+       * src/folderview.c
+               Fix annoying vscrollbar going back to top
+               on Check for new folders
+
 2007-01-16 [colin]     2.7.1cvs9
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 821ad64c2c12f589a8cf706195cce77843fd789a..03d27dad0b71054c8586df2ce000fcd8be31a734 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2267,3 +2267,4 @@
 ( cvs diff -u -r 1.395.2.276 -r 1.395.2.277 src/summaryview.c;  ) > 2.7.1cvs7.patchset
 ( cvs diff -u -r 1.60.2.24 -r 1.60.2.25 src/filtering.c;  cvs diff -u -r 1.179.2.150 -r 1.179.2.151 src/imap.c;  cvs diff -u -r 1.34.2.10 -r 1.34.2.11 src/imap.h;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/imap_gtk.c;  cvs diff -u -r 1.105.2.79 -r 1.105.2.80 src/prefs_account.c;  cvs diff -u -r 1.49.2.24 -r 1.49.2.25 src/prefs_account.h;  cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/wizard.c;  cvs diff -u -r 1.1.4.70 -r 1.1.4.71 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/etpan/imap-thread.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 manual/handling.xml;  ) > 2.7.1cvs8.patchset
 ( cvs diff -u -r 1.179.2.151 -r 1.179.2.152 src/imap.c;  ) > 2.7.1cvs9.patchset
+( cvs diff -u -r 1.207.2.142 -r 1.207.2.143 src/folderview.c;  ) > 2.7.1cvs10.patchset

diff --git a/configure.ac b/configure.ac
index f7158027032f26e42b7aaa4d870ccf27622da8ef..6190b20dbbf0816761f89d05b0a9293698f1bc50 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 55607d541a7ef773291eea6e91de91b8ea9b77cc..4ecb0fc75de820dc2d5c5ede5a270aa8950173fa 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1082,6 +1082,10 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
 void folderview_rescan_tree(Folder *folder, gboolean rebuild)
 {
        GtkWidget *window;
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+       FolderView *folderview = NULL;
+       GtkAdjustment *pos = NULL;
+       gint height = 0;
 
        g_return_if_fail(folder != NULL);
 
@@ -1103,12 +1107,26 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
        else 
                window = label_window_create(_("Scanning folder tree..."));
 
+       if (mainwin)
+               folderview = mainwin->folderview;
+       
+       if (folderview) {
+               pos = gtk_scrolled_window_get_vadjustment(
+                                       GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+               height = pos->value;
+       }
+
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
        folder_scan_tree(folder, rebuild);
        folder_set_ui_func(folder, NULL, NULL);
 
        folderview_set_all();
 
+       if (folderview) {
+               pos = gtk_scrolled_window_get_vadjustment(
+                                       GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+               gtk_adjustment_set_value(pos, height);
+       }
        gtk_widget_destroy(window);
        inc_unlock();
 }