Fix modest_tny_msg_header_get_all_recipients_list (in case from is empty)

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

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 5426b0b..2223fd1 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -63,8 +63,6 @@
  * will hang modest
  */
 #define HYPERLINKIFY_MAX_LENGTH (1024*50)
-#define SIGNATURE_MARKER "--"
-
 
 /*
  * we need these regexps to find URLs in plain text e-mails
@@ -216,7 +214,7 @@ modest_text_utils_cite (const gchar *text,
        if (!signature) {
                tmp_sig = g_strdup (text);
        } else {
-               tmp_sig = g_strconcat (text, "\n", SIGNATURE_MARKER, "\n", signature, NULL);
+               tmp_sig = g_strconcat (text, "\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n", signature, NULL);
        }
 
        if (strcmp (content_type, "text/html") == 0) {
@@ -418,6 +416,9 @@ modest_text_utils_remove_duplicate_addresses (const gchar *address_list)
        g_slist_foreach (addresses, (GFunc)g_free, NULL);
        g_slist_free (addresses);
 
+       if (new_list == NULL)
+               new_list = g_strdup ("");
+
        return new_list;
 }
 
@@ -437,7 +438,7 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
                guchar kar = data[i];
                
                if (space_seen && kar != ' ') {
-                       g_string_append_c (html, ' ');
+                       g_string_append (html, " ");
                        space_seen = FALSE;
                }
                
@@ -768,7 +769,7 @@ get_indent_level (const char *l)
        /*      if we hit the signature marker "-- ", we return -(indent + 1). This
         *      stops reformatting.
         */
-       if (strcmp (l, "-- ") == 0) {
+       if (strcmp (l, MODEST_TEXT_UTILS_SIGNATURE_MARKER) == 0) {
                return -1 - indent;
        } else {
                return indent;
@@ -966,7 +967,7 @@ modest_text_utils_quote_plain_text (const gchar *text,
        q = g_string_new ("");
 
        if (signature != NULL) {
-               q = g_string_append (q, "\n--\n");
+               g_string_append_printf (q, "\n%s\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER);
                q = g_string_append (q, signature);
        }
 
@@ -1013,7 +1014,7 @@ modest_text_utils_quote_html (const gchar *text,
                GString *quoted_text;
                g_string_append (result_string, "<pre>\n");
                if (signature) {
-                       quote_html_add_to_gstring (result_string, SIGNATURE_MARKER);
+                       quote_html_add_to_gstring (result_string, MODEST_TEXT_UTILS_SIGNATURE_MARKER);
                        quote_html_add_to_gstring (result_string, signature);
                }
                quote_html_add_to_gstring (result_string, cite);
@@ -1715,11 +1716,11 @@ modest_text_utils_get_display_size (guint64 size)
        else if (KB <= size && size < 100 * KB)
                return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) size / KB);
        else if (100*KB <= size && size < MB)
-               return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (float) size / MB);
+               return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (int) size / KB);
        else if (MB <= size && size < 10*MB)
                return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), (float) size / MB);
        else if (10*MB <= size && size < GB)
-               return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (int) size / MB);
+               return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (float) size / MB);
        else
                return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);
 }