aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/camel-folder.c7
2 files changed, 8 insertions, 6 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 351d917b37..4913173ef4 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-11 Dan Winship <danw@ximian.com>
+
+ * camel-folder.c (camel_folder_copy_message_to): Fix a locking
+ problem. (One branch of an if statement was returning with the
+ lock still locked.) Also remove the deprecation comments, to match
+ move_message_to.
+
2001-01-10 Jeffrey Stedfast <fejj@helixcode.com>
* providers/local/camel-local-provider.c: Changed the descriptions
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index f13292fdf7..682a4902f0 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1095,9 +1095,6 @@ copy_message_to (CamelFolder *source, const char *uid, CamelFolder *dest, CamelE
* This copies a message from one folder to another. If the @source and
* @dest folders have the same parent_store, this may be more efficient
* than a camel_folder_append_message().
- *
- * FIXME: This call should be deprecated, as append_message() can determine
- * this information for itself.
**/
void
camel_folder_copy_message_to (CamelFolder *source, const char *uid,
@@ -1107,12 +1104,10 @@ camel_folder_copy_message_to (CamelFolder *source, const char *uid,
g_return_if_fail (CAMEL_IS_FOLDER (dest));
g_return_if_fail (uid != NULL);
- g_warning("CamelFolder.copy_message_to() is a deprecated api");
-
CAMEL_FOLDER_LOCK(source, lock);
if (source->parent_store == dest->parent_store)
- return CF_CLASS (source)->copy_message_to (source, uid, dest, ex);
+ CF_CLASS (source)->copy_message_to (source, uid, dest, ex);
else
copy_message_to (source, uid, dest, ex);