Do ignore '\n' when splitting addresses

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

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index fef874c..5aab3a3 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -665,15 +665,16 @@ modest_text_utils_split_addresses_list (const gchar *addresses)
        gboolean after_at = FALSE;
 
        g_return_val_if_fail (addresses, NULL);
-       
-       /* skip any space, ',', ';' at the start */
-       while (my_addrs && (my_addrs[0] == ' ' || my_addrs[0] == ',' || my_addrs[0] == ';'))
+
+       /* skip any space, ',', ';' '\n' at the start */
+       while (my_addrs && (my_addrs[0] == ' ' || my_addrs[0] == ',' ||
+                           my_addrs[0] == ';' || my_addrs[0] == '\n'))
               ++my_addrs;
 
        /* are we at the end of addresses list? */
        if (!my_addrs[0])
                return NULL;
-       
+
        /* nope, we are at the start of some address
         * now, let's find the end of the address */
        end = my_addrs + 1;
@@ -704,6 +705,48 @@ modest_text_utils_split_addresses_list (const gchar *addresses)
        return head;
 }
 
+gchar *
+modest_text_utils_join_addresses (const gchar *from,
+                                 const gchar *to,
+                                 const gchar *cc,
+                                 const gchar *bcc)
+{
+       GString *buffer;
+       gboolean add_separator = FALSE;
+
+       buffer = g_string_new ("");
+
+       if (from && strlen (from)) {
+               buffer = g_string_append (buffer, from);
+               add_separator = TRUE;
+       }
+       if (to && strlen (to)) {
+               if (add_separator)
+                       buffer = g_string_append (buffer, "; ");
+               else
+                       add_separator = TRUE;
+
+               buffer = g_string_append (buffer, to);
+       }
+       if (cc && strlen (cc)) {
+               if (add_separator)
+                       buffer = g_string_append (buffer, "; ");
+               else
+                       add_separator = TRUE;
+
+               buffer = g_string_append (buffer, cc);
+       }
+       if (bcc && strlen (bcc)) {
+               if (add_separator)
+                       buffer = g_string_append (buffer, "; ");
+               else
+                       add_separator = TRUE;
+
+               buffer = g_string_append (buffer, bcc);
+       }
+
+       return g_string_free (buffer, FALSE);
+}
 
 void
 modest_text_utils_address_range_at_position (const gchar *recipients_list,