X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=874c0f9e6d4f6e6ca7dfd1b74e5f1bf7712f678c;hp=973b19ea13be3ded37d62dc0709b37bc9b0e494d;hb=720d8697b3529d547f624d85287d9d0663d8c029;hpb=6f839c90aa26fbc42532cb8ee1bd4769f8539a14
diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 973b19e..874c0f9 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);
@@ -146,7 +149,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 +163,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;
}
@@ -233,7 +234,6 @@ modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet)
* g_date_set_time_t (&date, timet);
*/
localtime_r (&timet, &tm);
-
return strftime(s, max, fmt, &tm);
}
@@ -262,15 +262,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 +284,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 +295,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 +689,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 +741,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
@@ -964,14 +991,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);
}
@@ -1129,3 +1155,17 @@ modest_text_utils_get_display_size (guint64 size)
else
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);
+}