[patch] patch

evolution.debdiff (text/plain), 2.54 KB, created by Robert Piasek (RETIRED) on 2008-07-04 12:42:27 UTC

diff -u evolution-2.22.1.1/debian/changelog evolution-2.22.1.1/debian/changelog
--- evolution-2.22.1.1/debian/changelog
+++ evolution-2.22.1.1/debian/changelog
@@ -1,3 +1,11 @@
+evolution (2.22.1.1-0ubuntu3) hardy-proposed; urgency=low
+
+  * debian/patches/91_from_svn_fix_meetings_representation.patch:
+    - change from svn, fix some meetings being displayed as text messages
+      (lp: #231091)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 27 May 2008 15:27:43 +0200
+
 evolution (2.22.1.1-0ubuntu2) hardy-proposed; urgency=low
 
   * debian/patches/90_from_svn_fix_printing_crasher.patch:
only in patch2:
unchanged:
--- evolution-2.22.1.1.orig/debian/patches/91_from_svn_fix_meetings_representation.patch
+++ evolution-2.22.1.1/debian/patches/91_from_svn_fix_meetings_representation.patch
@@ -0,0 +1,49 @@
+--- branches/gnome-2-22/plugins/prefer-plain/prefer-plain.c	2008/05/27 12:38:24	35554
++++ branches/gnome-2-22/plugins/prefer-plain/prefer-plain.c	2008/05/27 12:38:43	35555
+@@ -99,20 +99,41 @@
+ 	int i, nparts, partidlen, displayid = 0;
+ 
+ 	if (epp_mode == EPP_NORMAL) {
++		gboolean have_plain = FALSE;
++
+ 		/* Try to find text/html part even when not as last and force to show it.
+ 		   Old handler will show the last part of multipart/alternate, but if we
+-		   can offer HTML, then offer it, regardless of position in multipart. */
++		   can offer HTML, then offer it, regardless of position in multipart.
++		   But do this only when have text/plain in a list, because otherwise it
++		   can be something else (like outlooks meeting invites with only text/html
++		   part and calendar part).
++		*/
+ 		nparts = camel_multipart_get_number (mp);
+ 		for (i = 0; i < nparts; i++) {
++			CamelContentType *content_type;
++
+ 			part = camel_multipart_get_part (mp, i);
+-			if (part && camel_content_type_is (camel_mime_part_get_content_type (part), "text", "html")) {
++
++			if (!part)
++				continue;
++
++			content_type = camel_mime_part_get_content_type (part);
++
++			if (camel_content_type_is (content_type, "text", "html")) {
+ 				displayid = i;
+ 				display_part = part;
+-				break;
++
++				if (have_plain)
++					break;
++			} else if (camel_content_type_is (content_type, "text", "plain")) {
++				have_plain = TRUE;
++
++				if (display_part)
++					break;
+ 			}
+ 		}
+ 
+-		if (display_part) {
++		if (display_part && have_plain) {
+ 			g_string_append_printf (t->format->part_id, ".alternative.%d", displayid);
+ 			em_format_part_as (t->format, t->stream, display_part, "text/html");
+ 			g_string_truncate (t->format->part_id, partidlen);
+