Sorry, I think I forgot to attach the patch.
Thanks,
Sushma.
On Wed, 2006-01-04 at 10:56 +0530, Sushma Rai wrote:
> This patch removes an error string.
> Please review.
>
>
> Thanks,
> Sushma.
> _______________________________________________
> Evolution-patches mailing list
> [EMAIL PROTECTED]
> http://mail.gnome.org/mailman/listinfo/evolution-patches
Index: camel/camel-exchange-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/camel/camel-exchange-folder.c,v
retrieving revision 1.20
diff -u -p -r1.20 camel-exchange-folder.c
--- camel/camel-exchange-folder.c 15 Sep 2005 13:29:33 -0000 1.20
+++ camel/camel-exchange-folder.c 3 Jan 2006 10:03:56 -0000
@@ -223,20 +223,16 @@ exchange_expunge (CamelFolder *folder, C
}
trash = camel_store_get_trash (folder->parent_store, NULL);
- if (trash)
- camel_object_unref (CAMEL_OBJECT (trash));
- if (trash != folder) {
- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Can only expunge in Deleted Items folder"));
+ if (!trash)
return;
- }
- uids = camel_folder_get_uids (folder);
+ uids = camel_folder_get_uids (trash);
camel_stub_send (exch->stub, ex, CAMEL_STUB_CMD_EXPUNGE_UIDS,
- CAMEL_STUB_ARG_FOLDER, folder->full_name,
+ CAMEL_STUB_ARG_FOLDER, trash->full_name,
CAMEL_STUB_ARG_STRINGARRAY, uids,
CAMEL_STUB_ARG_END);
- camel_folder_free_uids (folder, uids);
+ camel_folder_free_uids (trash, uids);
+ camel_object_unref (CAMEL_OBJECT (trash));
}
static void
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.435
diff -u -p -r1.435 ChangeLog
--- ChangeLog 2 Jan 2006 15:30:38 -0000 1.435
+++ ChangeLog 4 Jan 2006 05:19:09 -0000
@@ -1,3 +1,8 @@
+2006-01-04 Sushma Rai <[EMAIL PROTECTED]>
+
+ * camel/camel-exchange-folder.c (exchange_expunge): Expunge deleted
+ items from all folders. Fixes #273546
+
2006-01-02 Sushma Rai <[EMAIL PROTECTED]>
* configure.in : Bumped the version to 2.5.4
_______________________________________________
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n
