* Fixes NB#57580

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

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 2c09387..973b19e 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -206,7 +206,7 @@ modest_text_utils_inline (const gchar *text,
                if (!strcmp (content_type, "text/html")) {
                        formatted_signature = g_strconcat (signature, "<br/>", NULL);
                } else {
-                       formatted_signature = g_strconcat (signature, "\n");
+                       formatted_signature = g_strconcat (signature, "\n", NULL);
                }
        } else {
                formatted_signature = "";
@@ -876,9 +876,9 @@ modest_text_utils_get_display_address (gchar *address)
        
        if (!address)
                return NULL;
-
+       
        g_return_val_if_fail (g_utf8_validate (address, -1, NULL), NULL);
-
+       
        g_strchug (address); /* remove leading whitespace */
 
        /*  <email@address> from display name */
@@ -1057,10 +1057,14 @@ modest_text_utils_validate_recipient (const gchar *recipient)
                has_error = TRUE;
                for (; *current != '\0'; current = g_utf8_next_char (current)) {
                        if (*current == '\\') {
+                               /* TODO: This causes a warning, which breaks the build, 
+                                * because a gchar cannot be < 0.
+                                * murrayc. 
                                if (current[1] <0) {
                                        has_error = TRUE;
                                        break;
                                }
+                               */
                        } else if (*current == '\"') {
                                has_error = FALSE;
                                current = g_utf8_next_char (current);
@@ -1104,22 +1108,24 @@ modest_text_utils_validate_recipient (const gchar *recipient)
 
 
 gchar *
-modest_text_utils_get_display_size (guint size)
+modest_text_utils_get_display_size (guint64 size)
 {
        const guint KB=1024;
        const guint MB=1024 * KB;
        const guint GB=1024 * MB;
 
+       if (size == 0)
+               return g_strdup_printf(_FM("sfil_li_size_kb"), 0);
        if (0 < size && size < KB)
                return g_strdup_printf (_FM("sfil_li_size_kb"), 1);
        else if (KB <= size && size < 100 * KB)
                return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB);
        else if (100*KB <= size && size < MB)
-               return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), size / MB);
+               return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (float) size / MB);
        else if (MB <= size && size < 10*MB)
-               return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), size / 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"), size / MB);
        else
-               return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), size / GB); 
+               return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB); 
 }