2005-10-03 [colin] 1.9.15cvs2

	* src/folder.c
		Faster close when leaving a folder with lots
		of new mails. Idea by David Relson.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d4b39745e1ce7e6141c341b37a4c0971f4640283..d3e2d84904c50551ed9f6c8203da58a32a3c36c0 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-10-03 [colin]     1.9.15cvs2
+
+       * src/folder.c
+               Faster close when leaving a folder with lots
+               of new mails. Idea by David Relson.
+
 2005-10-03 [colin]     1.9.15cvs1
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index daac0e3a125a51db0e226a38e66de0362d8f3956..3d3624c388165dbdfd1678a88cab7ded9fca8649 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -838,3 +838,4 @@
 ( cvs diff -u -r 1.17.2.19 -r 1.17.2.20 src/send_message.c;  ) > 1.9.14cvs67.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/ca.po;  cvs diff -u -r 1.58.2.13 -r 1.58.2.14 po/de.po;  cvs diff -u -r 1.60.2.15 -r 1.60.2.16 po/es.po;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/fi.po;  cvs diff -u -r 1.42.2.15 -r 1.42.2.16 po/fr.po;  cvs diff -u -r 1.2.2.16 -r 1.2.2.17 po/sk.po;  cvs diff -u -r 1.17.2.13 -r 1.17.2.14 po/sr.po;  cvs diff -u -r 1.5.2.9 -r 1.5.2.10 po/zh_CN.po;  ) > 1.9.14cvs68.patchset
 ( cvs diff -u -r 1.382.2.177 -r 1.382.2.178 src/compose.c;  cvs diff -u -r 1.179.2.73 -r 1.179.2.74 src/imap.c;  cvs diff -u -r 1.149.2.35 -r 1.149.2.36 src/inc.c;  cvs diff -u -r 1.115.2.56 -r 1.115.2.57 src/main.c;  cvs diff -u -r 1.94.2.65 -r 1.94.2.66 src/messageview.c;  cvs diff -u -r 1.101.2.16 -r 1.101.2.17 src/news.c;  cvs diff -u -r 1.395.2.128 -r 1.395.2.129 src/summaryview.c;  cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/gtk/sslcertwindow.c;  cvs diff -u -r 1.14.2.20 -r 1.14.2.21 src/plugins/trayicon/trayicon.c;  ) > 1.9.15cvs1.patchset
+( cvs diff -u -r 1.213.2.57 -r 1.213.2.58 src/folder.c;  ) > 1.9.15cvs2.patchset

diff --git a/configure.ac b/configure.ac
index 603ae9137111c75b3778ca0e0b4a932ffb83bac4..7fe7b18ce3afb0bc7e4d6e158c664b6cd93ec4c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 53851fba4fb49060f89345281a442974ca23e014..037790fbd5faf0389dd3a1d6fab62322fb04f60a 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -51,6 +51,7 @@
 #include "remotefolder.h"
 #include "partial_download.h"
 #include "statusbar.h"
+#include "summaryview.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -1492,6 +1493,8 @@ gint folder_item_close(FolderItem *item)
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->no_select == FALSE, -1);
 
+       summary_lock(mainwindow_get_mainwindow()->summaryview);
+
        if (item->new_msgs) {
                folder_item_update_freeze();
                mlist = folder_item_get_msg_list(item);
@@ -1511,6 +1514,8 @@ gint folder_item_close(FolderItem *item)
        
        folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
 
+       summary_unlock(mainwindow_get_mainwindow()->summaryview);
+       
        item->opened = FALSE;
        folder = item->folder;