diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-02-12 17:25:02 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-02-12 17:25:02 +0000 |
| commit | 251da9ddf1e96ab0c5e5247676940a7d44b53fe4 (patch) | |
| tree | 7be22fc30601620acd7c5a48654e7cea098dd71c /gnome-extra/evolution-data-server/files | |
| parent | Version bump. Enable non-display calibrate. Add reference kind for camera cal... (diff) | |
| download | gentoo-2-251da9ddf1e96ab0c5e5247676940a7d44b53fe4.tar.gz gentoo-2-251da9ddf1e96ab0c5e5247676940a7d44b53fe4.tar.bz2 gentoo-2-251da9ddf1e96ab0c5e5247676940a7d44b53fe4.zip | |
Fix imap messages reappearing after moving/deleting them, bug #392665 by Wayne and Gilles Dartiguelongue.
(Portage version: 2.1.10.46/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/evolution-data-server/files')
| -rw-r--r-- | gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch new file mode 100644 index 000000000000..1fd7830dd720 --- /dev/null +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch @@ -0,0 +1,62 @@ +From 3ac86d14dc1ea89424de3c83e4d4b21eb1d1020e Mon Sep 17 00:00:00 2001 +From: Michel Dänzer <daenzer@debian.org> +Date: Wed, 02 Nov 2011 07:35:56 +0000 +Subject: Bug #655167 - Messages moved from IMAP Inbox reappear + +--- +diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c +index 77faa64..751e6cd 100644 +--- a/camel/providers/imap/camel-imap-folder.c ++++ b/camel/providers/imap/camel-imap-folder.c +@@ -68,11 +68,6 @@ enum { + PROP_CHECK_FOLDER = 0x2500 + }; + +-enum { +- /* used when moving messages and has real trash folder set with a google account */ +- CAMEL_MESSAGE_IMAP_MOVED = CAMEL_MESSAGE_FOLDER_FLAGGED << 1 +-}; +- + extern gint camel_application_is_exiting; + + static gboolean imap_rescan (CamelFolder *folder, gint exists, GCancellable *cancellable, GError **error); +@@ -1417,7 +1412,7 @@ get_matching (CamelFolder *folder, + } + } + +- if (deleted_uids && (info->info.flags & (CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_IMAP_MOVED)) == CAMEL_MESSAGE_DELETED) { ++ if (deleted_uids && (info->info.flags & (CAMEL_MESSAGE_DELETED | CAMEL_IMAP_MESSAGE_MOVED)) == CAMEL_MESSAGE_DELETED) { + g_ptr_array_add (deleted_uids, (gpointer) camel_pstring_strdup (camel_message_info_uid (info))); + info->info.flags &= ~CAMEL_MESSAGE_DELETED; + } else if (junked_uids && (info->info.flags & CAMEL_MESSAGE_JUNK) != 0) { +@@ -1747,7 +1742,7 @@ imap_synchronize_sync (CamelFolder *folder, + info->info.flags &= ~CAMEL_MESSAGE_DELETED; + } + +- info->info.flags &= ~(CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_IMAP_MOVED); ++ info->info.flags &= ~(CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_IMAP_MESSAGE_MOVED); + ((CamelImapMessageInfo *) info)->server_flags = info->info.flags & CAMEL_IMAP_SERVER_FLAGS; + info->info.dirty = TRUE; /* Sync it back to the DB */ + if (((CamelMessageInfo *) info)->summary) +@@ -2841,7 +2836,7 @@ do_copy (CamelFolder *source, + CamelMessageInfoBase *info = (CamelMessageInfoBase *) camel_folder_summary_get (source->summary, uids->pdata[i]); + + if (info) +- info->flags |= CAMEL_MESSAGE_IMAP_MOVED; ++ info->flags |= CAMEL_IMAP_MESSAGE_MOVED; + } + } + last = uid; +--- a/camel/providers/imap/camel-imap-summary.h~ 2011-04-21 21:35:36.000000000 +0200 ++++ b/camel/providers/imap/camel-imap-summary.h 2012-02-12 18:15:16.419609530 +0100 +@@ -53,7 +53,9 @@ + G_BEGIN_DECLS + + enum { +- CAMEL_IMAP_MESSAGE_RECENT = 1<<17 ++ CAMEL_IMAP_MESSAGE_RECENT = 1 << 17, ++ /* used when moving messages and has real trash folder set with a google account */ ++ CAMEL_IMAP_MESSAGE_MOVED = 1 << 18 + }; + + typedef struct _CamelImapSummary CamelImapSummary; |