From 2e404cbfd9b7ab9612b642265186c81480cac9e9 Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil@redhat.com>
Date: Thu, 29 Mar 2012 17:26:03 +0200
Subject: Bug #673067 - [itip-formatter] Shows one long line for the meeting
 description

---
 plugins/itip-formatter/itip-formatter.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index b40a5082ce..b59b6f76b8 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2961,8 +2961,20 @@ init_itip_view (ItipPURI *info,
 		if (list) {
 			ECalComponentText *text = list->data;
 
-			if (text->value)
-				itip_view_set_comment (view, text->value);
+			if (text->value) {
+				gchar *html;
+
+				html = camel_text_to_html (
+					text->value,
+					CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
+					CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
+					CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES,
+					0);
+
+				itip_view_set_comment (view, html);
+
+				g_free (html);
+			}
 		}
 		e_cal_component_free_text_list (list);
 	}
@@ -2980,8 +2992,20 @@ init_itip_view (ItipPURI *info,
 	e_cal_component_free_text_list (list);
 
 	if (gstring) {
-		itip_view_set_description (view, gstring->str);
+		gchar *html;
+
+		html = camel_text_to_html (
+			gstring->str,
+			CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
+			CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES |
+			CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
+			CAMEL_MIME_FILTER_TOHTML_MARK_CITATION |
+			CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES,
+			0);
+
+		itip_view_set_description (view, html);
 		g_string_free (gstring, TRUE);
+		g_free (html);
 	}
 
         to_zone = e_shell_settings_get_pointer (shell_settings, "cal-timezone");
-- 
cgit