X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=07ae71c0ee25f6d73022e0ea75e8c33097ed91fd;hp=24d42de9229cbe77776e0b0c8e26844fa5eb210d;hb=6c4f7f26cf46e833b9d32a69555880900b16a4ef;hpb=3eeed6b1fca821fa041b9aa1fdfd682e45534c66
diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 24d42de..07ae71c 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -100,11 +100,14 @@ static int get_breakpoint (const gchar * s, const gint indent, con
static gchar* modest_text_utils_quote_plain_text (const gchar *text,
const gchar *cite,
+ const gchar *signature,
int limit);
static gchar* modest_text_utils_quote_html (const gchar *text,
- const gchar *cite,
+ const gchar *cite,
+ const gchar *signature,
int limit);
+static gchar* get_email_from_address (const gchar *address);
/* ******************************************************************* */
@@ -129,9 +132,9 @@ modest_text_utils_quote (const gchar *text,
if (content_type && strcmp (content_type, "text/html") == 0)
/* TODO: extract the of the HTML and pass it to
the function */
- retval = modest_text_utils_quote_html (text, cited, limit);
+ retval = modest_text_utils_quote_html (text, cited, signature, limit);
else
- retval = modest_text_utils_quote_plain_text (text, cited, limit);
+ retval = modest_text_utils_quote_plain_text (text, cited, signature, limit);
g_free (cited);
@@ -262,15 +265,20 @@ modest_text_utils_remove_address (const gchar *address_list, const gchar *addres
{
gchar *dup, *token, *ptr, *result;
GString *filtered_emails;
+ gchar *email_address;
g_return_val_if_fail (address_list, NULL);
if (!address)
return g_strdup (address_list);
+
+ email_address = get_email_from_address (address);
/* search for substring */
- if (!strstr ((const char *) address_list, (const char *) address))
+ if (!strstr ((const char *) address_list, (const char *) email_address)) {
+ g_free (email_address);
return g_strdup (address_list);
+ }
dup = g_strdup (address_list);
filtered_emails = g_string_new (NULL);
@@ -279,7 +287,7 @@ modest_text_utils_remove_address (const gchar *address_list, const gchar *addres
while (token != NULL) {
/* Add to list if not found */
- if (!strstr ((const char *) token, (const char *) address)) {
+ if (!strstr ((const char *) token, (const char *) email_address)) {
if (filtered_emails->len == 0)
g_string_append_printf (filtered_emails, "%s", g_strstrip (token));
else
@@ -290,6 +298,7 @@ modest_text_utils_remove_address (const gchar *address_list, const gchar *addres
result = filtered_emails->str;
/* Clean */
+ g_free (email_address);
g_free (dup);
g_string_free (filtered_emails, FALSE);
@@ -683,6 +692,7 @@ cite (const time_t sent_date, const gchar *from)
static gchar *
modest_text_utils_quote_plain_text (const gchar *text,
const gchar *cite,
+ const gchar *signature,
int limit)
{
const gchar *iter;
@@ -734,24 +744,44 @@ modest_text_utils_quote_plain_text (const gchar *text,
g_string_free (l, TRUE);
} while ((iter < text + len) || (remaining->str[0]));
+ if (signature != NULL) {
+ q = g_string_append_c (q, '\n');
+ q = g_string_append (q, signature);
+ }
+
return g_string_free (q, FALSE);
}
static gchar*
modest_text_utils_quote_html (const gchar *text,
const gchar *cite,
+ const gchar *signature,
int limit)
{
+ gchar *result = NULL;
+ gchar *signature_result = NULL;
const gchar *format = \
"\n" \
"\n" \
"\n" \
"%s" \
"\n%s\n
\n" \
+ "%s" \
"\n" \
"\n";
+ const gchar *signature_format = \
+ "\n" \
+ "%s\n" \
+ "
";
+
+ if (signature == NULL)
+ signature_result = g_strdup ("");
+ else
+ signature_result = g_strdup_printf (signature_format, signature);
- return g_strdup_printf (format, cite, text);
+ result = g_strdup_printf (format, cite, text, signature_result);
+ g_free (signature_result);
+ return result;
}
static gint
@@ -1121,11 +1151,25 @@ 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"), 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);
+}
+
+static gchar *
+get_email_from_address (const gchar * address)
+{
+ gchar *left_limit, *right_limit;
+
+ left_limit = strstr (address, "<");
+ right_limit = g_strrstr (address, ">");
+
+ if ((left_limit == NULL)||(right_limit == NULL)|| (left_limit > right_limit))
+ return g_strdup (address);
+ else
+ return g_strndup (left_limit + 1, (right_limit - left_limit) - 1);
}