diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-store.c | 2 | ||||
| -rw-r--r-- | camel/camel-vtrash-folder.c | 13 | ||||
| -rw-r--r-- | camel/camel-vtrash-folder.h | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 4f598cbb59..cb0509d897 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-07-17 Jeffrey Stedfast <fejj@ximian.com> + + * camel-store.c (init_trash): Use CAMEL_VTRASH_NAME. + + * camel-vtrash-folder.h: #define CAMEL_VTRASH_NAME + 2001-07-16 Dan Winship <danw@ximian.com> * providers/imap/camel-imap-command.c (camel_imap_response_free): diff --git a/camel/camel-store.c b/camel/camel-store.c index 78f561d3b9..7abefba833 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -375,7 +375,7 @@ trash_finalize (CamelObject *trash, gpointer event_data, gpointer user_data) static void init_trash (CamelStore *store) { - store->vtrash = camel_vtrash_folder_new (store, _("Trash")); + store->vtrash = camel_vtrash_folder_new (store, CAMEL_VTRASH_NAME); if (store->vtrash) { /* attach to the finalise event of the vtrash */ diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c index ed8e9f0765..d76c9f851c 100644 --- a/camel/camel-vtrash-folder.c +++ b/camel/camel-vtrash-folder.c @@ -116,12 +116,12 @@ vtrash_move_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest int i; for (i = 0; i < uids->len; i++) { - mi = (CamelVeeMessageInfo *)camel_folder_get_message_info(source, uids->pdata[i]); + mi = (CamelVeeMessageInfo *)camel_folder_get_message_info (source, uids->pdata[i]); if (mi == NULL) { - g_warning("Cannot find uid %s in source folder during move_to", (char *)uids->pdata[i]); + g_warning ("Cannot find uid %s in source folder during move_to", (char *) uids->pdata[i]); continue; } - + if (dest == mi->folder) { /* Just undelete the original message */ CAMEL_FOLDER_CLASS (dest)->set_message_flags (dest, uids->pdata[i], CAMEL_MESSAGE_DELETED, 0); @@ -132,11 +132,10 @@ vtrash_move_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest tuids = g_ptr_array_new (); g_ptr_array_add (tuids, uids->pdata[i]); - /*CAMEL_FOLDER_CLASS (mi->folder)->move_messages_to (mi->folder, tuids, dest, ex);*/ - camel_folder_move_messages_to(mi->folder, tuids, dest, ex); + camel_folder_move_messages_to (mi->folder, tuids, dest, ex); g_ptr_array_free (tuids, TRUE); } - - camel_folder_free_message_info(source, (CamelMessageInfo *)mi); + + camel_folder_free_message_info (source, (CamelMessageInfo *)mi); } } diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h index 7f5dd1b79e..f01a28ff55 100644 --- a/camel/camel-vtrash-folder.h +++ b/camel/camel-vtrash-folder.h @@ -27,6 +27,8 @@ #include <camel/camel-folder.h> #include <camel/camel-vee-folder.h> +#define CAMEL_VTRASH_NAME "Trash" + #define CAMEL_VTRASH_FOLDER(obj) CAMEL_CHECK_CAST (obj, camel_vtrash_folder_get_type (), CamelVTrashFolder) #define CAMEL_VTRASH_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vtrash_folder_get_type (), CamelVTrashFolderClass) #define CAMEL_IS_VTRASH_FOLDER(obj) CAMEL_CHECK_TYPE (obj, camel_vtrash_folder_get_type ()) |