From: Parthasarathi Susarla <sparthasarathi@novell.com>
Date: Mon, 12 Jun 2006 09:20:04 +0000 (+0000)
Subject: Fixes bug #166265 on bnc
X-Git-Tag: upstream/3.7.4~6281
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c80cccff4c9531b8ccf2b8f7e54ad815fbc70462;p=platform%2Fupstream%2Fevolution-data-server.git

Fixes bug #166265 on bnc

2006-06-12  Parthasarathi Susarla <sparthasarathi@novell.com>

	Fixes bug #166265 on bnc

	* camel-groupwise-folder.c: call purgeRequest when
	deleting on Trash folder
---

diff --git a/camel/providers/groupwise/ChangeLog b/camel/providers/groupwise/ChangeLog
index d7ed984..010e59e 100644
--- a/camel/providers/groupwise/ChangeLog
+++ b/camel/providers/groupwise/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-12  Parthasarathi Susarla <sparthasarathi@novell.com>
+	
+	Fixes bug #166265 on bnc
+	
+	* camel-groupwise-folder.c: call purgeRequest when
+	deleting on Trash folder
+
 2006-06-09  Sankar P  <psankar@novell.com>
 
 	* camel-groupwise-folder.c:
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index 430fb7b..0daa4ae 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -682,7 +682,11 @@ groupwise_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 	CAMEL_GROUPWISE_FOLDER_UNLOCK (folder, cache_lock);
 	if (deleted_items) {
 		CAMEL_SERVICE_LOCK (gw_store, connect_lock);
-		status = e_gw_connection_remove_items (cnc, container_id, deleted_items);
+		if (!strcmp (folder->full_name, "Trash")) {
+			status = e_gw_connection_purge_selected_items (cnc, deleted_items);
+		} else {
+			status = e_gw_connection_remove_items (cnc, container_id, deleted_items);
+		}
 		CAMEL_SERVICE_UNLOCK (gw_store, connect_lock);
 		if (status == E_GW_CONNECTION_STATUS_OK) {
 			char *uid;