X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=f2ca84088c2f6d9eb20451cb4fee7cc67dfffc15;hp=c8b0539cc024a6ec69c67e79bdbbab0489a523a1;hb=d39a0b6738e86acb01327d641b6e78eb0afa8c63;hpb=145d94ed86806ddde9609e5826d62c2e66e7ea89

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index c8b0539..f2ca840 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -65,21 +65,6 @@
 #define HYPERLINKIFY_MAX_LENGTH (1024*50)
 
 
-/*
- * we mark the ampersand with \007 when converting text->html
- * because after text->html we do hyperlink detecting, which
- * could be screwed up by the ampersand.
- * ie. 1<3 ==> 1\007lt;3
- */
-#define MARK_AMP '\007'
-#define MARK_AMP_STR "\007"
-
-/* mark &amp; separately, because they are parts of urls.
- * ie. a&b => 1\008amp;b
- */
-#define MARK_AMP_URI '\006'
-#define MARK_AMP_URI_STR "\006"
-
 
 /*
  * we need these regexps to find URLs in plain text e-mails
@@ -98,9 +83,34 @@ struct _url_match_t {
 	const gchar* prefix;
 };
 
+
+/*
+ * we mark the ampersand with \007 when converting text->html
+ * because after text->html we do hyperlink detecting, which
+ * could be screwed up by the ampersand.
+ * ie. 1<3 ==> 1\007lt;3
+ */
+#define MARK_AMP '\007'
+#define MARK_AMP_STR "\007"
+
+/* mark &amp; separately, because they are parts of urls.
+ * ie. a&b => a\006amp;b, but a>b => a\007gt;b
+ *
+ * we need to handle '&' separately, because it can be part of URIs
+ * (as in href="http://foo.bar?a=1&b=1"), so inside those URIs
+ * we need to re-replace \006amp; with '&' again, while outside uri's
+ * it will be '&amp;'
+ * 
+ * yes, it's messy, but a consequence of doing text->html first, then hyperlinkify
+ */
+#define MARK_AMP_URI '\006'
+#define MARK_AMP_URI_STR "\006"
+
+
 /* note: match MARK_AMP_URI_STR as well, because after txt->html, a '&' will look like $(MARK_AMP_URI_STR)"amp;" */
 #define MAIL_VIEWER_URL_MATCH_PATTERNS  {				\
-	{ "(file|rtsp|http|ftp|https|mms|mmsh|rtsp|rdp|lastfm)://[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",\
+	{ "(file|rtsp|http|ftp|https|mms|mmsh|rtsp|rdp|lastfm)://[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR \
+			"]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",	\
 	  NULL, NULL },\
 	{ "www\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",\
 			NULL, "http://" },				\
@@ -221,6 +231,8 @@ forward_cite (const gchar *from,
 	      const gchar *to,
 	      const gchar *subject)
 {
+	g_return_val_if_fail (sent, NULL);
+	
 	return g_strdup_printf ("%s\n%s %s\n%s %s\n%s %s\n%s %s\n", 
 				FORWARD_STRING, 
 				FROM_STRING, (from)?from:"",
@@ -388,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, ' ');
@@ -398,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;
 		}
@@ -570,6 +584,8 @@ modest_text_utils_split_addresses_list (const gchar *addresses)
 	const gchar *my_addrs = addresses;
 	const gchar *end;
 	gchar *addr;
+
+	g_return_val_if_fail (addresses, NULL);
 	
 	/* skip any space, ',', ';' at the start */
 	while (my_addrs && (my_addrs[0] == ' ' || my_addrs[0] == ',' || my_addrs[0] == ';'))
@@ -1219,7 +1235,7 @@ modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insens
 	/* if it's not case sensitive */
 	if (!insensitive) {
 
-		/* optimization: short cut if first char is ascii */ 
+		/* optimization: shortcut if first char is ascii */ 
 		if (((s1[0] & 0xf0)== 0) && ((s2[0] & 0xf0) == 0)) 
 			return s1[0] - s2[0];
 		
@@ -1617,3 +1633,57 @@ 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;
+}