diff options
| -rw-r--r-- | camel/ChangeLog | 9 | ||||
| -rw-r--r-- | camel/camel-vtrash-folder.c | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 7641449212..1655d50437 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2001-09-28 Jeffrey Stedfast <fejj@ximian.com> + + * camel-vtrash-folder.c (vtrash_move_messages_to): Oops, a + CamelFolder is not a CamelFolderClass. + 2001-09-28 Dan Winship <danw@ximian.com> * camel-tcp-stream-openssl.c (ssl_error_to_errno): Make this take @@ -24,8 +29,8 @@ * camel-service.c (camel_service_connect): Dont re-register the connect_op if we got it by calling 'operation_registered', which returns an already-registered one. - (camel_service_disconnect): Likewise here. - This removes all the re-registered warnings. + (camel_service_disconnect): Likewise here. This removes all the + re-registered warnings. * camel-object.c (camel_object_unref): Fill the finalised data with nonsense, rather than 0's - more easily detect bad data. diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c index be662022f6..1e7f7b8f67 100644 --- a/camel/camel-vtrash-folder.c +++ b/camel/camel-vtrash-folder.c @@ -30,6 +30,9 @@ #include <string.h> +/* Returns the class for a CamelFolder */ +#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so)) + static CamelVeeFolderClass *camel_vtrash_folder_parent; static void vtrash_append_message (CamelFolder *folder, CamelMimeMessage *message, @@ -121,7 +124,7 @@ vtrash_move_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest if (dest == mi->folder) { /* Just undelete the original message */ - CAMEL_FOLDER_CLASS (dest)->set_message_flags (dest, uids->pdata[i], CAMEL_MESSAGE_DELETED, 0); + CF_CLASS (dest)->set_message_flags (dest, uids->pdata[i], CAMEL_MESSAGE_DELETED, 0); } else { /* This means that the user is trying to move the message from the vTrash to a folder other than the original. */ |