projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2007-05-11 Murray Cumming <murrayc@murrayc.com>
[modest]
/
src
/
modest-text-utils.c
diff --git
a/src/modest-text-utils.c
b/src/modest-text-utils.c
index
4e6846b
..
24d42de
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 {
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 = "";
}
} else {
formatted_signature = "";
@@
-876,9
+876,9
@@
modest_text_utils_get_display_address (gchar *address)
if (!address)
return NULL;
if (!address)
return NULL;
-
+
g_return_val_if_fail (g_utf8_validate (address, -1, NULL), NULL);
g_return_val_if_fail (g_utf8_validate (address, -1, NULL), NULL);
-
+
g_strchug (address); /* remove leading whitespace */
/* <email@address> from display name */
g_strchug (address); /* remove leading whitespace */
/* <email@address> from display name */
@@
-1108,12
+1108,14
@@
modest_text_utils_validate_recipient (const gchar *recipient)
gchar *
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;
{
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)
if (0 < size && size < KB)
return g_strdup_printf (_FM("sfil_li_size_kb"), 1);
else if (KB <= size && size < 100 * KB)