4 https://bugzilla.novell.com/show_bug.cgi?id=501724 |
4 https://bugzilla.novell.com/show_bug.cgi?id=501724 |
5 |
5 |
6 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
6 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
7 --- a/browser/components/preferences/main.js |
7 --- a/browser/components/preferences/main.js |
8 +++ b/browser/components/preferences/main.js |
8 +++ b/browser/components/preferences/main.js |
9 @@ -290,17 +290,17 @@ var gMainPane = { |
9 @@ -408,17 +408,17 @@ var gMainPane = { |
10 // and was available as an option in the 1.5 drop down. On XP this |
10 // and was available as an option in the 1.5 drop down. On XP this |
11 // was in My Documents, on OSX it was in User Docs. In 2.0, we did |
11 // was in My Documents, on OSX it was in User Docs. In 2.0, we did |
12 // away with the drop down option, although the special label was |
12 // away with the drop down option, although the special label was |
13 // still supported for the folder if it existed. Because it was |
13 // still supported for the folder if it existed. Because it was |
14 // not exposed it was rarely used. |
14 // not exposed it was rarely used. |
15 // With 3.0, a new desktop folder - 'Downloads' was introduced for |
15 // With 3.0, a new desktop folder - 'Downloads' was introduced for |
16 // platforms and versions that don't support a default system downloads |
16 // platforms and versions that don't support a default system downloads |
17 // folder. See nsDownloadManager for details. |
17 // folder. See nsDownloadManager for details. |
18 - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); |
18 - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); |
19 + downloadFolder.label = "Downloads"; |
19 + downloadFolder.label = "Downloads"; |
20 iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); |
20 iconUrlSpec = fph.getURLSpecFromFile(yield this._indexToFolder(1)); |
21 } else { |
21 } else { |
22 // 'Desktop' |
22 // 'Desktop' |
23 downloadFolder.label = bundlePreferences.getString("desktopFolderName"); |
23 downloadFolder.label = bundlePreferences.getString("desktopFolderName"); |
24 iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop")); |
24 iconUrlSpec = fph.getURLSpecFromFile(yield this._getDownloadsFolder("Desktop")); |
25 } |
25 } |
26 downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16"; |
26 downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16"; |
27 |
27 }), |
28 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
28 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
29 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
29 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
30 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
30 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
31 @@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi |
31 @@ -1361,18 +1361,20 @@ nsDownloadManager::GetDefaultDownloadsDi |
32 // Vista: |
32 // Vista: |
33 // Downloads |
33 // Downloads |
34 // XP/2K: |
34 // XP/2K: |
35 // My Documents/Downloads |
35 // My Documents/Downloads |
36 // Linux: |
36 // Linux: |