X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=3c633851d08dffe10422afb076eb052e78c713a6;hp=fd737cc7abdd3b400136b27e42085d2a62257424;hb=addd1287234fa35a521c56e6d6472de35739b3a2;hpb=85b60b61bf30595fabd3bb9b3c5e2d9a0592912f

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index fd737cc..3c63385 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -79,7 +79,7 @@ struct _url_match_t {
 	{ "(file|rtsp|http|ftp|https)://[-A-Za-z0-9_$.+!*(),;:@%&=?/~#]+[-A-Za-z0-9_$%&=?/~#]",\
 	  NULL, NULL },\
 	{ "www\\.[-a-z0-9.]+[-a-z0-9](:[0-9]*)?(/[-A-Za-z0-9_$.+!*(),;:@%&=?/~#]*[^]}\\),?!;:\"]?)?",\
-	  NULL, "http://" },\
+			NULL, "http://" },				\
 	{ "ftp\\.[-a-z0-9.]+[-a-z0-9](:[0-9]*)?(/[-A-Za-z0-9_$.+!*(),;:@%&=?/~#]*[^]}\\),?!;:\"]?)?",\
 	  NULL, "ftp://" },\
 	{ "(voipto|callto|chatto|jabberto|xmpp):[-_a-z@0-9.\\+]+", \
@@ -964,7 +964,26 @@ modest_text_utils_get_display_address (gchar *address)
 	return address;
 }
 
+gchar *
+modest_text_utils_get_email_address (const gchar *full_address)
+{
+	const gchar *left, *right;
+	
+	if (!full_address)
+		return NULL;
+	
+	g_return_val_if_fail (g_utf8_validate (full_address, -1, NULL), NULL);
+	
+	left = g_strrstr_len (full_address, strlen(full_address), "<");
+	if (left == NULL)
+		return g_strdup (full_address);
 
+	right = g_strstr_len (left, strlen(left), ">");
+	if (right == NULL)
+		return g_strdup (full_address);
+
+	return g_strndup (left + 1, right - left - 1);
+}
 
 gint 
 modest_text_utils_get_subject_prefix_len (const gchar *sub)
@@ -1050,6 +1069,32 @@ modest_text_utils_get_display_date (time_t date)
 	return g_strdup(date_buf);
 }
 
+
+gboolean
+modest_text_utils_validate_domain_name (const gchar *domain)
+{
+	gboolean valid = FALSE;
+	regex_t rx;
+	const gchar* domain_regex = "^[a-z0-9]([.]?[a-z0-9-])*[a-z0-9]$";
+
+	if (!domain)
+		return FALSE;
+	
+	/* domain name: all alphanum or '-' or '.',
+	 * but beginning/ending in alphanum */	
+	if (regcomp (&rx, domain_regex, REG_ICASE|REG_EXTENDED|REG_NOSUB)) {
+		g_warning ("BUG: error in regexp");
+		return FALSE;
+	}
+	
+	valid = (regexec (&rx, domain, 1, NULL, 0) == 0);
+	regfree (&rx);
+		
+	return valid;
+}
+
+
+
 gboolean
 modest_text_utils_validate_email_address (const gchar *email_address, const gchar **invalid_char_position)
 {
@@ -1100,7 +1145,7 @@ modest_text_utils_validate_email_address (const gchar *email_address, const gcha
 		return FALSE;
 	do {
 		if (*c == '.') {
-			if (c == domain || *(c - 1) == '.') 
+			if (c == domain || *(c - 1) == '.' || *(c + 1) == '\0') 
 				return FALSE;
 			count++;
 		}