X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=2223fd1b0a880373e4c3c6dbf117d1e53277b70e;hp=93e51ee9d2f58979807ebf80656ae3f79d77ffda;hb=4d39841513a3a7f7aa9d38ab97cb9fcc9171e80b;hpb=3a00a6ff63e2fcd2feb005314753c6d4f32cf105

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 93e51ee..2223fd1 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -63,8 +63,6 @@
  * will hang modest
  */
 #define HYPERLINKIFY_MAX_LENGTH (1024*50)
-#define SIGNATURE_MARKER "--"
-
 
 /*
  * we need these regexps to find URLs in plain text e-mails
@@ -109,8 +107,8 @@ struct _url_match_t {
 
 /* 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  {				\
-	{ "(feed:|)(file|rtsp|http|ftp|https|mms|mmsh|webcal|feed|rtsp|rdp|lastfm|sip)://[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR \
-			"]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",	\
+	{ "(feed:|)(file|rtsp|http|ftp|https|mms|mmsh|webcal|feed|rtsp|rdp|lastfm|sip)://[-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://" },				\
@@ -216,7 +214,7 @@ modest_text_utils_cite (const gchar *text,
 	if (!signature) {
 		tmp_sig = g_strdup (text);
 	} else {
-		tmp_sig = g_strconcat (text, "\n", SIGNATURE_MARKER, "\n", signature, NULL);
+		tmp_sig = g_strconcat (text, "\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n", signature, NULL);
 	}
 
 	if (strcmp (content_type, "text/html") == 0) {
@@ -418,6 +416,9 @@ modest_text_utils_remove_duplicate_addresses (const gchar *address_list)
 	g_slist_foreach (addresses, (GFunc)g_free, NULL);
 	g_slist_free (addresses);
 
+	if (new_list == NULL)
+		new_list = g_strdup ("");
+
 	return new_list;
 }
 
@@ -437,7 +438,7 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
 		guchar kar = data[i];
 		
 		if (space_seen && kar != ' ') {
-			g_string_append_c (html, ' ');
+			g_string_append (html, " ");
 			space_seen = FALSE;
 		}
 		
@@ -768,7 +769,7 @@ get_indent_level (const char *l)
 	/*      if we hit the signature marker "-- ", we return -(indent + 1). This
 	 *      stops reformatting.
 	 */
-	if (strcmp (l, "-- ") == 0) {
+	if (strcmp (l, MODEST_TEXT_UTILS_SIGNATURE_MARKER) == 0) {
 		return -1 - indent;
 	} else {
 		return indent;
@@ -966,7 +967,7 @@ modest_text_utils_quote_plain_text (const gchar *text,
 	q = g_string_new ("");
 
 	if (signature != NULL) {
-		q = g_string_append (q, "\n--\n");
+		g_string_append_printf (q, "\n%s\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER);
 		q = g_string_append (q, signature);
 	}
 
@@ -1013,7 +1014,7 @@ modest_text_utils_quote_html (const gchar *text,
 		GString *quoted_text;
 		g_string_append (result_string, "<pre>\n");
 		if (signature) {
-			quote_html_add_to_gstring (result_string, SIGNATURE_MARKER);
+			quote_html_add_to_gstring (result_string, MODEST_TEXT_UTILS_SIGNATURE_MARKER);
 			quote_html_add_to_gstring (result_string, signature);
 		}
 		quote_html_add_to_gstring (result_string, cite);
@@ -1274,7 +1275,37 @@ modest_text_utils_get_display_address (gchar *address)
 }
 
 
+gchar *
+modest_text_utils_get_display_addresses (const gchar *recipients)
+{
+	gchar *addresses;
+	GSList *recipient_list;
+
+	addresses = NULL;
+	recipient_list = modest_text_utils_split_addresses_list (recipients);
+	if (recipient_list) {
+		GString *add_string = g_string_sized_new (strlen (recipients));
+		GSList *iter = recipient_list;
+		gboolean first = TRUE;
+
+		while (iter) {
+			/* Strings are changed in place */
+			modest_text_utils_get_display_address ((gchar *) iter->data);
+			if (G_UNLIKELY (first)) {
+				g_string_append_printf (add_string, "%s", (gchar *) iter->data);
+				first = FALSE;
+			} else {
+				g_string_append_printf (add_string, ", %s", (gchar *) iter->data);
+			}
+			iter = g_slist_next (iter);
+		}
+		g_slist_foreach (recipient_list, (GFunc) g_free, NULL);
+		g_slist_free (recipient_list);
+		addresses = g_string_free (add_string, FALSE);
+	}
 
+	return addresses;
+}
 
 
 gchar *
@@ -1403,10 +1434,17 @@ modest_text_utils_get_display_date (time_t date)
 	/* if it's today, show the time, if it's not today, show the date instead */
 
 	/* TODO: take into account the system config for 24/12h */
+#ifdef MODEST_TOOLKIT_HILDON2
 	if (day == date_day) /* is the date today? */
 		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, _HL("wdgt_va_24h_time"), date);
 	else 
 		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, _HL("wdgt_va_date"), date); 
+#else
+	if (day == date_day) /* is the date today? */
+		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%X", date);
+	else 
+		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%x", date); 
+#endif
 
 	return date_buf; /* this is a static buffer, don't free! */
 }
@@ -1678,11 +1716,11 @@ modest_text_utils_get_display_size (guint64 size)
 	else if (KB <= size && size < 100 * KB)
 		return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) size / KB);
 	else if (100*KB <= size && size < MB)
