From 1f562a2e83f106a637e402afae1697cf2936295a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 7 Oct 2011 18:09:49 +0200
Subject: [PATCH] fixes for the mimetype icons

---
 .../filetypes/{pdf.png => application-pdf.png}    | Bin
 .../{rss.png => application-rss+xml.png}          | Bin
 core/img/filetypes/{svg.png => image-svg+xml.png} | Bin
 core/img/filetypes/msword.png                     | Bin 342 -> 0 bytes
 .../img/filetypes/{ical.png => text-calendar.png} | Bin
 core/img/filetypes/{css.png => text-css.png}      | Bin
 core/img/filetypes/{html.png => text-html.png}    | Bin
 .../filetypes/{cplusplus.png => text-x-c++.png}   | Bin
 core/img/filetypes/{c.png => text-x-c.png}        | Bin
 .../filetypes/{csharp.png => text-x-csharp.png}   | Bin
 core/img/filetypes/{h.png => text-x-h.png}        | Bin
 files/js/filelist.js                              |   2 +-
 lib/helper.php                                    |  12 ++++++------
 13 files changed, 7 insertions(+), 7 deletions(-)
 rename core/img/filetypes/{pdf.png => application-pdf.png} (100%)
 rename core/img/filetypes/{rss.png => application-rss+xml.png} (100%)
 rename core/img/filetypes/{svg.png => image-svg+xml.png} (100%)
 delete mode 100644 core/img/filetypes/msword.png
 rename core/img/filetypes/{ical.png => text-calendar.png} (100%)
 rename core/img/filetypes/{css.png => text-css.png} (100%)
 rename core/img/filetypes/{html.png => text-html.png} (100%)
 rename core/img/filetypes/{cplusplus.png => text-x-c++.png} (100%)
 rename core/img/filetypes/{c.png => text-x-c.png} (100%)
 rename core/img/filetypes/{csharp.png => text-x-csharp.png} (100%)
 rename core/img/filetypes/{h.png => text-x-h.png} (100%)

diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/application-pdf.png
similarity index 100%
rename from core/img/filetypes/pdf.png
rename to core/img/filetypes/application-pdf.png
diff --git a/core/img/filetypes/rss.png b/core/img/filetypes/application-rss+xml.png
similarity index 100%
rename from core/img/filetypes/rss.png
rename to core/img/filetypes/application-rss+xml.png
diff --git a/core/img/filetypes/svg.png b/core/img/filetypes/image-svg+xml.png
similarity index 100%
rename from core/img/filetypes/svg.png
rename to core/img/filetypes/image-svg+xml.png
diff --git a/core/img/filetypes/msword.png b/core/img/filetypes/msword.png
deleted file mode 100644
index 813f712f726c935f9adf8d2f2dd0d7683791ef11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%6;pyTSA|c6o&@eC9QG)Hj&ExYL
zO&oVL^)+cM^qd@ApywS>pwx0H@RDN}hq;7mU-SKczYQ-hnrr=;iDAQMZQ+*g=YOM=
z!QlMQEn7FbaD->uKAYgo_j9)W&$$zS*W9}m(ey0q$&7l-XEWO0Y(9M=SnhLbwy<xp
z<-V!w{rtjKUv+o*|6m()ceab>;d>@~SY$Ku*0xPvIOQeV1x7u_z-2-X>_74(yfh7C
znXL|3GZ+d2`3re2hs?MK<V&+KGL$sTUzRzG=^m3+$2Td42G30@X|lcy44dbP=-$#!
h7h_<U68r8SGxL_I=i_|Jgn@o$@O1TaS?83{1OPX3f*b$<

diff --git a/core/img/filetypes/ical.png b/core/img/filetypes/text-calendar.png
similarity index 100%
rename from core/img/filetypes/ical.png
rename to core/img/filetypes/text-calendar.png
diff --git a/core/img/filetypes/css.png b/core/img/filetypes/text-css.png
similarity index 100%
rename from core/img/filetypes/css.png
rename to core/img/filetypes/text-css.png
diff --git a/core/img/filetypes/html.png b/core/img/filetypes/text-html.png
similarity index 100%
rename from core/img/filetypes/html.png
rename to core/img/filetypes/text-html.png
diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/text-x-c++.png
similarity index 100%
rename from core/img/filetypes/cplusplus.png
rename to core/img/filetypes/text-x-c++.png
diff --git a/core/img/filetypes/c.png b/core/img/filetypes/text-x-c.png
similarity index 100%
rename from core/img/filetypes/c.png
rename to core/img/filetypes/text-x-c.png
diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/text-x-csharp.png
similarity index 100%
rename from core/img/filetypes/csharp.png
rename to core/img/filetypes/text-x-csharp.png
diff --git a/core/img/filetypes/h.png b/core/img/filetypes/text-x-h.png
similarity index 100%
rename from core/img/filetypes/h.png
rename to core/img/filetypes/text-x-h.png
diff --git a/files/js/filelist.js b/files/js/filelist.js
index 6609222079..84762bb561 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -3,7 +3,7 @@ FileList={
 		$('#fileList').empty().html(fileListHtml);
 	},
 	addFile:function(name,size,lastModified,loading){
-		var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file');
+		var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
 		var html='<tr data-file="'+name+'" data-type="file" data-size="'+size+'">';
 		if(name.indexOf('.')!=-1){
 			var basename=name.substr(0,name.lastIndexOf('.'));
diff --git a/lib/helper.php b/lib/helper.php
index 9c2b5fc33c..c2a81ba330 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -101,20 +101,20 @@ class OC_Helper {
 
 		// Is it a dir?
 		if( $mimetype == "dir" ){
-			return OC::$WEBROOT."/core/img/places/folder.svg";
+			return OC::$WEBROOT."/core/img/filetypes/folder.png";
 		}
 
 		// Icon exists?
-		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
-			return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
+		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
 		}
 		//try only the first part of the filetype
 		$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
-		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
-			return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
+		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
 		}
 		else{
-			return OC::$WEBROOT."/core/img/filetypes/file.svg";
+			return OC::$WEBROOT."/core/img/filetypes/file.png";
 		}
 	}