X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=6ef698a8f2b390b8062b50e38b088c17b4e80301;hp=0b8927eaf0364bc9f48fd8698fec46db14f4dc0e;hb=e0b7a97124d9f291b588b2b5658ecdee75882189;hpb=76957d82bb7641ab272ab3ad62bb51e1b7b96dd2

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 0b8927e..6ef698a 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -139,9 +139,9 @@ const guint USER_NAME_FORBIDDEN_CHARS_LENGTH = G_N_ELEMENTS (user_name_forbidden
 
 /* private */
 static gchar*   cite                    (const time_t sent_date, const gchar *from);
-static void     hyperlinkify_plain_text (GString *txt);
+static void     hyperlinkify_plain_text (GString *txt, gint offset);
 static gint     cmp_offsets_reverse     (const url_match_t *match1, const url_match_t *match2);
-static GSList*  get_url_matches         (GString *txt);
+static GSList*  get_url_matches         (GString *txt, gint offset);
 
 static GString* get_next_line           (const char *b, const gsize blen, const gchar * iter);
 static int      get_indent_level        (const char *l);
@@ -356,31 +356,42 @@ modest_text_utils_remove_duplicate_addresses (const gchar *address_list)
 {
 	GSList *addresses, *cursor;
 	GHashTable *table;
-	gchar *new_list;
+	gchar *new_list = NULL;
 	
 	g_return_val_if_fail (address_list, NULL);
 
-	table = g_hash_table_new (g_str_hash, g_str_equal);
+	table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 	addresses = modest_text_utils_split_addresses_list (address_list);
 
-	new_list = g_strdup("");
 	cursor = addresses;
 	while (cursor) {
 		const gchar* address = (const gchar*)cursor->data;
 
+		/* We need only the email to just compare it and not
+		   the full address which would make "a <a@a.com>"
+		   different from "a@a.com" */
+		const gchar *email = get_email_from_address (address);
+
 		/* ignore the address if already seen */
-		if (g_hash_table_lookup (table, address) == 0) {
-		
-			gchar *tmp = g_strjoin (",", new_list, address, NULL);
-			g_free (new_list);
+		if (g_hash_table_lookup (table, email) == 0) {
+			gchar *tmp;
+
+			/* Include the full address and not only the
+			   email in the returned list */
+			if (!new_list) {
+				tmp = g_strdup (address);
+			} else {
+				tmp = g_strjoin (",", new_list, address, NULL);
+				g_free (new_list);
+			}
 			new_list = tmp;
 			
-			g_hash_table_insert (table, (gchar*)address, GINT_TO_POINTER(1));
+			g_hash_table_insert (table, (gchar*)email, GINT_TO_POINTER(1));
 		}
 		cursor = g_slist_next (cursor);
 	}
 
-	g_hash_table_destroy (table);
+	g_hash_table_unref (table);
 	g_slist_foreach (addresses, (GFunc)g_free, NULL);
 	g_slist_free (addresses);
 
@@ -487,7 +498,7 @@ modest_text_utils_convert_to_html (const gchar *data)
 	g_string_append (html, "</body></html>");
 
 	if (len <= HYPERLINKIFY_MAX_LENGTH)
-		hyperlinkify_plain_text (html);
+		hyperlinkify_plain_text (html, 0);
 
 	modest_text_utils_convert_buffer_to_html_finish (html);
 	
@@ -511,7 +522,7 @@ modest_text_utils_convert_to_html_body (const gchar *data, gssize n, gboolean hy
 	modest_text_utils_convert_buffer_to_html_start (html, data, n);
 
 	if (hyperlinkify && (n < HYPERLINKIFY_MAX_LENGTH))
-		hyperlinkify_plain_text (html);
+		hyperlinkify_plain_text (html, 0);
 
 	modest_text_utils_convert_buffer_to_html_finish (html);
 	
@@ -1014,10 +1025,10 @@ modest_text_utils_hyperlinkify_end (void)
 
 
 static GSList*
-get_url_matches (GString *txt)
+get_url_matches (GString *txt, gint offset)
 {
 	regmatch_t rm;
-        guint rv, i, offset = 0;
+        guint rv, i, tmp_offset = 0;
         GSList *match_list = NULL;
 
 	const size_t pattern_num = sizeof(patterns)/sizeof(url_match_pattern_t);
@@ -1027,13 +1038,13 @@ get_url_matches (GString *txt)
 
         /* find all the matches */
 	for (i = 0; i != pattern_num; ++i) {
-		offset     = 0;	
+		tmp_offset     = offset;	
 		while (1) {
 			url_match_t *match;
 			gboolean is_submatch;
 			GSList *cursor;
 			
-			if ((rv = regexec (patterns[i].preg, txt->str + offset, 1, &rm, 0)) != 0) {
+			if ((rv = regexec (patterns[i].preg, txt->str + tmp_offset, 1, &rm, 0)) != 0) {
 				g_return_val_if_fail (rv == REG_NOMATCH, NULL); /* this should not happen */
 				break; /* try next regexp */ 
 			}
@@ -1046,7 +1057,7 @@ get_url_matches (GString *txt)
 			while (cursor && !is_submatch) {
 				const url_match_t *old_match =
 					(const url_match_t *) cursor->data;
-				guint new_offset = offset + rm.rm_so;
+				guint new_offset = tmp_offset + rm.rm_so;
 				is_submatch = (new_offset >  old_match->offset &&
 					       new_offset <  old_match->offset + old_match->len);
 				cursor = g_slist_next (cursor);
@@ -1055,12 +1066,12 @@ get_url_matches (GString *txt)
 			if (!is_submatch) {
 				/* make a list of our matches (<offset, len, prefix> tupels)*/
 				match = g_slice_new (url_match_t);
-				match->offset = offset + rm.rm_so;
+				match->offset = tmp_offset + rm.rm_so;
 				match->len    = rm.rm_eo - rm.rm_so;
 				match->prefix = patterns[i].prefix;
 				match_list = g_slist_prepend (match_list, match);
 			}		
-			offset += rm.rm_eo;
+			tmp_offset += rm.rm_eo;
 		}
 	}
 
@@ -1101,10 +1112,10 @@ replace_string (const gchar *haystack, const gchar *needle, gchar repl)
 }
 
 static void
-hyperlinkify_plain_text (GString *txt)
+hyperlinkify_plain_text (GString *txt, gint offset)
 {
 	GSList *cursor;
-	GSList *match_list = get_url_matches (txt);
+	GSList *match_list = get_url_matches (txt, offset);
 
 	/* we will work backwards, so the offsets stay valid */
 	for (cursor = match_list; cursor; cursor = cursor->next) {
@@ -1140,6 +1151,18 @@ hyperlinkify_plain_text (GString *txt)
 	g_slist_free (match_list);
 }
 
+void
+modest_text_utils_hyperlinkify (GString *string_buffer)
+{
+	gchar *after_body;
+	gint offset = 0;
+
+	after_body = strstr (string_buffer->str, "<body>");
+	if (after_body != NULL)
+		offset = after_body - string_buffer->str;
+	hyperlinkify_plain_text (string_buffer, offset);
+}
+
 
 /* for optimization reasons, we change the string in-place */
 void
@@ -1320,9 +1343,8 @@ modest_text_utils_validate_folder_name (const gchar *folder_name)
 	gint i;
 	const gchar **cursor = NULL;
 	const gchar *forbidden_names[] = { /* windows does not like these */
-		"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6",
-		"COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
-		".", "..", "cur", "tmp", "new", NULL /* cur, tmp new  are reserved for Maildir */
+		"CON", "PRN", "AUX", "NUL", ".", "..", "cur", "tmp", "new", 
+		NULL /* cur, tmp, new are reserved for Maildir */
 	};
 	
 	/* cannot be NULL */
@@ -1346,6 +1368,27 @@ modest_text_utils_validate_folder_name (const gchar *folder_name)
 	for (i = 0; i < len; i++)
 		if (modest_text_utils_is_forbidden_char (folder_name[i], FOLDER_NAME_FORBIDDEN_CHARS))
 			return FALSE;
+
+	/* 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")) {
+		glong val;
+		gchar *endptr;
+
+		/* We skip the first 3 characters for the
+		   comparison */
+		val = strtol(folder_name+3, &endptr, 10);
+
+		/* If the conversion to long succeeded then the string
+		   is not valid for us */
+		if (*endptr == '\0')
+			return FALSE;
+		else
+			return TRUE;
+	}
 	
 	/* cannot contain a forbidden word */
 	if (len <= 4) {