From d24f3835efe05563ebda7229deea4cb5aea30aeb Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 25 May 2016 19:23:25 +0200
Subject: [PATCH] Replace text/icalendar with text/calendar

Fix #455
---
 Makefile                                   | 3 ++-
 tests/storage/test_http.py                 | 2 +-
 tests/storage/test_http_with_singlefile.py | 2 +-
 vdirsyncer/storage/remotestorage.py        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index b1571ca..78587b6 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,8 @@ install-style:
 	
 style:
 	flake8
-	! grep -ri syncroniz */*
+	! git grep -i syncroniz */*
+	! git grep -i 'text/icalendar' */*
 	sphinx-build -W -b html ./docs/ ./docs/_build/html/
 	python3 scripts/make_travisconf.py | diff -b .travis.yml -
 
diff --git a/tests/storage/test_http.py b/tests/storage/test_http.py
index f2a5c8b..d0ec9b5 100644
--- a/tests/storage/test_http.py
+++ b/tests/storage/test_http.py
@@ -42,7 +42,7 @@ def test_list(monkeypatch):
         r.status_code = 200
         assert responses
         r._content = responses.pop().encode('utf-8')
-        r.headers['Content-Type'] = 'text/icalendar'
+        r.headers['Content-Type'] = 'text/calendar'
         r.encoding = 'ISO-8859-1'
         return r
 
diff --git a/tests/storage/test_http_with_singlefile.py b/tests/storage/test_http_with_singlefile.py
index f0431bf..2c3963f 100644
--- a/tests/storage/test_http_with_singlefile.py
+++ b/tests/storage/test_http_with_singlefile.py
@@ -61,7 +61,7 @@ class TestHttpStorage(StorageTests):
             except IOError:
                 r._content = b''
 
-            r.headers['Content-Type'] = 'text/icalendar'
+            r.headers['Content-Type'] = 'text/calendar'
             r.encoding = 'utf-8'
             return r
 
diff --git a/vdirsyncer/storage/remotestorage.py b/vdirsyncer/storage/remotestorage.py
index 5bffc61..f66f1a8 100644
--- a/vdirsyncer/storage/remotestorage.py
+++ b/vdirsyncer/storage/remotestorage.py
@@ -258,7 +258,7 @@ class RemoteStorageCalendars(RemoteStorage):
 
     storage_name = 'remotestorage_calendars'
     fileext = '.ics'
-    item_mimetype = 'text/icalendar'
+    item_mimetype = 'text/calendar'
     scope = 'vdir_calendars'
 
     def __init__(self, **kwargs):