[evolution-mapi/wip/camel-more-gobject] Seal CamelStore properties

[Milan Crha <mcrha src gnome org>]

commit 9b2ab8d0ee4e7f080f35fdb187162b30a188c96e
Author: Milan Crha <mcrha redhat com>
Date:   Tue Nov 1 23:12:13 2016 +0100

    Seal CamelStore properties

 src/camel/camel-mapi-folder.c |    2 +-
 src/camel/camel-mapi-store.c  |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 43f7f13..eb48938 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -1290,7 +1290,7 @@ mapi_folder_expunge_sync (CamelFolder *folder,
                gint ii;
 
                /* get deleted messages from all active folders too */
-               folders = camel_object_bag_list (parent_store->folders);
+               folders = camel_store_dup_opened_folders (parent_store);
                for (ii = 0; ii < folders->len; ii++) {
                        CamelFolder *opened_folder = CAMEL_FOLDER (folders->pdata[ii]);
                        CamelMapiFolder *mf;
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index 336ab5f..2a8a4d9 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -2088,10 +2088,9 @@ mapi_store_constructed (GObject *object)
        /*priv->parent_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); / * folder ID 
to its parent folder ID */
        priv->default_folders = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, g_free); /* default 
folder type to folder ID */
        priv->container_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-       store->flags &= ~CAMEL_STORE_VJUNK;
-       store->flags &= ~CAMEL_STORE_VTRASH;
 
-       store->flags |= CAMEL_STORE_REAL_JUNK_FOLDER | CAMEL_STORE_USE_CACHE_DIR;
+       camel_store_set_flags (store, (camel_store_get_flags (store) & ~(CAMEL_STORE_VJUNK | 
CAMEL_STORE_VTRASH)) |
+               CAMEL_STORE_REAL_JUNK_FOLDER | CAMEL_STORE_USE_CACHE_DIR);
 
        g_free (path);
 }