Bug 300856 - Cannot set default download directory to home on Linux/Unix, r=mconnor

browser/components/preferences/downloads.js

@@ -94,19 +94,21 @@ var gDownloadsPane = {
   
   _getSpecialFolderKey: function (aFolderType)
   {
+    if (aFolderType == "Desktop")
+      return "Desk";
+
+    if (aFolderType != "Downloads")
+      throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
+
 #ifdef XP_WIN
-    return aFolderType == "Desktop" ? "DeskP" : "Pers";
-#endif
+    return "Pers";
+#else
 #ifdef XP_MACOSX
-    return aFolderType == "Desktop" ? "UsrDsk" : "UsrDocs";
-#endif
-#ifdef XP_OS2
-    return aFolderType == "Desktop" ? "Desk" : "Home";
-#endif
-#ifdef XP_BEOS
-    return aFolderType == "Desktop" ? "Desk" : "Home";
-#endif
+    return "UsrDocs";
+#else
     return "Home";
+#endif
+#endif
   },
 
   _getDownloadsFolder: function (aFolder)

mail/components/preferences/downloads.js

@@ -94,16 +94,21 @@ var gDownloadsPane = {
   
   _getSpecialFolderKey: function (aFolderType)
   {
+    if (aFolderType == "Desktop")
+      return "Desk";
+
+    if (aFolderType != "Downloads")
+      throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
+
 #ifdef XP_WIN
-    return aFolderType == "Desktop" ? "DeskP" : "Pers";
-#endif
+    return "Pers";
+#else
 #ifdef XP_MACOSX
-    return aFolderType == "Desktop" ? "UsrDsk" : "UsrDocs";
-#endif
-#ifdef XP_OS2
-    return aFolderType == "Desktop" ? "Desk" : "Home";
-#endif
+    return "UsrDocs";
+#else
     return "Home";
+#endif
+#endif
   },
 
   _getDownloadsFolder: function (aFolder)

toolkit/mozapps/downloads/content/downloads.js

@@ -778,19 +778,21 @@ function initAutoDownloadDisplay()
 
     function getSpecialFolderKey(aFolderType) 
     {
+    if (aFolderType == "Desktop")
+      return "Desk";
+
+    if (aFolderType != "Downloads")
+      throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
+
 #ifdef XP_WIN
-      return aFolderType == "Desktop" ? "DeskP" : "Pers";
-#endif
+    return "Pers";
+#else
 #ifdef XP_MACOSX
-      return aFolderType == "Desktop" ? "UsrDsk" : "UsrDocs";
+    return "UsrDocs";
+#else
+    return "Home";
 #endif
-#ifdef XP_OS2
-      return aFolderType == "Desktop" ? "Desk" : "Home";
 #endif
-#ifdef XP_BEOS
-      return aFolderType == "Desktop" ? "Desk" : "Home";
-#endif
-      return "Home";
     }
     
     function getDownloadsFolder(aFolder)