commit - c515a3204708adf33a6d5b7a092b1f4c0664ad2d
commit + 07a6dcad83007b7b805d20d108f6e8785a338349
blob - d5a2888ffa4570b6f485c3e02c68f16d9a7c5b90
blob + 9b1d02ea4062badc0c92b0e750a2c152a92df64e
--- ChangeLog-gtk2.claws
+++ 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
blob - b0d3dde4c412afd099dc84f121129969d5c51ee9
blob + f0b22d4dd325fdabcd46b262cc47b6a496ad8341
--- PATCHSETS
+++ 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
blob - 4889ba64c468cf3ef0d748bad38f469b0ef897f4
blob + 7173f8a0204650d8fb3a8e2aa70016d5911507e5
--- configure.ac
+++ 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
 
blob - 9460c1ffbc227e962ec2f204c31e8299cf8a5d8d
blob + bc8d7470a344582e81998809699407b22f4e1958
--- src/folderutils.c
+++ 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;