Hello community, here is the log from the commit of package MozillaFirefox checked in at Fri Nov 21 15:35:55 CET 2008. -------- --- MozillaFirefox/MozillaFirefox.changes 2008-11-13 01:04:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2008-11-21 01:50:28.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Nov 20 18:49:19 CST 2008 - maw@suse.de + +- Review and approve changes. + +------------------------------------------------------------------- +Thu Nov 13 08:22:13 CET 2008 - wr@rosenauer.org + +- lockdown cleanup + * removed gecko-lockdown.patch from Firefox (it's in xulrunner) + * stripped out some toolkit stuff from firefox-ui-lockdown + * added extra default preferences for lockdown + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gecko-lockdown.patch New: ---- firefox-lockdown.js ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.K12687/_old 2008-11-21 15:34:57.000000000 +0100 +++ /var/tmp/diff_new_pack.K12687/_new 2008-11-21 15:34:57.000000000 +0100 @@ -27,7 +27,7 @@ Provides: web_browser Provides: firefox Version: 3.0.4 -Release: 1 +Release: 2 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -36,6 +36,7 @@ Source2: %{name}-rpmlintrc Source3: mozilla.sh.in Source4: find-external-requires.sh +Source5: firefox-lockdown.js Source7: l10n-%{version}.tar.bz2 Source8: firefox-mimeinfo.xml Source11: firefox48.png @@ -47,8 +48,6 @@ Patch17: firefox-appname.patch # PATCH-FEATURE-SLED firefox-ui-lockdown.patch FATE#302023, FATE#302024 - hfiguiere@novell.com Patch20: firefox-ui-lockdown.patch -# PATCH-FEATURE-SLED gecko-lockdown.patch FATE#302023, FATE#302024 - hfiguiere@novell.com -Patch21: gecko-lockdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils /bin/sh gconf2 shared-mime-info desktop-file-utils Requires: mozilla-xulrunner190 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190) @@ -142,7 +141,6 @@ %patch14 %patch17 %patch20 -p2 -%patch21 -p2 %build export MOZ_BUILD_DATE=%{releasedate} @@ -227,6 +225,7 @@ %{SOURCE17} > suse-default-prefs cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/firefox-build.js rm suse-default-prefs +cp %{SOURCE5} $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/ # use correct locale for useragent cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); @@ -340,6 +339,13 @@ %{progdir}/defaults/profile/bookmarks.html %changelog +* Thu Nov 20 2008 maw@suse.de +- Review and approve changes. +* Thu Nov 13 2008 wr@rosenauer.org +- lockdown cleanup + * removed gecko-lockdown.patch from Firefox (it's in xulrunner) + * stripped out some toolkit stuff from firefox-ui-lockdown + * added extra default preferences for lockdown * Wed Nov 12 2008 maw@suse.de - Review and approve changes. * Tue Nov 11 2008 wr@rosenauer.org ++++++ firefox-lockdown.js ++++++ // UI lockdown settings pref("config.lockdown.printing", false); pref("config.lockdown.printsetup", false); pref("config.lockdown.savepage", false); pref("config.lockdown.history", false); pref("config.lockdown.toolbarediting", false); pref("config.lockdown.urlbar", false); pref("config.lockdown.bookmark", false); pref("config.lockdown.searchbar", false); pref("config.lockdown.hidebookmark", false); pref("config.lockdown.setwallpaper", false); pref("config.lockdown.showsavedpasswords", false); pref("config.lockdown.disable_themes", false); pref("config.lockdown.disable_extensions", false); ++++++ firefox-ui-lockdown.patch ++++++ --- /var/tmp/diff_new_pack.K12687/_old 2008-11-21 15:35:00.000000000 +0100 +++ /var/tmp/diff_new_pack.K12687/_new 2008-11-21 15:35:00.000000000 +0100 @@ -259,65 +259,3 @@ this._command.removeAttribute("disabled"); else this._command.setAttribute("disabled", "true"); -diff --git a/mozilla/modules/libpref/src/init/all.js b/mozilla/modules/libpref/src/init/all.js -index cd27953..f460ccf 100644 ---- a/mozilla/modules/libpref/src/init/all.js -+++ b/mozilla/modules/libpref/src/init/all.js -@@ -1072,6 +1072,21 @@ pref("config.use_system_prefs", false); - // if the system has enabled accessibility - pref("config.use_system_prefs.accessibility", false); - -+// UI lockdown settings -+pref("config.lockdown.printing", false); -+pref("config.lockdown.printsetup", false); -+pref("config.lockdown.savepage", false); -+pref("config.lockdown.history",false); -+pref("config.lockdown.toolbarediting",false); -+pref("config.lockdown.urlbar",false); -+pref("config.lockdown.bookmark",false); -+pref("config.lockdown.disable_themes",false); -+pref("config.lockdown.disable_extensions",false); -+pref("config.lockdown.searchbar",false); -+pref("config.lockdown.hidebookmark",false); -+pref("config.lockdown.setwallpaper",false); -+pref("config.lockdown.showsavedpasswords", false); -+ - /* - * What are the entities that you want Mozilla to save using mnemonic - * names rather than numeric codes? E.g. If set, we'll output -diff --git a/mozilla/toolkit/components/printing/content/printdialog.js b/mozilla/toolkit/components/printing/content/printdialog.js -index 3e674af..50e99c0 100644 ---- a/mozilla/toolkit/components/printing/content/printdialog.js -+++ b/mozilla/toolkit/components/printing/content/printdialog.js -@@ -50,6 +50,7 @@ var gPrintSettings = null; - var gWebBrowserPrint = null; - var gPrintSetInterface = Components.interfaces.nsIPrintSettings; - var doDebug = false; -+var gPrefService = null; - - //--------------------------------------------------- - function initDialog() -@@ -87,11 +88,23 @@ function initDialog() - dialog.fpDialog = document.getElementById("fpDialog"); - - dialog.enabled = false; -+ -+ gPrefService = Components.classes["@mozilla.org/preferences-service;1"] -+ .getService(Components.interfaces.nsIPrefService).getBranch(null); -+ if (gPrefService.getBoolPref("config.lockdown.savepage")) { -+ dialog.fileCheck.setAttribute("disabled", "true"); -+ } -+ if (gPrefService.getBoolPref("config.lockdown.printing")) { -+ dialog.printButton.setAttribute("disabled", "true"); -+ } - } - - //--------------------------------------------------- - function checkInteger(element) - { -+ if (gPrefService.getBoolPref("config.lockdown.printing")) -+ return; -+ - var value = element.value; - if (value && value.length > 0) { - value = value.replace(/[^0-9]/g,""); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org