-		return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (float) size / MB);
+		return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (int) size / KB);
 	else if (MB <= size && size < 10*MB)
 		return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), (float) size / MB);
 	else if (10*MB <= size && size < GB)
-		return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (int) size / MB);
+		return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (float) size / MB);
 	else
 		return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);
 }
@@ -1837,6 +1875,17 @@ modest_text_utils_buffer_selection_is_valid (GtkTextBuffer *buffer)
 	return result;
 }
 
+static void
+remove_quotes (gchar **quotes)
+{
+	if (g_str_has_prefix (*quotes, "\"") && g_str_has_suffix (*quotes, "\"")) {
+		gchar *result;
+		result = g_strndup ((*quotes)+1, strlen (*quotes) - 2);
+		g_free (*quotes);
+		*quotes = result;
+	}
+}
+
 gchar *
 modest_text_utils_escape_mnemonics (const gchar *text)
 {
@@ -1856,3 +1905,53 @@ modest_text_utils_escape_mnemonics (const gchar *text)
 	
 	return g_string_free (result, FALSE);
 }
+
+gchar *
+modest_text_utils_simplify_recipients (const gchar *recipients)
+{
+	GSList *addresses, *node;
+	GString *result;
+	gboolean is_first = TRUE;
+
+	if (recipients == NULL)
+		return g_strdup ("");
+
+	addresses = modest_text_utils_split_addresses_list (recipients);
+	result = g_string_new ("");
+
+	for (node = addresses; node != NULL; node = g_slist_next (node)) {
+		const gchar *address = (const gchar *) node->data;
+		gchar *left_limit, *right_limit;
+		left_limit = strstr (address, "<");
+		right_limit = g_strrstr (address, ">");
+
+		if (is_first)
+			is_first = FALSE;
+		else
+			result = g_string_append (result, ", ");
+
+		if ((left_limit == NULL)||(right_limit == NULL)|| (left_limit > right_limit)) {
+			result = g_string_append (result, address);
+		} else {
+			gchar *name_side;
+			gchar *email_side;
+			name_side = g_strndup (address, left_limit - address);
+			name_side = g_strstrip (name_side);
+			remove_quotes (&name_side);
+			email_side = get_email_from_address (address);
+			if (name_side && email_side && !strcmp (name_side, email_side)) {
+				result = g_string_append (result, email_side);
+			} else {
+				result = g_string_append (result, address);
+			}
+			g_free (name_side);
+			g_free (email_side);
+		}
+
+	}
+	g_slist_foreach (addresses, (GFunc)g_free, NULL);
+	g_slist_free (addresses);
+
+	return g_string_free (result, FALSE);
+
+}