talons

commit b018455356c552441128c1004be4633b9947ff7a
parent 2fc36b1cd471c4b3e11e5099a85a42415395de01
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 19 Dec 2014 16:26:37 +0100

Fix bug #3354, "Event cancellation uses incorrect method parameter for Content-Type header"

Diffstat:
M
src/plugins/vcalendar/vcal_manager.c
 | 
11
+++++++----

1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/plugins/vcalendar/vcal_manager.c b/src/plugins/vcalendar/vcal_manager.c
@@ -1245,11 +1245,14 @@ static gchar *write_headers(PrefsAccount 	*account,
 		else if (status == ICAL_PARTSTAT_TENTATIVE)
 			prefix = _("Tentatively Accepted: ");
 		else 
-			prefix = "Re: ";
-	} else if (event->method == ICAL_METHOD_PUBLISH)
+			prefix = "Re: "; 
+	} else if (event->method == ICAL_METHOD_PUBLISH) {
 		method_str = "PUBLISH";
-	else
-		method_str = "REQUEST";		
+	} else if (event->method == ICAL_METHOD_CANCEL) {
+		method_str = "CANCEL";
+	} else {
+		method_str = "REQUEST";
+	}
 	
 	subject = g_strdup_printf("%s%s", prefix, event->summary);