[evolution-data-server/gnome-3-24] Bug 785136 - Summary changes can be lost on folder leave

[Milan Crha <mcrha src gnome org>]

commit 310c01d9558b49452a7a2ab50b0b10de182f60da
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jul 20 18:40:38 2017 +0200

    Bug 785136 - Summary changes can be lost on folder leave

 src/camel/camel-folder.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/camel/camel-folder.c b/src/camel/camel-folder.c
index 6c2dd10..753bd44 100644
--- a/src/camel/camel-folder.c
+++ b/src/camel/camel-folder.c
@@ -660,6 +660,11 @@ folder_dispose (GObject *object)
 
        folder = CAMEL_FOLDER (object);
 
+       if (folder->priv->summary) {
+               camel_folder_summary_save (folder->priv->summary, NULL);
+               g_clear_object (&folder->priv->summary);
+       }
+
        if (folder->priv->parent_store != NULL) {
                g_object_remove_weak_pointer (
                        G_OBJECT (folder->priv->parent_store),
@@ -667,8 +672,6 @@ folder_dispose (GObject *object)
                folder->priv->parent_store = NULL;
        }
 
-       g_clear_object (&folder->priv->summary);
-
        /* Chain up to parent's dispose () method. */
        G_OBJECT_CLASS (camel_folder_parent_class)->dispose (object);
 }