X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=6b3709ccee5fcea20fc242e299f7a7a4c68f6bd5;hb=8e43419e3de0dc6b9afde4f309c3fe25b1e12286;hp=0bc5d5a38c0d4373dcec7401b1fab285fed09cfa;hpb=fcbc6a6dfa1a10921d2ca889256a21b192adbe98;p=modest

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 0bc5d5a..6b3709c 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -49,11 +49,11 @@
 #endif /*HAVE_CONFIG_H */
 
 /* defines */
-#define FORWARD_STRING _("-----Forwarded Message-----")
-#define FROM_STRING _("From:")
-#define SENT_STRING _("Sent:")
-#define TO_STRING _("To:")
-#define	SUBJECT_STRING _("Subject:")
+#define FORWARD_STRING _("mcen_ia_editor_original_message")
+#define FROM_STRING _("mail_va_from")
+#define SENT_STRING _("mcen_fi_message_properties_sent")
+#define TO_STRING _("mail_va_to")
+#define	SUBJECT_STRING _("mail_va_subject")
 #define EMPTY_STRING ""
 
 /*
@@ -180,18 +180,18 @@ modest_text_utils_cite (const gchar *text,
 {
 	gchar *retval;
 	gchar *tmp_sig;
-
+	
 	g_return_val_if_fail (text, NULL);
 	g_return_val_if_fail (content_type, NULL);
-
+	
 	if (!signature)
 		retval = g_strdup ("");
-	else if (!strcmp(content_type, "text/html")) {
+	else if (strcmp(content_type, "text/html") == 0) {
 		tmp_sig = g_strconcat ("\n", signature, NULL);
 		retval = modest_text_utils_convert_to_html_body(tmp_sig);
 		g_free (tmp_sig);
 	} else {
-		retval = g_strconcat ("\n", signature, NULL);
+		retval = g_strconcat (text, "\n", signature, NULL);
 	}
 
 	return retval;
@@ -199,9 +199,9 @@ modest_text_utils_cite (const gchar *text,
 
 static gchar *
 forward_cite (const gchar *from,
-		    const gchar *sent,
-		    const gchar *to,
-		    const gchar *subject)
+	      const gchar *sent,
+	      const gchar *to,
+	      const gchar *subject)
 {
 	return g_strdup_printf ("%s\n%s %s\n%s %s\n%s %s\n%s %s\n", 
 				FORWARD_STRING, 
@@ -354,7 +354,9 @@ modest_text_utils_convert_buffer_to_html (GString *html, const gchar *data)
 		case '>'  : g_string_append (html, ">");   break;
 		case '&'  : g_string_append (html, "&");  break;
 		case '"'  : g_string_append (html, """);  break;
-		case '\'' : g_string_append (html, "'"); break;
+
+		/* don't convert ' --> wpeditor will try to re-convert it... */	
+		//case '\'' : g_string_append (html, "'"); break;
 		case '\n' : g_string_append (html, "<br>\n");              break_dist= 0; break;
 		case '\t' : g_string_append (html, "&nbsp;&nbsp;&nbsp; "); break_dist=0; break; /* note the space at the end*/
 		case ' ':
@@ -833,6 +835,7 @@ modest_text_utils_quote_html (const gchar *text,
 	g_free (attachments_string);
 	g_free (q_attachments_string);
 	g_free (signature_result);
+	
 	return result;
 }
 
@@ -894,7 +897,6 @@ get_url_matches (GString *txt)
 				match->offset = offset + rm.rm_so;
 				match->len    = rm.rm_eo - rm.rm_so;
 				match->prefix = patterns[i].prefix;
-				g_warning ("<%d, %d, %s>",  match->offset, match->len, match->prefix);
 				match_list = g_slist_prepend (match_list, match);
 			}
 				
@@ -951,37 +953,39 @@ hyperlinkify_plain_text (GString *txt)
 }
 
 
-
-gchar*
+/* for optimization reasons, we change the string in-place */
+void
 modest_text_utils_get_display_address (gchar *address)
 {
-	gchar *cursor;
+	int i;
 	
 	if (!address)
-		return NULL;
+		return;
 	
-	g_return_val_if_fail (g_utf8_validate (address, -1, NULL), NULL);
+	/* should not be needed, and otherwise, we probably won't screw up the address
+	 * more than it already is :) 
+	 * g_return_val_if_fail (g_utf8_validate (address, -1, NULL), NULL);
+	 * */
 	
-	g_strchug (address); /* remove leading whitespace */
+	/* remove leading whitespace */
+	if (address[0] == ' ')
+		g_strchug (address);
+		
+	for (i = 0; address[i]; ++i) {
+		if (address[i] == '<') {
+			if (G_UNLIKELY(i == 0))
+				return; /* there's nothing else, leave it */
+			else {
+				address[i] = '\0'; /* terminate the string here */
+				return;
+			}
+		}
+	}
+}
 
-	/*  <email@address> from display name */
-	cursor = g_strstr_len (address, strlen(address), "<");
-	if (cursor == address) /* there's nothing else? leave it */
-		return address;
-	if (cursor) 
-		cursor[0]='\0';
 
-	/* remove (bla bla) from display name */
-	cursor = g_strstr_len (address, strlen(address), "(");
-	if (cursor == address) /* there's nothing else? leave it */
-		return address;
-	if (cursor) 
-		cursor[0]='\0';
 
-	g_strchomp (address); /* remove trailing whitespace */
 
-	return address;
-}
 
 gchar *
 modest_text_utils_get_email_address (const gchar *full_address)
@@ -1141,6 +1145,8 @@ modest_text_utils_validate_domain_name (const gchar *domain)
 	regex_t rx;
 	const gchar* domain_regex = "^[a-z0-9]([.]?[a-z0-9-])*[a-z0-9]$";
 
+	memset (&rx, 0, sizeof(regex_t)); /* coverity wants this... */
+	
 	if (!domain)
 		return FALSE;