summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2019-05-29 10:47:12 +0200
committerMilan Crha <mcrha@redhat.com>2019-05-29 10:47:12 +0200
commitb057d6bb774d49aef0b2d0601bd56776a994a06c (patch)
treef82e085e01edf50a61668f796e11d2f22a012642
parent1c5b327c7facb7264d01ddde3cb3a9a5b2cae375 (diff)
downloadevolution-data-server-b057d6bb774d49aef0b2d0601bd56776a994a06c.tar.gz
I#108 - [IMAPx] Folder changes could be claimed in a wrong folder after APPEND
Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/108
-rw-r--r--src/camel/providers/imapx/camel-imapx-server.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
index 77596caf9..b71e87694 100644
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
@@ -4852,6 +4852,7 @@ camel_imapx_server_copy_message_sync (CamelIMAPXServer *is,
if (camel_folder_change_info_changed (dest_changes)) {
camel_folder_summary_touch (destination_summary);
camel_folder_summary_save (destination_summary, NULL);
+ imapx_update_store_summary (destination_folder);
camel_folder_changed (destination_folder, dest_changes);
}
@@ -5107,6 +5108,7 @@ camel_imapx_server_append_message_sync (CamelIMAPXServer *is,
if (ic->status && ic->status->condition == IMAPX_APPENDUID) {
c (is->priv->tagprefix, "Got appenduid %u %u\n", (guint32) ic->status->u.appenduid.uidvalidity, ic->status->u.appenduid.uid);
if (ic->status->u.appenduid.uidvalidity == uidvalidity) {
+ CamelFolderChangeInfo *dest_changes;
gchar *uid;
uid = g_strdup_printf ("%u", ic->status->u.appenduid.uid);
@@ -5127,11 +5129,13 @@ camel_imapx_server_append_message_sync (CamelIMAPXServer *is,
camel_folder_summary_add (camel_folder_get_folder_summary (folder), clone, TRUE);
- g_mutex_lock (&is->priv->changes_lock);
- camel_folder_change_info_add_uid (is->priv->changes, camel_message_info_get_uid (clone));
- g_mutex_unlock (&is->priv->changes_lock);
+ dest_changes = camel_folder_change_info_new ();
+ camel_folder_change_info_add_uid (dest_changes, camel_message_info_get_uid (clone));
camel_folder_summary_save (camel_folder_get_folder_summary (folder), NULL);
+ imapx_update_store_summary (folder);
+ camel_folder_changed (folder, dest_changes);
+ camel_folder_change_info_free (dest_changes);
if (appended_uid)
*appended_uid = uid;
@@ -6403,7 +6407,7 @@ camel_imapx_server_expunge_sync (CamelIMAPXServer *is,
camel_folder_summary_remove_uids (folder_summary, removed);
camel_folder_summary_save (folder_summary, NULL);
-
+ imapx_update_store_summary (folder);
camel_folder_changed (folder, changes);
camel_folder_change_info_free (changes);