diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index e1f8775..647b5ba 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 11 18:25:12 CEST 2009 - wr@rosenauer.org + +- use non-localized Downloads folder (bnc#501724) + ------------------------------------------------------------------- Mon May 4 07:57:50 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 371fee6..ec3f00d 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -27,7 +27,7 @@ License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL Provides: web_browser Provides: firefox Version: 3.5b4 -Release: 1 +Release: 2 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -43,6 +43,7 @@ Source16: firefox.1 Source17: firefox-suse-default-prefs.js Patch1: firefox-libxul-sdk.patch Patch2: firefox-no-update.patch +Patch3: toolkit-download-folder.patch Patch14: credits.patch Patch17: firefox-appname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -136,6 +137,7 @@ Authors: cd $RPM_BUILD_DIR/mozilla %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch14 %patch17 @@ -339,7 +341,10 @@ fi %defattr(-,root,root) %{progdir}/browserconfig.properties %{progdir}/defaults/profile/bookmarks.html + %changelog +* Mon May 11 2009 wr@rosenauer.org +- use non-localized Downloads folder (bnc#501724) * Mon May 04 2009 wr@rosenauer.org - update to new major version 3.5b4 * based on Gecko 1.9.1 (mozilla-xulrunner191) diff --git a/firefox.schemas b/firefox.schemas deleted file mode 100644 index 5dc78b5..0000000 --- a/firefox.schemas +++ /dev/null @@ -1,289 +0,0 @@ - - - - /schemas/apps/firefox/lockdown/disable_history - /apps/firefox/lockdown/disable_history - firefox - bool - false - - Disable the browser history - Prevent the browser from keeping a history of visited sites - - - - /schemas/apps/firefox/lockdown/disable_toolbar_editing - /apps/firefox/lockdown/disable_toolbar_editing - firefox - bool - false - - Disable toolbar editing - Prevent the user from editing the toolbar - - - - /schemas/apps/firefox/lockdown/disable_themes - /apps/firefox/lockdown/disable_themes - firefox - bool - false - - Disable installing themes - To prevent the user from installing themes - - - - /schemas/apps/firefox/lockdown/disable_extensions - /apps/firefox/lockdown/disable_extensions - firefox - bool - false - - Disable installing extensions - Prevent the user from installing extensions - - - - /schemas/apps/firefox/web/disable_popups - /apps/firefox/web/disable_popups - firefox - bool - false - - Enable popup blocker - Enable popup blocker without warning about blocked popups - - - - /schemas/apps/firefox/web/java_enabled - /apps/firefox/web/java_enabled - firefox - bool - true - - Enable java - Enable java - - - - /schemas/apps/firefox/web/javascript_enabled - /apps/firefox/web/javascript_enabled - firefox - bool - true - - Enable javascript - Enable javascript - - - - /schemas/apps/firefox/lockdown/disable_url_bar - /apps/firefox/lockdown/disable_url_bar - firefox - bool - false - - Disable location bar - Prevent the user from entering URLs in the location bar - - - - /schemas/apps/firefox/lockdown/disable_searchbar - /apps/firefox/lockdown/disable_searchbar - firefox - bool - false - - Disable search bar - Prevent the user from using the search bar - - - - /schemas/apps/firefox/web/disable_cookies - /apps/firefox/web/disable_cookies - firefox - bool - false - - Disable cookies - Prevent the browser from storing cookies - - - - /schemas/apps/firefox/web/disable_save_password - /apps/firefox/web/disable_save_password - firefox - bool - false - - Disable saved passwords - Prevent the browser from storing saved passwords - - - - /schemas/apps/firefox/web/cache_size - /apps/firefox/web/cache_size - firefox - int - 50000 - - Disk cache size in KB - Disk cache size in KB - - - - /schemas/apps/firefox/general/homepage_url - /apps/firefox/general/homepage_url - firefox - string - www.novell.com/linux - - Home Page URL - Home Page URL - - - - /schemas/apps/firefox/web/download_defaultfolder - /apps/firefox/web/download_defaultfolder - firefox - string - Desktop - - Default download location - Default download location. Possible values include: "Desktop", "My Downloads", and "Home" - - - - /schemas/apps/firefox/lockdown/disable_unsafe_protocol - /apps/firefox/lockdown/disable_unsafe_protocol - firefox - bool - false - - Disable unsafe protocols - Disable non-builtin protocols not explicitly enabled - - - - /schemas/apps/firefox/lockdown/disable_bookmark_editing - /apps/firefox/lockdown/disable_bookmark_editing - firefox - bool - false - - Disable editing bookmarks - Prevent the user from editing browser bookmarks - - - - /schemas/apps/firefox/lockdown/hide_bookmark - /apps/firefox/lockdown/hide_bookmark - firefox - bool - false - - Disable bookmarks feature - Prevent the user from editing or viewing bookmarks - - - - /schemas/apps/firefox/lockdown/disable_show_passwords - /apps/firefox/lockdown/disable_show_passwords - firefox - bool - false - - Disable display of stored web passwords - Disable plain text display of stored web passwords in Preferences dialog - - - - /schemas/apps/firefox/lockdown/disable_javascript_chrome - /apps/firefox/lockdown/disable_javascript_chrome - firefox - bool - false - - Prevent javascript windows from hiding chrome - Prevent windows opened by javascript from hiding window chrome (location bar, status bar, etc.) - - - - /schemas/apps/firefox/web/cookie_accept - /apps/firefox/web/cookie_accept - firefox - int - 0 - - Cookie Lifetime Policy - Cookie Lifetime Policy: 0 = Accept cookies normally; 1 = Prompt for each cookie; 2 = Accept for current session only; 3 = Accept for N days - - - - /schemas/apps/firefox/web/images_load - /apps/firefox/web/images_load - firefox - int - 0 - - Image loading policy - Image loading policy: 0 = load all images; 1 = exclude third-party image loading; 2 = exclude all image loading - - - - /schemas/apps/firefox/lockdown/additional_safe_protocols - /apps/firefox/lockdown/additional_safe_protocols - firefox - string - - - Additional Safe Protocols - Additional Safe Protocols - - - - /schemas/apps/firefox/general/trusted_URIs - /apps/firefox/general/trusted_URIs - firefox - list - string - [] - - List of URIs for which Kerberos/NTLM is enabled - A comma-separated list of URI keys, of the form - [scheme "://"] [host [":" port]], for which login should be allowed - via SPNEGO Kerberos or NTLM authentication. - - - - - /schemas/apps/firefox/general/delegated_URIs - /apps/firefox/general/delegated_URIs - firefox - list - string - [] - - List of URIs for which Kerberos/NTLM delegation is enabled - A comma-separated list of URI keys, of the form - [scheme "://"] [host [":" port]], for which delegation should be allowed - using SPNEGO Kerberos or NTLM authentication. - - - - - /schemas/apps/firefox/general/allowed_indirect_gnomevfs_loads - /apps/firefox/general/allowed_indirect_gnomevfs_loads - firefox - string - "" - - A list of protocols, handled by gnome-vfs, that are permitted - A comma-separated list of protocols, handled by - gnome-vfs and of the form [scheme "://"], whose loads are - allowed. - - - - diff --git a/toolkit-download-folder.patch b/toolkit-download-folder.patch new file mode 100644 index 0000000..f27350f --- /dev/null +++ b/toolkit-download-folder.patch @@ -0,0 +1,33 @@ +From: Wolfgang Rosenauer +Subject: Don't use localized Downloads unless XDG is set up +References: +https://bugzilla.novell.com/show_bug.cgi?id=501724 + +diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js +--- a/browser/components/preferences/main.js ++++ b/browser/components/preferences/main.js +@@ -344,7 +344,7 @@ var gMainPane = { + // With 3.0, a new desktop folder - 'Downloads' was introduced for + // platforms and versions that don't support a default system downloads + // folder. See nsDownloadManager for details. +- downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); ++ downloadFolder.label = "Downloads"; + iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); + } else { + // 'Desktop' +diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp +--- a/toolkit/components/downloads/src/nsDownloadManager.cpp ++++ b/toolkit/components/downloads/src/nsDownloadManager.cpp +@@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi + // XDG user dir spec, with a fallback to Home/Downloads + + nsXPIDLString folderName; +- mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), +- getter_Copies(folderName)); ++ // We don't want localized "Downloads" unless XDG is used ++ //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), ++ // getter_Copies(folderName)); ++ folderName.AssignLiteral("Downloads"); + + #if defined (XP_MACOSX) + rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR,