* it makes sense not to allow '&' and '#' in new folder names,

[modest] / src / modest-text-utils.c

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index ce015be..76fc3cb 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -100,7 +100,7 @@ const gchar account_title_forbidden_chars[] = {
        '\\', '/', ':', '*', '?', '\'', '<', '>', '|', '^'
 };
 const gchar folder_name_forbidden_chars[] = {
-       '<', '>', ':', '\'', '/', '\\', '|', '?', '*', '^', '%', '$'
+       '<', '>', ':', '\'', '/', '\\', '|', '?', '*', '^', '%', '$', '#', '&'
 };
 const gchar user_name_forbidden_chars[] = {
        '<', '>'
@@ -278,7 +278,7 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
 gchar*
 modest_text_utils_remove_address (const gchar *address_list, const gchar *address)
 {
-       gchar *dup, *token, *ptr, *result;
+       gchar *dup, *token, *ptr = NULL, *result;
        GString *filtered_emails;
        gchar *email_address;
 
@@ -399,7 +399,7 @@ modest_text_utils_convert_to_html (const gchar *data)
 
        if (len <= HYPERLINKIFY_MAX_LENGTH)
                hyperlinkify_plain_text (html);
-
+       
        return g_string_free (html, FALSE);
 }
 
@@ -1218,7 +1218,7 @@ modest_text_utils_validate_domain_name (const gchar *domain)
 {
        gboolean valid = FALSE;
        regex_t rx;
-       const gchar* domain_regex = "^[a-z0-9]([.]?[a-z0-9-])*[a-z0-9]$";
+       const gchar* domain_regex = "^([a-z0-9-]*[a-z0-9]\\.)+[a-z0-9-]*[a-z0-9]$";
 
        g_return_val_if_fail (domain, FALSE);