X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=f35a1271a074e6c6afb5965a331e791258a213e3;hp=df6e03aef2e9e6fe7fc73b2dafc19b55a0c04867;hb=1310c638b65414fad9be0ed2fcfb93a5cbc23433;hpb=5c2c05166f1a467548474cc87863c86e12f6bb06 diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index df6e03a..f35a127 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -100,11 +100,16 @@ 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, + GList *attachments, int limit); static gchar* modest_text_utils_quote_html (const gchar *text, - const gchar *cite, + const gchar *cite, + const gchar *signature, + GList *attachments, int limit); +static gchar* get_email_from_address (const gchar *address); /* ******************************************************************* */ @@ -117,6 +122,7 @@ modest_text_utils_quote (const gchar *text, const gchar *signature, const gchar *from, const time_t sent_date, + GList *attachments, int limit) { gchar *retval, *cited; @@ -129,9 +135,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, attachments, limit); else - retval = modest_text_utils_quote_plain_text (text, cited, limit); + retval = modest_text_utils_quote_plain_text (text, cited, signature, attachments, limit); g_free (cited); @@ -146,7 +152,7 @@ modest_text_utils_cite (const gchar *text, const gchar *from, time_t sent_date) { - gchar *tmp, *retval; + gchar *retval; gchar *tmp_sig; g_return_val_if_fail (text, NULL); @@ -160,10 +166,8 @@ modest_text_utils_cite (const gchar *text, tmp_sig = g_strdup (signature); } - tmp = cite (sent_date, from); - retval = g_strdup_printf ("%s%s%s\n", tmp_sig, tmp, text); + retval = g_strdup_printf ("\n%s\n", tmp_sig); g_free (tmp_sig); - g_free (tmp); return retval; } @@ -206,7 +210,7 @@ modest_text_utils_inline (const gchar *text, if (!strcmp (content_type, "text/html")) { formatted_signature = g_strconcat (signature, "\n%s\n\n" \ + "
%s\n" \ "\n" \ "\n"; + gchar *attachments_string = NULL; + gchar *q_attachments_string = NULL; + gchar *html_text = NULL; - return g_strdup_printf (format, cite, text); + if (signature == NULL) + signature_result = g_strdup (""); + else + signature_result = modest_text_utils_convert_to_html_body (signature); + + attachments_string = quoted_attachments (attachments); + q_attachments_string = modest_text_utils_convert_to_html_body (attachments_string); + html_text = modest_text_utils_convert_to_html_body (text); + result = g_strdup_printf (format, signature_result, cite, html_text, q_attachments_string); + g_free (html_text); + g_free (attachments_string); + g_free (q_attachments_string); + g_free (signature_result); + return result; } static gint @@ -964,14 +1014,13 @@ modest_text_utils_get_display_date (time_t date) now = time (NULL); - modest_text_utils_strftime (date_buf, BUF_SIZE, "%d/%m/%Y", date); - modest_text_utils_strftime (now_buf, BUF_SIZE, "%d/%m/%Y", now); /* today */ -/* modest_text_utils_strftime (date_buf, BUF_SIZE, "%x", date); */ -/* modest_text_utils_strftime (now_buf, BUF_SIZE, "%x", now); /\* today *\/ */ + /* use the localized dates */ + modest_text_utils_strftime (date_buf, BUF_SIZE, "%x", date); + modest_text_utils_strftime (now_buf, BUF_SIZE, "%x", now); /* if this is today, get the time instead of the date */ if (strcmp (date_buf, now_buf) == 0) - modest_text_utils_strftime (date_buf, BUF_SIZE, "%H:%M %P", date); + modest_text_utils_strftime (date_buf, BUF_SIZE, "%X", date); return g_strdup(date_buf); } @@ -1121,11 +1170,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); }
%s
%s