From 57ceee13a964ac949717891e13af1990779ad841 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 22 Sep 2015 17:56:48 +0200
Subject: [PATCH] Updated some mimetypes

* c++ and cpp now both map to code
---
 core/js/mimetypelist.js                    | 1 +
 resources/config/mimetypealiases.dist.json | 1 +
 resources/config/mimetypemapping.dist.json | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index 760d7baab7..43f01273f5 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -74,6 +74,7 @@ OC.MimeTypeList={
     "text/csv": "x-office/spreadsheet",
     "text/html": "text/code",
     "text/x-c": "text/code",
+    "text/x-c++src": "text/code",
     "text/x-h": "text/code",
     "text/x-java-source": "text/code",
     "text/x-python": "text/code",
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index d0019c4f0a..ed471f228e 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -74,6 +74,7 @@
 	"text/csv": "x-office/spreadsheet",
 	"text/html": "text/code",
 	"text/x-c": "text/code",
+	"text/x-c++src": "text/code",
 	"text/x-h": "text/code",
 	"text/x-java-source": "text/code",
 	"text/x-python": "text/code",
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index e7c0887181..e26ec7038b 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -36,7 +36,7 @@
 	"csv": ["text/csv"],
 	"cvbdl": ["application/x-cbr"],
 	"c": ["text/x-c"],
-	"c++": ["text/x-c"],
+	"c++": ["text/x-c++src"],
 	"dcr": ["image/x-dcraw"],
 	"deb": ["application/x-deb"],
 	"dng": ["image/x-dcraw"],
-- 
GitLab