r1204 - in /unstable/evolution-data-server/debian: changelog patches/67_fix-vfolders.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Tue May  5 16:40:20 2009
New Revision: 1204

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1204
Log:
* debian/patches:
  - 67_fix-vfolders added, fix endless loop when closing.     closes: #526217

Added:
    unstable/evolution-data-server/debian/patches/67_fix-vfolders.patch
Modified:
    unstable/evolution-data-server/debian/changelog

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=1204&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Tue May  5 16:40:20 2009
@@ -8,8 +8,10 @@
     to avoid ABI breakages.
   * debian/control:
     - add a Breaks: for evolution 2.24.                         closes: #525742
-
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 27 Apr 2009 19:51:21 +0200
+  * debian/patches:
+    - 67_fix-vfolders added, fix endless loop when closing.     closes: #526217
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 05 May 2009 18:39:34 +0200
 
 evolution-data-server (2.26.1.1-1) unstable; urgency=low
 

Added: unstable/evolution-data-server/debian/patches/67_fix-vfolders.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/67_fix-vfolders.patch?rev=1204&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/67_fix-vfolders.patch (added)
+++ unstable/evolution-data-server/debian/patches/67_fix-vfolders.patch Tue May  5 16:40:20 2009
@@ -1,0 +1,42 @@
+commit 9bcf7a016d847a3e097247aab471da4c9c0662de
+Author: Srinivasa Ragavan <sragavan at novell.com>
+Date:   Tue May 5 16:41:16 2009 +0530
+
+    ** BUGFIX: 579360 - Problem with vfolders
+    
+    Fix for vfolder hang.
+
+diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
+index 0b39cf6..8645b8c 100644
+--- a/camel/camel-vee-folder.c
++++ b/camel/camel-vee-folder.c
+@@ -1052,7 +1052,8 @@ unmatched_check_uid(char *uidin, void *value, struct _update_data *u)
+ 	} else {
+ 		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(((CamelFolder *)u->folder_unmatched)->summary, uid);
+ 		if (mi) {
+-			camel_folder_summary_remove(((CamelFolder *)u->folder_unmatched)->summary, (CamelMessageInfo *)mi);
++			camel_db_delete_uid_from_vfolder_transaction (((CamelFolder *)u->folder_unmatched)->parent_store->cdb_w, ((CamelFolder *)u->folder_unmatched)->full_name, uid, NULL);
++			camel_folder_summary_remove_uid_fast (((CamelFolder *)u->folder_unmatched)->summary, uid);
+ 			camel_folder_change_info_remove_uid(u->folder_unmatched->changes, uid);
+ 			camel_message_info_free((CamelMessageInfo *)mi);
+ 		}
+@@ -1340,7 +1341,8 @@ folder_changed_add_uid(CamelFolder *sub, const char *uid, const char hash[8], Ca
+ 		vinfo = (CamelVeeMessageInfo *)camel_folder_get_message_info((CamelFolder *)folder_unmatched, vuid);
+ 		if (vinfo) {
+ 			camel_folder_change_info_remove_uid(folder_unmatched->changes, vuid);
+-			camel_folder_summary_remove(((CamelFolder *)folder_unmatched)->summary, (CamelMessageInfo *)vinfo);
++			camel_db_delete_uid_from_vfolder_transaction (folder->parent_store->cdb_w, ((CamelFolder *)folder_unmatched)->full_name, vuid, NULL);
++			camel_folder_summary_remove_uid_fast(((CamelFolder *)folder_unmatched)->summary, vuid);
+ 			camel_folder_free_message_info((CamelFolder *)folder_unmatched, (CamelMessageInfo *)vinfo);
+ 		}
+ 	}
+@@ -1392,7 +1394,8 @@ folder_changed_remove_uid(CamelFolder *sub, const char *uid, const char hash[8],
+ 			vinfo = (CamelVeeMessageInfo *)camel_folder_get_message_info((CamelFolder *)folder_unmatched, vuid);
+ 			if (vinfo) {
+ 				camel_folder_change_info_remove_uid(folder_unmatched->changes, vuid);
+-				camel_folder_summary_remove_uid(((CamelFolder *)folder_unmatched)->summary, vuid);
++				camel_db_delete_uid_from_vfolder_transaction (folder->parent_store->cdb_w, ((CamelFolder *)folder_unmatched)->full_name, vuid, NULL);
++				camel_folder_summary_remove_uid_fast(((CamelFolder *)folder_unmatched)->summary, vuid);
+ 				camel_folder_free_message_info((CamelFolder *)folder_unmatched, (CamelMessageInfo *)vinfo);
+ 			}
+ 		}