* Fixes NB#87102, add the signature to the forwarded mails that include the original...
[modest] / src / modest-text-utils.c
index e2802d8..54d7679 100644 (file)
@@ -63,7 +63,7 @@
  * will hang modest
  */
 #define HYPERLINKIFY_MAX_LENGTH (1024*50)
-
+#define SIGNATURE_MARKER "--"
 
 
 /*
@@ -215,11 +215,11 @@ modest_text_utils_cite (const gchar *text,
        if (!signature)
                retval = g_strdup ("");
        else if (strcmp(content_type, "text/html") == 0) {
-               tmp_sig = g_strconcat ("\n", signature, NULL);
+               tmp_sig = g_strconcat (SIGNATURE_MARKER,"\n", signature, NULL);
                retval = modest_text_utils_convert_to_html_body(tmp_sig, -1, TRUE);
                g_free (tmp_sig);
        } else {
-               retval = g_strconcat (text, "\n", signature, NULL);
+               retval = g_strconcat (text, SIGNATURE_MARKER, "\n", signature, NULL);
        }
 
        return retval;
@@ -288,21 +288,33 @@ modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet)
 gchar *
 modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
 {
-       gchar *tmp;
+       gchar *tmp, *subject_dup, *retval;
+       gint prefix_len;
 
        g_return_val_if_fail (prefix, NULL);
 
        if (!subject || subject[0] == '\0')
                subject = _("mail_va_no_subject");
 
-       tmp = g_strchug (g_strdup (subject));
+       subject_dup = g_strdup (subject);
+       tmp = g_strchug (subject_dup);
 
-       if (!strncmp (tmp, prefix, strlen (prefix))) {
-               return tmp;
-       } else {
-               g_free (tmp);
-               return g_strdup_printf ("%s %s", prefix, subject);
-       }
+       /* We do not want things like "Re: Re: Re:" or "Fw: Fw:" so
+          delete the previous ones */
+       prefix_len = strlen (prefix);
+       do {
+               if (g_str_has_prefix (tmp, prefix)) {
+                       tmp += prefix_len;
+                       tmp = g_strchug (tmp);
+               } else {
+                       break;
+               }
+       } while (tmp);
+
+       retval = g_strdup_printf ("%s %s", prefix, tmp);
+       g_free (subject_dup);
+
+       return retval;
 }
 
 gchar*
@@ -929,6 +941,17 @@ modest_text_utils_quote_plain_text (const gchar *text,
        return g_string_free (q, FALSE);
 }
 
+static void
+quote_html_add_to_gstring (GString *string,
+                          const gchar *text)
+{
+       if (text && strcmp (text, "")) {
+               gchar *html_text = modest_text_utils_convert_to_html_body (text, -1, TRUE);
+               g_string_append_printf (string, "%s<br/>", html_text);
+               g_free (html_text);
+       }
+}
+
 static gchar*
 modest_text_utils_quote_html (const gchar *text, 
                              const gchar *cite, 
@@ -936,38 +959,33 @@ modest_text_utils_quote_html (const gchar *text,
                              GList *attachments,
                              int limit)
 {
-       gchar *result = NULL;
-       gchar *signature_result = NULL;
-       const gchar *format = \
-               "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n" \
-               "<html>\n" \
-               "<body>\n" \
-               "<pre>%s<br/>%s<br/>%s</pre>\n" \
-               "<br/>--<br/>%s<br/>\n" \
-               "</body>\n" \
-               "</html>\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 = modest_text_utils_convert_to_html_body (signature, -1, TRUE);
+       GString *result_string;
+
+       result_string = 
+               g_string_new ( \
+                             "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n" \
+                             "<html>\n"                                \
+                             "<body>\n");
+
+       if (text || cite || signature) {
+               g_string_append (result_string, "<pre>");
+               quote_html_add_to_gstring (result_string, cite);
+               quote_html_add_to_gstring (result_string, text);
+               if (attachments) {
+                       gchar *attachments_string = quoted_attachments (attachments);
+                       quote_html_add_to_gstring (result_string, attachments_string);
+                       g_free (attachments_string);
+               }
+               if (signature) {
+                       quote_html_add_to_gstring (result_string, SIGNATURE_MARKER);
+                       quote_html_add_to_gstring (result_string, signature);
+               }
+               g_string_append (result_string, "</pre>");
+       }
+       g_string_append (result_string, "</body>");
+       g_string_append (result_string, "</html>");
 
-       attachments_string = quoted_attachments (attachments);
-       q_attachments_string = modest_text_utils_convert_to_html_body (attachments_string, -1, TRUE);
-       q_cite = modest_text_utils_convert_to_html_body (cite, -1, TRUE);
-       html_text = modest_text_utils_convert_to_html_body (text, -1, TRUE);
-       result = g_strdup_printf (format, q_cite, html_text, q_attachments_string, signature_result);
-       g_free (q_cite);
-       g_free (html_text);
-       g_free (attachments_string);
-       g_free (q_attachments_string);
-       g_free (signature_result);
-       
-       return result;
+       return g_string_free (result_string, FALSE);
 }
 
 static gint 
@@ -1373,10 +1391,8 @@ modest_text_utils_validate_folder_name (const gchar *folder_name)
 
        /* Cannot contain Windows port numbers. I'd like to use GRegex
           but it's still not available in Maemo. sergio */
-       if (g_str_has_prefix (folder_name, "LTP") ||
-           g_str_has_prefix (folder_name, "ltp") ||
-           g_str_has_prefix (folder_name, "COM") ||
-           g_str_has_prefix (folder_name, "com")) {
+       if (g_ascii_strncasecmp (folder_name, "LPT", 3) ||
+           g_ascii_strncasecmp (folder_name, "COM", 3)) {
                glong val;
                gchar *endptr;