bring across trunk changs (EM, etc)

git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@156441 18797224-902f-48f8-a5cc-f745e15eee43
2004-05-16 18:16:49 +00:00
parent cc4b2908b0
commit 3e8b78d4b9
69 changed files with 4633 additions and 1069 deletions
--- a/mozilla/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/mozilla/browser/components/shell/src/nsWindowsShellService.cpp
@@ -152,6 +152,12 @@ typedef struct {
  PREFIX MID SUFFIX

 static SETTING gSettings[] = {
+  // Extension Manager Keys
+  { MAKE_KEY_NAME1(CLS, "MIME\\Database\\Content Type\\application/x-xpinstall;app=firefox"),
+    "Extension",
+    ".xpi",
+    NO_SUBSTITUTION | NON_ESSENTIAL },
+
  // File Extension Aliases
  { MAKE_KEY_NAME1(CLS, ".htm"),    "", CLS_HTML, NO_SUBSTITUTION | NON_ESSENTIAL },
  { MAKE_KEY_NAME1(CLS, ".html"),   "", CLS_HTML, NO_SUBSTITUTION | NON_ESSENTIAL },