2004-08-13 [colin] 0.9.12cvs60.1

	* src/folderutils.c
		Sync with HEAD 0.9.12cvs60

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d5a2888ffa4570b6f485c3e02c68f16d9a7c5b90..9b1d02ea4062badc0c92b0e750a2c152a92df64e 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-08-13 [colin]     0.9.12cvs60.1
+
+       * src/folderutils.c
+               Sync with HEAD 0.9.12cvs60
+
 2004-08-12 [colin]     0.9.12cvs59.1
 
        * src/plugins/trayicon/trayicon.c

diff --git a/PATCHSETS b/PATCHSETS
index b0d3dde4c412afd099dc84f121129969d5c51ee9..f0b22d4dd325fdabcd46b262cc47b6a496ad8341 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -117,3 +117,4 @@
 ( cvs diff -u -r 1.96.2.16 -r 1.96.2.17 src/textview.c; ) > 0.9.12cvs57.4.patchset
 ( cvs diff -u -r 1.7 -r 1.8 sylpheed.desktop; cvs diff -u -r 1.654.2.147 -r 1.654.2.148 configure.ac; cvs diff -u -r 1.155.2.9 -r 1.155.2.10 src/Makefile.am; cvs diff -u -r 1.115.2.14 -r 1.115.2.15 src/main.c; ) > 0.9.12cvs57.5.patchset
 ( cvs diff -u -r 1.14.2.8 -r 1.14.2.9 src/plugins/trayicon/trayicon.c; ) > 0.9.12cvs59.1.patchset
+( cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/folderutils.c; ) > 0.9.12cvs60.1.patchset

diff --git a/configure.ac b/configure.ac
index 4889ba64c468cf3ef0d748bad38f469b0ef897f4..7173f8a0204650d8fb3a8e2aa70016d5911507e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=59
+EXTRA_VERSION=60
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/folderutils.c b/src/folderutils.c
index 9460c1ffbc227e962ec2f204c31e8299cf8a5d8d..bc8d7470a344582e81998809699407b22f4e1958 100644 (file)
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -35,13 +35,12 @@ gint folderutils_delete_duplicates(FolderItem *item,
        
        debug_print("Deleting duplicated messages...\n");
 
-       folder_item_update_freeze();
-
        msglist = folder_item_get_msg_list(item);
        if (msglist == NULL)
                return 0;
        table = g_hash_table_new(g_str_hash, g_str_equal);
 
+       folder_item_update_freeze();
        for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
                MsgInfo *msginfo = (MsgInfo *) cur->data;
                MsgInfo *msginfo_dup = NULL;