[evolution-ews/gnome-3-26] Escape spaces in server Categories for message Labels

[Milan Crha <mcrha src gnome org>]

commit 8207f88fe7b7f48eb88bf22faad7d37a490c29fc
Author: Milan Crha <mcrha redhat com>
Date:   Wed Sep 20 11:25:27 2017 +0200

    Escape spaces in server Categories for message Labels
    
    Spaces in Labels are not allowed, thus when Categories are used
    for Labels, the spaces should be escaped.

 src/camel/camel-ews-utils.c |   49 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/src/camel/camel-ews-utils.c b/src/camel/camel-ews-utils.c
index e490118..75c0eec 100644
--- a/src/camel/camel-ews-utils.c
+++ b/src/camel/camel-ews-utils.c
@@ -447,7 +447,26 @@ ews_utils_gather_server_user_flags (ESoapMessage *msg,
                if (ews_utils_is_system_user_flag (n))
                        continue;
 
-               out_user_flags = g_slist_prepend (out_user_flags, g_strdup (n));
+               if (strchr (n, '_')) {
+                       GString *str = g_string_sized_new (strlen (n));
+
+                       while (*n) {
+                               if (*n == '_') {
+                                       if (n[1] == '_')
+                                               g_string_append_c (str, '_');
+                                       else
+                                               g_string_append_c (str, ' ');
+                               } else {
+                                       g_string_append_c (str, *n);
+                               }
+
+                               n++;
+                       }
+
+                       out_user_flags = g_slist_prepend (out_user_flags, g_string_free (str, FALSE));
+               } else {
+                       out_user_flags = g_slist_prepend (out_user_flags, g_strdup (n));
+               }
        }
 
        camel_message_info_property_unlock (mi);
@@ -487,7 +506,33 @@ ews_utils_merge_server_user_flags (EEwsItem *item,
 
        /* now transfer over all the categories */
        for (p = e_ews_item_get_categories (item); p; p = p->next) {
-               camel_message_info_set_user_flag (mi, ews_utils_rename_label (p->data, TRUE), TRUE);
+               const gchar *flag = ews_utils_rename_label (p->data, 1);
+               gchar *underscored = NULL;
+
+               if (!flag || !*flag)
+                       continue;
+
+               if (strchr (flag, ' ')) {
+                       GString *str;
+
+                       str = g_string_sized_new (strlen (flag) + 16);
+
+                       while (*flag) {
+                               if (*flag == '_')
+                                       g_string_append_c (str, '_');
+
+                               g_string_append_c (str, *flag == ' ' ? '_' : *flag);
+
+                               flag++;
+                       }
+
+                       underscored = g_string_free (str, FALSE);
+                       flag = underscored;
+               }
+
+               camel_message_info_set_user_flag (mi, flag, TRUE);
+
+               g_free (underscored);
        }
 
        camel_message_info_thaw_notifications (mi);