aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog2
-rw-r--r--camel/camel-folder.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 96aae92593..0eac71a00a 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -41,6 +41,8 @@
anymore (this wouldn't failed anyway, it was a GList !!!)
(camel_folder_search_complete): Removed.
(camel_folder_search_cancel): Removed.
+ (camel_folder_expunge): Changed to only allow expunge on an open
+ folder. It doesn't make sense for mbox, otherwise (?)
* camel-folder.h (struct _CamelFolder): Change permanent_flags to
a bitfield.
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 446b511221..fdf0817a90 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -995,7 +995,7 @@ void
camel_folder_expunge (CamelFolder *folder, CamelException *ex)
{
g_assert (folder != NULL);
- g_assert (!camel_folder_is_open (folder));
+ g_assert (camel_folder_is_open (folder));
return CF_CLASS (folder)->expunge (folder, ex);
}