Bug 919853 - Add mimetype and extension mapping of vCard, r=bz, r=arcturus
authorEric Chou <echou@mozilla.com>
Thu, 26 Sep 2013 14:25:50 +0800
changeset 148746 b16fd01c41f63ce6e3a04fe778ec7c2c8bda50c2
parent 148745 0643a06467bbc06dac860cf0b042ee212e9bec79
child 148747 e06fa40a1fe1848221bc818505cebcddf8c0b274
child 148784 f77c6ef21e9d2bc3860e084e7649ffc2d78fff2e
push id1218
push userechou@mozilla.com
push dateThu, 26 Sep 2013 06:55:33 +0000
treeherderb2g-inbound@b16fd01c41f6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, arcturus
bugs919853
milestone27.0a1
Bug 919853 - Add mimetype and extension mapping of vCard, r=bz, r=arcturus
netwerk/mime/nsMimeTypes.h
uriloader/exthandler/nsExternalHelperAppService.cpp
--- a/netwerk/mime/nsMimeTypes.h
+++ b/netwerk/mime/nsMimeTypes.h
@@ -121,17 +121,17 @@
 #define SUN_ATTACHMENT                      "x-sun-attachment"
 
 #define TEXT_ENRICHED                       "text/enriched"
 #define TEXT_CALENDAR                       "text/calendar"
 #define TEXT_HTML                           "text/html"
 #define TEXT_MDL                            "text/mdl"
 #define TEXT_PLAIN                          "text/plain"
 #define TEXT_RICHTEXT                       "text/richtext"
-#define TEXT_VCARD                          "text/x-vcard"
+#define TEXT_VCARD                          "text/vcard"
 #define TEXT_CSS                            "text/css"
 #define TEXT_JSSS                           "text/jsss"
 #define TEXT_XML                            "text/xml"
 #define TEXT_RDF                            "text/rdf"
 #define TEXT_XUL                            "application/vnd.mozilla.xul+xml"
 #define TEXT_ECMASCRIPT                     "text/ecmascript"
 #define TEXT_JAVASCRIPT                     "text/javascript"
 #define TEXT_XSL                            "text/xsl"
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -484,16 +484,17 @@ static nsExtraMimeTypeEntry extraMimeEnt
   { TEXT_PLAIN, "txt,text", "Text File" },
   { TEXT_HTML, "html,htm,shtml,ehtml", "HyperText Markup Language" },
   { "application/xhtml+xml", "xhtml,xht", "Extensible HyperText Markup Language" },
   { APPLICATION_MATHML_XML, "mml", "Mathematical Markup Language" },
   { APPLICATION_RDF, "rdf", "Resource Description Framework" },
   { TEXT_XUL, "xul", "XML-Based User Interface Language" },
   { TEXT_XML, "xml,xsl,xbl", "Extensible Markup Language" },
   { TEXT_CSS, "css", "Style Sheet" },
+  { TEXT_VCARD, "vcf,vcard", "Contact Information" },
   { VIDEO_OGG, "ogv", "Ogg Video" },
   { VIDEO_OGG, "ogg", "Ogg Video" },
   { APPLICATION_OGG, "ogg", "Ogg Video"},
   { AUDIO_OGG, "oga", "Ogg Audio" },
   { AUDIO_OGG, "opus", "Opus Audio" },
 #ifdef MOZ_WIDGET_GONK
   { AUDIO_AMR, "amr", "Adaptive Multi-Rate Audio" },
 #endif