[evolution-ews/gnome-3-22] Bug 738093 - Show folder names with slash properly ][

[Milan Crha <mcrha src gnome org>]

commit 12f6ed4581260301f702d05ec1896264a48f6769
Author: Milan Crha <mcrha redhat com>
Date:   Wed Oct 19 18:53:32 2016 +0200

    Bug 738093 - Show folder names with slash properly ][

 src/camel/camel-ews-store-summary.c |    2 +-
 src/camel/camel-ews-store.c         |    5 +++--
 src/camel/camel-ews-utils.c         |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/camel/camel-ews-store-summary.c b/src/camel/camel-ews-store-summary.c
index e672cd7..f8d86f5 100644
--- a/src/camel/camel-ews-store-summary.c
+++ b/src/camel/camel-ews-store-summary.c
@@ -14,7 +14,7 @@
 #define S_UNLOCK(x) (g_rec_mutex_unlock(&(x)->priv->s_lock))
 
 #define STORE_GROUP_NAME "##storepriv"
-#define CURRENT_SUMMARY_VERSION 2
+#define CURRENT_SUMMARY_VERSION 3
 
 struct _CamelEwsStoreSummaryPrivate {
        GKeyFile *key_file;
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index f4618ca..ff69b3f 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -1562,7 +1562,7 @@ ews_store_update_foreign_subfolders (CamelSession *session,
                                        camel_ews_store_summary_new_folder (
                                                ews_store->summary,
                                                folder_id->id, parent_fid ? parent_fid->id : euf->folder_id, 
folder_id->change_key,
-                                               e_ews_folder_get_name (folder), E_EWS_FOLDER_TYPE_MAILBOX,
+                                               e_ews_folder_get_escaped_name (folder), 
E_EWS_FOLDER_TYPE_MAILBOX,
                                                CAMEL_FOLDER_SUBSCRIBED, e_ews_folder_get_total_count 
(folder), TRUE, FALSE);
 
                                        fi = camel_ews_utils_build_folder_info (ews_store, folder_id->id);
@@ -3148,7 +3148,8 @@ ews_store_find_public_folder (CamelEwsStore *ews_store,
                                break;
                        }
 
-                       if (g_strcmp0 (e_ews_folder_get_name (subf), fname) == 0) {
+                       if (g_strcmp0 (e_ews_folder_get_name (subf), fname) == 0 ||
+                           g_strcmp0 (e_ews_folder_get_escaped_name (subf), fname) == 0) {
                                parent_id = e_ews_folder_get_parent_id (subf);
                                if (!folder && (!parent_id || g_strcmp0 (parent_id->id, 
EWS_PUBLIC_FOLDER_ROOT_ID) == 0)) {
                                        folder = subf;
diff --git a/src/camel/camel-ews-utils.c b/src/camel/camel-ews-utils.c
index f9a8d42..82a128f 100644
--- a/src/camel/camel-ews-utils.c
+++ b/src/camel/camel-ews-utils.c
@@ -190,7 +190,7 @@ sync_updated_folders (CamelEwsStore *store,
                }
 
                pfid = e_ews_folder_get_parent_id (ews_folder);
-               display_name = g_strdup (e_ews_folder_get_name (ews_folder));
+               display_name = g_strdup (e_ews_folder_get_escaped_name (ews_folder));
 
                /* If the folder is moved or renamed (which are separate
                 * operations in Exchange, unfortunately, then the name
@@ -265,7 +265,7 @@ add_folder_to_summary (CamelEwsStore *store,
 
        fid = e_ews_folder_get_id (folder);
        pfid = e_ews_folder_get_parent_id (folder);
-       dname = e_ews_folder_get_name (folder);
+       dname = e_ews_folder_get_escaped_name (folder);
        total = e_ews_folder_get_total_count (folder);
        unread = e_ews_folder_get_unread_count (folder);
        ftype = e_ews_folder_get_folder_type (folder);