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 6d0b050..2223fd1 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -416,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);
 
        g_slist_foreach (addresses, (GFunc)g_free, NULL);
        g_slist_free (addresses);
 

+       if (new_list == NULL)
+               new_list = g_strdup ("");
+

        return new_list;
 }
 
        return new_list;
 }
 

@@ -1713,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)
        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)
        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);
 }
        else
                return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);
 }