X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=9c722ed1f8b1f4269a9aef16e6fdcb4f9c0312c1;hb=afbf9d92786ad89c7ce2e29a612e19c510c23cc8;hp=af4651712ab9935e6189cb9888e114563cbb374d;hpb=9262266d6fd513337d3cd6544cd00662339011c6;p=modest

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index af46517..9c722ed 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -41,6 +41,7 @@
 #include <regex.h>
 #include <modest-tny-platform-factory.h>
 #include <modest-text-utils.h>
+#include <modest-account-mgr-helpers.h>
 #include <modest-runtime.h>
 #include <ctype.h>
 
@@ -207,23 +208,26 @@ modest_text_utils_cite (const gchar *text,
 			const gchar *from,
 			time_t sent_date)
 {
-	gchar *retval;
-	gchar *tmp_sig;
-	
+	gchar *retval, *tmp;
+
 	g_return_val_if_fail (text, NULL);
 	g_return_val_if_fail (content_type, NULL);
-	
-	if (!signature) {
-		tmp_sig = g_strdup (text);
-	} else {
-		tmp_sig = g_strconcat (text, "\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n", signature, NULL);
-	}
 
 	if (strcmp (content_type, "text/html") == 0) {
-		retval = modest_text_utils_convert_to_html_body (tmp_sig, -1, TRUE);
-		g_free (tmp_sig);
+		tmp = modest_text_utils_convert_to_html_body (text, -1, TRUE);
+		if (signature) {
+			gchar *colored_signature = modest_text_utils_create_colored_signature (signature);
+			retval = g_strconcat (tmp, colored_signature, NULL);
+			g_free (colored_signature);
+			g_free (tmp);
+		} else {
+			retval = tmp;
+		}
 	} else {
-		retval = tmp_sig;
+		if (signature)
+			retval = g_strconcat (text, "\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n", signature, NULL);
+		else
+			retval = g_strdup (text);
 	}
 
 	return retval;
@@ -302,9 +306,7 @@ modest_text_utils_derived_subject (const gchar *subject, gboolean is_reply)
 	gchar *tmp, *subject_dup, *retval, *prefix;
 	const gchar *untranslated_prefix;
 	gint prefix_len, untranslated_prefix_len;
-	gboolean untranslated_found = FALSE;
-
-	g_return_val_if_fail (prefix, NULL);
+	gboolean found = FALSE;
 
 	if (!subject || subject[0] == '\0')
 		subject = _("mail_va_no_subject");
@@ -319,39 +321,33 @@ modest_text_utils_derived_subject (const gchar *subject, gboolean is_reply)
 	untranslated_prefix =  (is_reply) ? "Re:" : "Fw:";
 	untranslated_prefix_len = 3;
 
-	/* We do not want things like "Re: Re: Re:" or "Fw: Fw:" so
-	   delete the previous ones */
-	do {
-		if (g_str_has_prefix (tmp, prefix)) {
-			tmp += prefix_len;
-			tmp = g_strchug (tmp);
-		} else if (g_str_has_prefix (tmp, untranslated_prefix)) {
-			tmp += untranslated_prefix_len;
-			tmp = g_strchug (tmp);
-			untranslated_found = TRUE;
-		} else {
-			gchar *prefix_down, *tmp_down;
-
-			/* We need this to properly check the cases of
-			   some clients adding FW: instead of Fw: for
-			   example */
-			prefix_down = g_utf8_strdown (prefix, -1);
-			tmp_down = g_utf8_strdown (tmp, -1);
-			if (g_str_has_prefix (tmp_down, prefix_down)) {
-				tmp += prefix_len;
-				tmp = g_strchug (tmp);
-				g_free (prefix_down);
-				g_free (tmp_down);
-			} else {
-				g_free (prefix_down);
-				g_free (tmp_down);
-				break;
-			}
-		}
-	} while (tmp);
+	if (g_str_has_prefix (tmp, prefix) ||
+	    g_str_has_prefix (tmp, untranslated_prefix)) {
+		found = TRUE;
+	} else {
+		gchar *prefix_down, *tmp_down, *untranslated_down;
+
+		prefix_down = g_utf8_strdown (prefix, -1);
+		untranslated_down = g_utf8_strdown (untranslated_prefix, -1);
+		tmp_down = g_utf8_strdown (tmp, -1);
+		if (g_str_has_prefix (tmp_down, prefix_down) ||
+		    g_str_has_prefix (tmp_down, untranslated_down) ||
+		    (!is_reply && g_str_has_prefix (tmp_down, "fwd:")))
+			found = TRUE;
+
+		g_free (prefix_down);
+		g_free (untranslated_down);
+		g_free (tmp_down);
+	}
 
-	retval = g_strdup_printf ("%s %s", (untranslated_found) ? untranslated_prefix : prefix, tmp);
-	g_free (subject_dup);
+	if (found) {
+		/* If the prefix is already present do not touch the subject */
+		retval = subject_dup;
+	} else {
+		/* Normal case, add the prefix */
+		retval = g_strdup_printf ("%s %s", untranslated_prefix, tmp);
+		g_free (subject_dup);
+	}
 	g_free (prefix);
 
 	return retval;
@@ -502,7 +498,7 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
 		guchar kar = data[i];
 		
 		if (space_seen && kar != ' ') {
-			g_string_append (html, " ");
+			g_string_append (html, "&#32;");
 			space_seen = FALSE;
 		}
 		
@@ -638,7 +634,7 @@ modest_text_utils_get_addresses_indexes (const gchar *addresses, GSList **start_
 			gchar *next_char = g_utf8_next_char (cur);
 
 			if (!g_utf8_strchr (start, (cur - start + 1), g_utf8_get_char ("@")) &&
-			    next_char && *next_char != '\n')
+			    next_char && *next_char != '\n' && *next_char != '\0')
 				continue;
 
 			start_index = g_new0 (gint, 1);
@@ -927,6 +923,9 @@ get_breakpoint_utf8 (const gchar * s, gint indent, const gint limit)
 	const gchar *pos, *last;
 	gunichar *uni;
 
+	if (2*indent >= limit)
+		return strlen (s);
+
 	indent = indent < 0 ? abs (indent) - 1 : indent;
 
 	last = NULL;
@@ -1008,17 +1007,44 @@ modest_text_utils_quote_body (GString *output, const gchar *text,
 
 	const gchar *iter;
 	gsize len;
-	gint indent, breakpoint, rem_indent = 0;
+	gint indent = 0, breakpoint, rem_indent = 0;
 	GString *l, *remaining;
+	gchar *forced_wrap_append;
 
 	iter = text;
 	len = strlen(text);
 	remaining = g_string_new ("");
+	forced_wrap_append = NULL;
 	do {
-		l = get_next_line (text, len, iter);
-		iter = iter + l->len + 1;
-		indent = get_indent_level (l->str);
-		unquote_line (l, quote_symbol);
+
+		if (forced_wrap_append) {
+			gint next_line_indent;
+			gint l_len_with_indent;
+
+			g_string_erase (remaining, 0, -1);
+			next_line_indent = get_indent_level (iter);
+			l = get_next_line (text, len, iter);
+			l_len_with_indent = l->len;
+			unquote_line (l, quote_symbol);
+			if ((l->str && l->str[0] == '\0') || (next_line_indent != indent)) {
+				g_string_free (l, TRUE);
+				l = g_string_new (forced_wrap_append);
+			} else {
+				gunichar first_in_l;
+				iter = iter + l_len_with_indent + 1;
+				first_in_l = g_utf8_get_char_validated (l->str, l->len);
+				if (!g_unichar_isspace (first_in_l)) 
+					l = g_string_prepend (l, " ");
+				l = g_string_prepend (l, forced_wrap_append);
+			}
+			g_free (forced_wrap_append);
+			forced_wrap_append = NULL;
+		} else {
+			l = get_next_line (text, len, iter);
+			iter = iter + l->len + 1;
+			indent = get_indent_level (l->str);
+			unquote_line (l, quote_symbol);
+		}
 
 		if (remaining->len) {
 			if (l->len && indent == rem_indent) {
@@ -1031,8 +1057,14 @@ modest_text_utils_quote_body (GString *output, const gchar *text,
 						get_breakpoint (remaining->str,
 								rem_indent,
 								limit);
-					append_quoted (output, quote_symbol, rem_indent,
-						       remaining, breakpoint);
+					if (breakpoint < remaining->len) {
+					        g_free (forced_wrap_append);
+						forced_wrap_append = g_strdup (remaining->str + breakpoint);
+					} else {
+						if (!forced_wrap_append)
+							append_quoted (output, quote_symbol, rem_indent,
+								       remaining, breakpoint);
+					}
 					g_string_erase (remaining, 0,
 							breakpoint);
 					remaining_first = g_utf8_get_char_validated (remaining->str, remaining->len);
@@ -1051,9 +1083,13 @@ modest_text_utils_quote_body (GString *output, const gchar *text,
 			g_string_erase (remaining, 0, 1);
 		}
 		rem_indent = indent;
+		if (remaining->len > 0) {
+			g_free (forced_wrap_append);
+			forced_wrap_append = g_strdup (remaining->str);
+		}
 		append_quoted (output, quote_symbol, indent, l, breakpoint);
 		g_string_free (l, TRUE);
-	} while ((iter < text + len) || (remaining->str[0]));
+	} while ((iter < text + len) || (remaining->str[0]) || forced_wrap_append);
 
 	return output;
 }
@@ -1108,18 +1144,19 @@ modest_text_utils_quote_html (const gchar *text,
 {
 	GString *result_string;
 
-	result_string = 
+	result_string =
 		g_string_new ( \
 			      "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n" \
 			      "<html>\n"				\
-			      "<body>\n<br/>\n");
+			      "<body>\n");
 
 	if (text || cite || signature) {
 		GString *quoted_text;
 		g_string_append (result_string, "<pre>\n");
 		if (signature) {
-			quote_html_add_to_gstring (result_string, MODEST_TEXT_UTILS_SIGNATURE_MARKER);
-			quote_html_add_to_gstring (result_string, signature);
+			gchar *colored_signature = modest_text_utils_create_colored_signature (signature);
+			g_string_append_printf (result_string, "%s<br/>", colored_signature);
+			g_free (colored_signature);
 		}
 		quote_html_add_to_gstring (result_string, cite);
 		quoted_text = g_string_new ("");
@@ -2179,8 +2216,7 @@ static void
 quote_name_part (GString **str, gchar **cur, gchar **start)
 {
 	gchar *blank;
-	gint str_len = g_utf8_pointer_to_offset (*start, *cur) -
-		g_utf8_pointer_to_offset (*start, *start);
+	gint str_len = *cur - *start;
 
 	while (**start == ' ') {
 		*start = g_utf8_next_char (*start);
@@ -2195,13 +2231,9 @@ quote_name_part (GString **str, gchar **cur, gchar **start)
 			*start = g_utf8_next_char (*cur);
 		} else {
 			*str = g_string_append_c (*str, '"');
-			*str = g_string_append_len (*str, *start,
-						    (g_utf8_pointer_to_offset (*start, blank) -
-						     g_utf8_pointer_to_offset (*start, *start)));
+			*str = g_string_append_len (*str, *start, (blank - *start));
 			*str = g_string_append_c (*str, '"');
-			*str = g_string_append_len (*str, blank,
-						    (g_utf8_pointer_to_offset (*start, *cur) -
-						     g_utf8_pointer_to_offset (*start, blank)));
+			*str = g_string_append_len (*str, blank, (*cur - blank));
 			*str = g_string_append (*str, ";");
 			*start = g_utf8_next_char (*cur);
 		}
@@ -2234,3 +2266,96 @@ modest_text_utils_quote_names (const gchar *recipients)
 
 	return g_string_free (str, FALSE);
 }
+
+/* Returns TRUE if there is no recipients in the text buffer. Note
+   that strings like " ; , " contain only separators and thus no
+   recipients */
+gboolean
+modest_text_utils_no_recipient (GtkTextBuffer *buffer)
+{
+	gboolean retval = TRUE;
+	gchar *text, *tmp;
+	GtkTextIter start, end;
+
+	if (gtk_text_buffer_get_char_count (buffer) == 0)
+		return TRUE;
+
+	gtk_text_buffer_get_start_iter (buffer, &start);
+	gtk_text_buffer_get_end_iter (buffer, &end);
+
+	text = g_strstrip (gtk_text_buffer_get_text (buffer, &start, &end, FALSE));
+	if (!g_strcmp0 (text, ""))
+		return TRUE;
+
+	tmp = text;
+	while (tmp && *tmp != '\0') {
+		if ((*tmp != ',') && (*tmp != ';') &&
+		    (*tmp != '\r') && (*tmp != '\n') &&
+		    (*tmp != ' ')) {
+			retval = FALSE;
+			break;
+		} else {
+			tmp++;
+		}
+	}
+	g_free (text);
+
+	return retval;
+}
+
+gchar *
+modest_text_utils_create_colored_signature (const gchar *signature)
+{
+	gchar *gray_color_markup = NULL, *retval;
+	GdkColor color;
+	GtkWidget *widget;
+
+	/* Get color from widgets */
+	widget = (GtkWidget *) modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ());
+	if (widget && gtk_style_lookup_color (gtk_widget_get_style (widget), "SecondaryTextColor", &color))
+		gray_color_markup = modest_text_utils_get_color_string (&color);
+
+	retval = g_strdup_printf ("<br/>\n<font color=\"%s\">%s<br/>\n%s<br/>\n</font>",
+				  (gray_color_markup) ? gray_color_markup : "#babababababa",
+				  MODEST_TEXT_UTILS_SIGNATURE_MARKER,
+				  signature);
+
+	if (gray_color_markup)
+		g_free (gray_color_markup);
+
+	return retval;
+}
+
+gboolean
+modest_text_utils_live_search_find (const gchar *haystack, const gchar *needles)
+{
+	gchar *haystack_fold;
+	gchar *needles_fold;
+	gchar **needle, **current;
+	gboolean match;
+
+	match = FALSE;
+
+	haystack_fold = g_utf8_casefold (haystack, -1);
+	needles_fold = g_utf8_casefold (needles, -1);
+
+	needle = g_strsplit (needles_fold, " ", -1);
+
+	current = needle;
+	while (current && *current != NULL) {
+
+		if (g_strstr_len (haystack_fold, -1, *current) != NULL) {
+			match = TRUE;
+		} else {
+			match = FALSE;
+			break;
+		}
+		current++;
+	}
+
+	g_strfreev (needle);
+	g_free (needles_fold);
+	g_free (haystack_fold);
+	
+	return match;
+}