X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=213e83684d0fb8ad935c739da4449db42bbcf16d;hb=180a6c986b177f0818ca0e25d35da5bb702d2039;hp=07ae71c0ee25f6d73022e0ea75e8c33097ed91fd;hpb=6c4f7f26cf46e833b9d32a69555880900b16a4ef;p=modest
diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 07ae71c..213e836 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -101,11 +101,13 @@ 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 *signature,
+ GList *attachments,
int limit);
static gchar* get_email_from_address (const gchar *address);
@@ -120,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;
@@ -132,12 +135,12 @@ 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, signature, limit);
+ retval = modest_text_utils_quote_html (text, cited, signature, attachments, limit);
else
- retval = modest_text_utils_quote_plain_text (text, cited, signature, limit);
+ retval = modest_text_utils_quote_plain_text (text, cited, signature, attachments, limit);
g_free (cited);
-
+
return retval;
}
@@ -149,28 +152,39 @@ 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);
g_return_val_if_fail (content_type, NULL);
if (!signature)
- tmp_sig = g_strdup ("");
+ retval = g_strdup ("");
else if (!strcmp(content_type, "text/html")) {
- tmp_sig = modest_text_utils_convert_to_html_body(signature);
+ tmp_sig = g_strconcat ("\n", signature, NULL);
+ retval = modest_text_utils_convert_to_html_body(tmp_sig);
+ g_free (tmp_sig);
} else {
- tmp_sig = g_strdup (signature);
+ retval = g_strconcat ("\n", signature, NULL);
}
- tmp = cite (sent_date, from);
- retval = g_strdup_printf ("%s%s%s\n", tmp_sig, tmp, text);
- g_free (tmp_sig);
- g_free (tmp);
-
return retval;
}
+static gchar *
+forward_cite (const gchar *from,
+ const gchar *sent,
+ const gchar *to,
+ const gchar *subject)
+{
+ return g_strdup_printf ("%s\n%s %s\n%s %s\n%s %s\n%s %s\n",
+ FORWARD_STRING,
+ FROM_STRING, (from)?from:"",
+ SENT_STRING, sent,
+ TO_STRING, (to)?to:"",
+ SUBJECT_STRING, (subject)?subject:"");
+}
+
gchar *
modest_text_utils_inline (const gchar *text,
const gchar *content_type,
@@ -181,47 +195,23 @@ modest_text_utils_inline (const gchar *text,
const gchar *subject)
{
gchar sent_str[101];
- gchar *formatted_signature;
- const gchar *plain_format = "%s%s\n%s %s\n%s %s\n%s %s\n%s %s\n\n%s";
- const gchar *html_format = \
- "%s%s
\n\n" \
- "| %s | %s |
\n" \
- "| %s | %s |
\n" \
- "| %s | %s |
\n" \
- "| %s | %s |
\n" \
- "
%s";
- const gchar *format;
-
+ gchar *cited;
+ gchar *retval;
+
g_return_val_if_fail (text, NULL);
g_return_val_if_fail (content_type, NULL);
- g_return_val_if_fail (text, NULL);
modest_text_utils_strftime (sent_str, 100, "%c", sent_date);
- if (!strcmp (content_type, "text/html"))
- /* TODO: extract the of the HTML and pass it to
- the function */
- format = html_format;
+ cited = forward_cite (from, sent_str, to, subject);
+
+ if (content_type && strcmp (content_type, "text/html") == 0)
+ retval = modest_text_utils_quote_html (text, cited, signature, NULL, 80);
else
- format = plain_format;
-
- if (signature != NULL) {
- if (!strcmp (content_type, "text/html")) {
- formatted_signature = g_strconcat (signature, "
", NULL);
- } else {
- formatted_signature = g_strconcat (signature, "\n", NULL);
- }
- } else {
- formatted_signature = "";
- }
-
- return g_strdup_printf (format, formatted_signature,
- FORWARD_STRING,
- FROM_STRING, (from) ? from : EMPTY_STRING,
- SENT_STRING, sent_str,
- TO_STRING, (to) ? to : EMPTY_STRING,
- SUBJECT_STRING, (subject) ? subject : EMPTY_STRING,
- text);
+ retval = modest_text_utils_quote_plain_text (text, cited, signature, NULL, 80);
+
+ g_free (cited);
+ return retval;
}
/* just to prevent warnings:
@@ -236,7 +226,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);
}
@@ -334,7 +323,7 @@ modest_text_utils_convert_buffer_to_html (GString *html, const gchar *data)
case '\t' : g_string_append (html, " "); break; /* note the space at the end*/
case ' ':
if (space_seen) { /* second space in a row */
- g_string_append (html, " ");
+ g_string_append (html, " ");
space_seen = FALSE;
} else
space_seen = TRUE;
@@ -679,29 +668,40 @@ get_breakpoint (const gchar * s, const gint indent, const gint limit)
static gchar *
cite (const time_t sent_date, const gchar *from)
{
- gchar sent_str[101];
-
- /* format sent_date */
- modest_text_utils_strftime (sent_str, 100, "%c", sent_date);
- return g_strdup_printf (N_("On %s, %s wrote:\n"),
- sent_str,
- (from) ? from : EMPTY_STRING);
+ return g_strdup (_("mcen_ia_editor_original_message"));
}
+static gchar *
+quoted_attachments (GList *attachments)
+{
+ GList *node = NULL;
+ GString *result = g_string_new ("");
+ for (node = attachments; node != NULL; node = g_list_next (node)) {
+ gchar *filename = (gchar *) node->data;
+ g_string_append_printf ( result, "%s %s\n", _("mcen_ia_editor_attach_filename"), filename);
+ }
+
+ return g_string_free (result, FALSE);
+
+}
static gchar *
modest_text_utils_quote_plain_text (const gchar *text,
const gchar *cite,
const gchar *signature,
+ GList *attachments,
int limit)
{
const gchar *iter;
gint indent, breakpoint, rem_indent = 0;
GString *q, *l, *remaining;
gsize len;
+ gchar *attachments_string = NULL;
/* remaining will store the rest of the line if we have to break it */
- q = g_string_new (cite);
+ q = g_string_new ("\n");
+ q = g_string_append (q, cite);
+ q = g_string_append_c (q, '\n');
remaining = g_string_new ("");
iter = text;
@@ -744,6 +744,10 @@ modest_text_utils_quote_plain_text (const gchar *text,
g_string_free (l, TRUE);
} while ((iter < text + len) || (remaining->str[0]));
+ attachments_string = quoted_attachments (attachments);
+ q = g_string_append (q, attachments_string);
+ g_free (attachments_string);
+
if (signature != NULL) {
q = g_string_append_c (q, '\n');
q = g_string_append (q, signature);
@@ -756,6 +760,7 @@ static gchar*
modest_text_utils_quote_html (const gchar *text,
const gchar *cite,
const gchar *signature,
+ GList *attachments,
int limit)
{
gchar *result = NULL;
@@ -764,22 +769,29 @@ modest_text_utils_quote_html (const gchar *text,
"\n" \
"\n" \
"\n" \
- "%s" \
- "\n%s\n
\n" \
- "%s" \
+ "
%s
" \
+ "%s
%s
%s
\n" \
"\n" \
"\n";
- const gchar *signature_format = \
- "\n" \
- "%s\n" \
- "
";
+ gchar *attachments_string = NULL;
+ gchar *q_attachments_string = NULL;
+ gchar *q_cite = NULL;
+ gchar *html_text = NULL;
if (signature == NULL)
signature_result = g_strdup ("");
else
- signature_result = g_strdup_printf (signature_format, signature);
-
- result = g_strdup_printf (format, cite, text, signature_result);
+ 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);
+ q_cite = modest_text_utils_convert_to_html_body (cite);
+ html_text = modest_text_utils_convert_to_html_body (text);
+ result = g_strdup_printf (format, signature_result, q_cite, html_text, q_attachments_string);
+ g_free (q_cite);
+ g_free (html_text);
+ g_free (attachments_string);
+ g_free (q_attachments_string);
g_free (signature_result);
return result;
}
@@ -937,10 +949,11 @@ modest_text_utils_get_subject_prefix_len (const gchar *sub)
{
gint i;
static const gchar* prefix[] = {
- "Re:", "RE:", "Fwd:", "FWD:", "FW:", NULL
+ "Re:", "RE:", "RV:", "re:"
+ "Fwd:", "FWD:", "FW:", "fwd:", "Fw:", "fw:", NULL
};
- if (!sub || (sub[0] != 'R' && sub[0] != 'F')) /* optimization */
+ if (!sub || (sub[0] != 'R' && sub[0] != 'F' && sub[0] != 'r' && sub[0] != 'f')) /* optimization */
return 0;
i = 0;
@@ -994,14 +1007,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);
}
@@ -1173,3 +1185,16 @@ get_email_from_address (const gchar * address)
else
return g_strndup (left_limit + 1, (right_limit - left_limit) - 1);
}
+
+gchar *
+modest_text_utils_get_color_string (GdkColor *color)
+{
+
+ return g_strdup_printf ("#%x%x%x%x%x%x%x%x%x%x%x%x",
+ (color->red >> 12) & 0xf, (color->red >> 8) & 0xf,
+ (color->red >> 4) & 0xf, (color->red) & 0xf,
+ (color->green >> 12) & 0xf, (color->green >> 8) & 0xf,
+ (color->green >> 4) & 0xf, (color->green) & 0xf,
+ (color->blue >> 12) & 0xf, (color->blue >> 8) & 0xf,
+ (color->blue >> 4) & 0xf, (color->blue) & 0xf);
+}