X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=01e70d3a59b1f438c1b293385c7fff676f1755b2;hb=a462ac9c41c676808d42f22b5dfe209e98692f10;hp=afaedef275aaa85e8227c25e16b2156bab64278f;hpb=f409f0b767f36788ce88995246dfeb087797acaa;p=modest

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index afaedef..01e70d3 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -400,7 +400,7 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
 
 	/* replace with special html chars where needed*/
 	for (i = 0; i != n; ++i)  {
-		char kar = data[i];
+		guchar kar = data[i];
 		
 		if (space_seen && kar != ' ') {
 			g_string_append_c (html, ' ');
@@ -410,8 +410,10 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
 		/* we artificially insert a breakpoint (newline)
 		 * after 256, to make sure our lines are not so long
 		 * they will DOS the regexping later
+		 * Also, check that kar is ASCII to make sure that we
+		 * don't break a UTF8 char in two
 		 */
-		if (++break_dist == 256) {
+		if (++break_dist >= 256 && kar < 127) {
 			g_string_append_c (html, '\n');
 			break_dist = 0;
 		}
@@ -832,10 +834,15 @@ modest_text_utils_quote_plain_text (const gchar *text,
 	gsize len;
 	gchar *attachments_string = NULL;
 
-	/* remaining will store the rest of the line if we have to break it */
 	q = g_string_new ("\n");
+	if (signature != NULL) {
+		q = g_string_append (q, signature);
+		q = g_string_append_c (q, '\n');
+	}
 	q = g_string_append (q, cite);
 	q = g_string_append_c (q, '\n');
+
+	/* remaining will store the rest of the line if we have to break it */
 	remaining = g_string_new ("");
 
 	iter = text;
@@ -882,11 +889,6 @@ modest_text_utils_quote_plain_text (const gchar *text,
 	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);
-	}
-
 	return g_string_free (q, FALSE);
 }
 
@@ -1631,3 +1633,77 @@ modest_text_utils_is_forbidden_char (const gchar character,
 
 	return FALSE; /* it's valid! */
 }
+
+gchar *      
+modest_text_utils_label_get_selection (GtkLabel *label)
+{
+	gint start, end;
+	gchar *selection;
+
+	if (gtk_label_get_selection_bounds (GTK_LABEL (label), &start, &end)) {
+		const gchar *start_offset;
+		const gchar *end_offset;
+		start_offset = gtk_label_get_text (GTK_LABEL (label));
+		start_offset = g_utf8_offset_to_pointer (start_offset, start);
+		end_offset = gtk_label_get_text (GTK_LABEL (label));
+		end_offset = g_utf8_offset_to_pointer (end_offset, end);
+		selection = g_strndup (start_offset, end_offset - start_offset);
+		return selection;
+	} else {
+		return g_strdup ("");
+	}
+}
+
+static gboolean
+_forward_search_image_char (gunichar ch,
+			    gpointer userdata)
+{
+	return (ch == 0xFFFC);
+}
+
+gboolean
+modest_text_utils_buffer_selection_is_valid (GtkTextBuffer *buffer)
+{
+	gboolean result;
+	GtkTextIter start, end;
+
+	g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+
+	result = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (buffer));
+
+	/* check there are no images in selection */
+	if (result) {
+		gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+		if (gtk_text_iter_get_char (&start)== 0xFFFC)
+			result = FALSE;
+		else {
+			gtk_text_iter_backward_char (&end);
+			if (gtk_text_iter_forward_find_char (&start, _forward_search_image_char,
+							     NULL, &end))
+				result = FALSE;
+		}
+				    
+	}
+
+	return result;
+}
+
+gchar *
+modest_text_utils_escape_mnemonics (const gchar *text)
+{
+	const gchar *p;
+	GString *result = NULL;
+
+	if (text == NULL)
+		return NULL;
+
+	result = g_string_new ("");
+	for (p = text; *p != '\0'; p++) {
+		if (*p == '_')
+			result = g_string_append (result, "__");
+		else
+			result = g_string_append_c (result, *p);
+	}
+	
+	return g_string_free (result, FALSE);
+}