rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

Accepting request 28267 from mozilla:Factory

Browse Source 
Copy from mozilla:Factory/MozillaFirefox based on submit request 28267 from user wrosenauer

OBS-URL: https://build.opensuse.org/request/show/28267
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=77
This commit is contained in:
OBS User autobuild 2010-01-08 00:32:43 +00:00 committed by Git OBS Bridge
commit 7a849132f5
20 changed files with 1016 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MozillaFirefox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 6 17:15:40 CET 2010 - wr@rosenauer.org
- major update to 3.6rc1
-------------------------------------------------------------------
Fri Dec 25 09:39:42 CET 2009 - wr@rosenauer.org

119
MozillaFirefox.spec
View File

@ -1,8 +1,8 @@
#
# spec file for package MozillaFirefox (Version 3.5.7)
# spec file for package MozillaFirefox (Version 3.6rc1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2006-2009 Wolfgang Rosenauer
# 2006-2010 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,16 +20,23 @@
Name: MozillaFirefox
BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel orbit-devel python unzip update-desktop-files zip
BuildRequires: mozilla-xulrunner191-devel = 1.9.1.7
%define xulrunner mozilla-xulrunner192
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel orbit-devel python unzip update-desktop-files zip
BuildRequires: %{xulrunner}-devel = 1.9.2rc1
%if %suse_version > 1020
BuildRequires: fdupes
%endif
%if %suse_version > 1110
BuildRequires: libiw-devel
%else
BuildRequires: wireless-tools
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Provides: web_browser
Provides: firefox
Version: 3.5.7
Version: 3.6rc1
Release: 1
%define releasedate 2010010500
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@ -38,7 +45,6 @@ Source1: MozillaFirefox.desktop
Source2: %{name}-rpmlintrc
Source3: mozilla.sh.in
Source4: find-external-requires.sh
# this needs to be shipped when lockdown changes are back
Source5: firefox.schemas
Source6: kde.js
Source7: l10n-%{version}.tar.bz2
@ -47,36 +53,37 @@ Source9: firefox-lockdown.js
Source16: firefox.1
Source17: firefox-suse-default-prefs.js
Patch1: firefox-libxul-sdk.patch
Patch2: firefox-no-update.patch
Patch2: firefox-credits.patch
Patch3: toolkit-download-folder.patch
Patch4: mozilla-linkorder.patch
Patch5: firefox-ui-lockdown.patch
Patch4: firefox-linkorder.patch
Patch5: firefox-browser-css.patch
Patch6: firefox-cross-desktop.patch
Patch7: firefox-kde.patch
Patch8: firefox-no-gnomevfs.patch
Patch9: firefox-browser-css.patch
Patch10: mozilla-abi.patch
Patch14: credits.patch
Patch17: firefox-appname.patch
Patch7: firefox-no-gnomevfs.patch
Patch8: firefox-appname.patch
Patch9: firefox-kde.patch
Patch10: firefox-ui-lockdown.patch
Patch11: firefox-crashreporter.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: coreutils /bin/sh gconf2 shared-mime-info desktop-file-utils
Requires: mozilla-xulrunner191 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner191)
%requires_eq mozilla-xulrunner191
Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
Requires: %{xulrunner} >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner})
%requires_eq %{xulrunner}
%ifarch %ix86
Requires: mozilla-xulrunner191-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner191)
Requires: mozilla-xulrunner191-32bit = %(rpm -q --queryformat '%{VERSION}' mozilla-xulrunner191)
Requires: %{xulrunner}-32bit >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner})
Requires: %{xulrunner}-32bit = %(rpm -q --queryformat '%{VERSION}' %{xulrunner})
%endif
Requires: %{name}-branding = 3.5
%define _unpackaged_files_terminate_build 0
Requires: %{name}-branding >= 3.5
%define _use_internal_dependency_generator 0
%define __find_requires sh %{SOURCE4}
%global provfind sh -c "grep -v '.so' | %__find_provides"
%global __find_provides %provfind
%define releasedate 2009122200
%define progname firefox
%define progdir %{_prefix}/%_lib/%{progname}
%if %suse_version > 1020
%define gnome_dir %{_prefix}
%define gconf_confdir %{_sysconfdir}/gconf
%else
%define gnome_dir /opt/gnome
%endif
### build options
%define branding 1
%define localize 1
@ -95,8 +102,8 @@ Summary: Common translations for MozillaFirefox
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
Group: System/Localization
PreReq: %{name} = %{version}
Requires: mozilla-xulrunner191-translations-common
Requires: %{name} = %{version}
Requires: %{xulrunner}-translations-common
Obsoletes: %{name}-translations < %{version}-%{release}
%description translations-common
@ -106,10 +113,10 @@ of MozillaFirefox.
%package translations-other
Summary: Extra translations for MozillaFirefox
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mn;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
Group: System/Localization
PreReq: %{name} = %{version}
Requires: mozilla-xulrunner191-translations-other
Requires: %{name} = %{version}
Requires: %{xulrunner}-translations-other
Obsoletes: %{name}-translations < %{version}-%{release}
%description translations-other
@ -125,9 +132,6 @@ Group: Productivity/Networking/Web/Browsers
Provides: %{name}-branding = 3.5
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream)
%if %suse_version > 1020
%gconf_schemas_prereq
%endif
#BRAND: Provide three files -
#BRAND: /usr/lib/firefox/browserconfig.properties that contains the
#BRAND: default homepage and some other default configuration options
@ -153,18 +157,15 @@ cd $RPM_BUILD_DIR/mozilla
%patch4 -p1
%patch5 -p1
%patch6 -p1
%if %suse_version >= 1110
# copy current files and patch them later to keep them in sync
cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
%patch7 -p1
%patch8 -p1
%if %suse_version >= 1110
%patch9 -p1
# install kde.js
install -m 644 %{SOURCE6} browser/app/profile/kde.js
%endif
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch14 -p1
%patch17 -p1
%patch11 -p1
%build
export MOZ_BUILD_DATE=%{releasedate}
@ -198,9 +199,9 @@ ac_add_options --with-system-jpeg
#ac_add_options --with-system-png # doesn't work because of missing APNG support
ac_add_options --with-system-zlib
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-crashreporter
EOF
%if %branding
cat << EOF >> $MOZCONFIG
@ -271,31 +272,23 @@ EOF
# ADDONS
#
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
%if %branding
ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png
ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png
%if %branding
for size in 16 32 48; do
mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/
ln -sf %{progdir}/chrome/icons/default/default$size.png \
$RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png
done
%else
cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm
%endif
%suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK
# SCHEMA file
mkdir -p $RPM_BUILD_ROOT%{gconf_confdir}/schemas
install -m 644 %{SOURCE5} \
$RPM_BUILD_ROOT%{gconf_confdir}/schemas/
%if %suse_version > 1020
%find_gconf_schemas
%endif
# excludes
rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini
rm -f $RPM_BUILD_ROOT%{progdir}/removed-files
rm -f $RPM_BUILD_ROOT%{progdir}/README.txt
rm -f $RPM_BUILD_ROOT%{progdir}/old-homepage-default.properties
rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh
rm -f $RPM_BUILD_ROOT%{progdir}/LICENSE
# fdupes
%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT%{progdir}
@ -307,14 +300,6 @@ rm -rf $RPM_BUILD_ROOT
%if %localize
rm -rf %{_tmppath}/translations.*
%endif
%if %suse_version > 1020
%pre branding-upstream -f %{name}.schemas_pre
%preun branding-upstream -f %{name}.schemas_preun
%posttrans branding-upstream -f %{name}.schemas_posttrans
%endif
%post
# update mime and desktop database
@ -354,7 +339,7 @@ if [ -f opt/gnome/bin/update-mime-database ] ; then
fi
%endif
%files
%files
%defattr(-,root,root)
%dir %{progdir}
%dir %{progdir}/chrome/
@ -374,6 +359,9 @@ fi
%{progdir}/%{progname}
%{progdir}/application.ini
%{progdir}/blocklist.xml
%ifarch %ix86
%{progdir}/crashreporter-override.ini
%endif
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/%{progname}.xml
%{_datadir}/pixmaps/firefox*
@ -386,18 +374,19 @@ fi
%files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root)
%dir %{progdir}
%dir %{progdir}/chrome/
%files translations-other -f %{_tmppath}/translations.other
%defattr(-,root,root)
%dir %{progdir}
%dir %{progdir}/chrome/
%endif
%if %suse_version > 1020
%files branding-upstream -f %{name}.schemas_list
%else
%files branding-upstream
%endif
%files branding-upstream
%defattr(-,root,root)
%dir %{progdir}
%dir %{progdir}/defaults/
%{progdir}/browserconfig.properties
%{progdir}/defaults/profile/bookmarks.html

3
firefox-3.5.7-source.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06d5d60fd87e5df49217a83a01409394570b9a743a9394172a33a1294c5f6570
size 46585379

3
firefox-3.6rc1-source.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:789105d5e1eab90e529dd16bc646a11f17faf4bb64da8ef6f2c0e05898f5d3d9
size 47878768

5
firefox-appname.patch
View File

@ -1,7 +1,10 @@
From: Wolfgang Rosenauer <wr@rosenauer.org>
Subject: Hardcode app starter for default check
diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
--- a/browser/components/shell/src/nsGNOMEShellService.cpp
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -129,17 +129,21 @@ nsGNOMEShellService::Init()
@@ -127,17 +127,21 @@ nsGNOMEShellService::Init()
nsCOMPtr<nsILocalFile> appPath;
rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile),
getter_AddRefs(appPath));

22
firefox-browser-css.patch
View File

@ -9,13 +9,13 @@ https://bugzilla.novell.com/show_bug.cgi?id=561027
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -837,16 +837,30 @@ toolbar[iconsize="small"] #paste-button[
#PopupAutoComplete[chromedir="rtl"] > tree > treerows {
direction: rtl;
@@ -788,16 +788,30 @@ toolbar[iconsize="small"] #fullscreen-bu
display: none;
}
#PopupAutoComplete .autocomplete-treebody {
direction: ltr;
#PopupAutoComplete,
#PopupAutoCompleteRichResult {
direction: ltr !important;
}
+#PopupAutoCompleteRichResult .autocomplete-richlistitem {
@ -32,11 +32,11 @@ diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gno
+ color: -moz-Fieldtext !important;
+}
+
/* Favicon */
#page-proxy-favicon,
#urlbar-throbber {
width: 16px;
height: 16px;
#PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
direction: rtl;
}
#PopupAutoComplete .autocomplete-treebody {
direction: ltr;
}
#page-proxy-stack {

49
firefox-crashreporter.patch Normal file
View File

@ -0,0 +1,49 @@
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -223,22 +223,16 @@ endif
ifdef DEBUG
RCFLAGS += -DDEBUG
endif
RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\"
endif
include $(topsrcdir)/config/rules.mk
-DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
-
-ifdef MOZILLA_OFFICIAL
-DEFINES += -DMOZILLA_OFFICIAL
-endif
-
ifdef BUILD_STATIC_LIBS
include $(topsrcdir)/config/static-rules.mk
DEFINES += -DIMPL_XREAPI
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
LIBS += -lphexlib
@@ -277,16 +271,22 @@ install:: $(MOZ_APP_NAME)
GARBAGE += $(MOZ_APP_NAME)
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
endif
endif # LIBXUL_SDK
+ifdef MOZILLA_OFFICIAL
+DEFINES += -DMOZILLA_OFFICIAL
+endif
+
+DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
+
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
endif

0
credits.patch → firefox-credits.patch
View File

43
firefox-cross-desktop.patch
View File

@ -24,3 +24,46 @@ diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsCont
haveSetDesktopBackground && this.onLoadedImage);
if (haveSetDesktopBackground && this.onLoadedImage) {
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
@@ -594,20 +594,38 @@ var gAdvancedPane = {
var brandShortName = brandBundle.getString("brandShortName");
var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
var promptMessage;
const IPS = Components.interfaces.nsIPromptService;
var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(IPS);
+
+ var env = Components.classes["@mozilla.org/process/environment;1"]
+ .getService(Components.interfaces.nsIEnvironment);
+ var kde_session = 0;
+ if (env.get('KDE_FULL_SESSION') == "true")
+ kde_session = 1;
+
if (!shellSvc.isDefaultBrowser(false)) {
promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage",
[brandShortName]);
var rv = psvc.confirmEx(window, promptTitle, promptMessage,
IPS.STD_YES_NO_BUTTONS,
null, null, null, null, { });
- if (rv == 0)
+ if (rv == 0) {
shellSvc.setDefaultBrowser(true, false);
+ if (kde_session == 1) {
+ var shellObj = Components.classes["@mozilla.org/file/local;1"]
+ .createInstance(Components.interfaces.nsILocalFile);
+ shellObj.initWithPath("/usr/bin/kwriteconfig");
+ var process = Components.classes["@mozilla.org/process/util;1"]
+ .createInstance(Components.interfaces.nsIProcess);
+ process.init(shellObj);
+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"];
+ process.run(false, args, args.length);
+ }
+ }
}
else {
promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
[brandShortName]);
psvc.alert(window, promptTitle, promptMessage);
}

808
firefox-kde.patch
View File

@ -1,28 +1,203 @@
--- mozilla/browser/app/Makefile.in.sav 2009-10-01 22:03:56.000000000 +0200
+++ mozilla/browser/app/Makefile.in 2009-10-01 22:04:57.000000000 +0200
@@ -49,6 +49,7 @@ DIRS = profile/extensions
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -44,16 +44,17 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = profile/extensions
PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
$(srcdir)/profile/channel-prefs.js \
+ $(srcdir)/profile/kde.js \
$(NULL)
ifndef MOZ_BRANDING_DIRECTORY
--- mozilla/browser/base/content/browser-kde.xul.sav 2009-07-31 08:29:32.000000000 +0200
+++ mozilla/browser/base/content/browser-kde.xul 2009-10-01 22:34:03.000000000 +0200
@@ -157,7 +157,7 @@
<button id="editBookmarkPanelDeleteButton"
label="&editBookmark.cancel.label;"
oncommand="StarUI.cancelButtonOnCommand();"/>
-#else
# hardcode en-US for the moment
AB_CD = en-US
DEFINES += -DAB_CD=$(AB_CD)
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,643 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Blake Ross <blake@cs.stanford.edu>
+# David Hyatt <hyatt@mozilla.org>
+# Joe Hewitt <hewitt@netscape.com>
+# Pierre Chanial <chanial@noos.fr>
+# Dean Tessman <dean_tessman@hotmail.com>
+# Johnathan Nightingale <johnath@mozilla.com>
+# Dão Gottwald <dao@mozilla.com>
+# Ehsan Akhgari <ehsan.akhgari@gmail.com>
+# Robert Strong <robert.bugzilla@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
+<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
+<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
+
+# All DTD information is stored in a separate file so that it can be shared by
+# hiddenWindow.xul.
+#include browser-doctype.inc
+
+<window id="main-window"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();"
+ title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
+ title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
+#ifdef XP_MACOSX
+ title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
+ titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
+ titlemodifier=""
+ titlemodifier_normal=""
+ titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
+#else
+ title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
+ titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
+ titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
+ titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
+#endif
+ titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
+ lightweightthemes="true"
+ lightweightthemesfooter="browser-bottombox"
+ windowtype="navigator:browser"
+ screenX="4" screenY="4"
+ browsingmode="normal"
+ toggletoolbar="true"
+ persist="screenX screenY width height sizemode">
+
+# All JS files which are not content (only) dependent that browser.xul
+# wishes to include *must* go into the global-scripts.inc file
+# so that they can be shared by macBrowserOverlay.xul.
+#include global-scripts.inc
+<script type="application/x-javascript" src="chrome://browser/content/nsContextMenu.js"/>
+
+#ifdef MOZ_SAFE_BROWSING
+<script type="application/x-javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/>
+#endif
+<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
+
+<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
+
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
+# browser-sets.inc file for sharing with hiddenWindow.xul.
+#include browser-sets.inc
+
+ <popupset id="mainPopupSet">
+ <menupopup id="backForwardMenu"
+ onpopupshowing="return FillHistoryMenu(event.target);"
+ oncommand="gotoHistoryIndex(event);"
+ onclick="checkForMiddleClick(this, event);"/>
+ <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
+
+ <!-- for search and content formfill/pw manager -->
+ <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
+
+ <!-- for url bar autocomplete -->
+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
+
+ <panel id="editBookmarkPanel"
+ orient="vertical"
+ ignorekeys="true"
+ hidden="true"
+ onpopupshown="StarUI.panelShown(event);"
+ aria-labelledby="editBookmarkPanelTitle">
+ <row id="editBookmarkPanelHeader" align="center" hidden="true">
+ <vbox align="center">
+ <image id="editBookmarkPanelStarIcon"/>
+ </vbox>
+ <vbox>
+ <label id="editBookmarkPanelTitle"/>
+ <description id="editBookmarkPanelDescription"/>
+ <hbox>
+ <button id="editBookmarkPanelUndoRemoveButton"
+ class="editBookmarkPanelHeaderButton"
+ hidden="true"
+ oncommand="StarUI.undoRemoveBookmarkCommand();"
+ label="&editBookmark.undo.label;"
+ accesskey="&editBookmark.undo.accessKey;"/>
+ <button id="editBookmarkPanelRemoveButton"
+ class="editBookmarkPanelHeaderButton"
+ oncommand="StarUI.removeBookmarkButtonCommand();"
+ accesskey="&editBookmark.removeBookmark.accessKey;"/>
+ <button id="editBookmarkPanelEditButton"
+ class="editBookmarkPanelHeaderButton"
+ oncommand="StarUI.editButtonCommand();"
+ label="&editBookmark.edit.label;"
+ accesskey="&editBookmark.edit.accessKey;"/>
+ </hbox>
+ </vbox>
+ </row>
+ <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
+ <hbox id="editBookmarkPanelBottomButtons" pack="end">
+#ifndef XP_UNIX
+ <button id="editBookmarkPanelDoneButton"
+ class="editBookmarkPanelBottomButton"
+ label="&editBookmark.done.label;"
+ default="true"
+ oncommand="StarUI.panel.hidePopup();"/>
+ <button id="editBookmarkPanelDeleteButton"
+ class="editBookmarkPanelBottomButton"
+ label="&editBookmark.cancel.label;"
+ oncommand="StarUI.cancelButtonOnCommand();"/>
+#elif XP_UNIX_GNOME
<button id="editBookmarkPanelDeleteButton"
label="&editBookmark.cancel.label;"
oncommand="StarUI.cancelButtonOnCommand();"/>
@@ -165,6 +165,14 @@
label="&editBookmark.done.label;"
default="true"
oncommand="StarUI.panel.hidePopup();"/>
+ <button id="editBookmarkPanelDeleteButton"
+ class="editBookmarkPanelBottomButton"
+ label="&editBookmark.cancel.label;"
+ oncommand="StarUI.cancelButtonOnCommand();"/>
+ <button id="editBookmarkPanelDoneButton"
+ class="editBookmarkPanelBottomButton"
+ label="&editBookmark.done.label;"
+ default="true"
+ oncommand="StarUI.panel.hidePopup();"/>
+#else
+ <button id="editBookmarkPanelDoneButton"
+ label="&editBookmark.done.label;"
@ -31,12 +206,476 @@
+ <button id="editBookmarkPanelDeleteButton"
+ label="&editBookmark.cancel.label;"
+ oncommand="StarUI.cancelButtonOnCommand();"/>
#endif
</hbox>
</panel>
--- mozilla/browser/base/jar.mn.sav 2009-07-31 08:29:32.000000000 +0200
+++ mozilla/browser/base/jar.mn 2009-10-01 22:24:45.000000000 +0200
@@ -22,6 +22,8 @@ browser.jar:
+#endif
+ </hbox>
+ </panel>
+
+ <popup id="toolbar-context-menu"
+ onpopupshowing="onViewToolbarsPopupShowing(event);">
+ <menuseparator/>
+ <menuitem command="cmd_CustomizeToolbars"
+ label="&viewCustomizeToolbar.label;"
+ accesskey="&viewCustomizeToolbar.accesskey;"/>
+ </popup>
+
+ <popup id="blockedPopupOptions"
+ onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
+ <menuitem observes="blockedPopupAllowSite"/>
+ <menuitem observes="blockedPopupEditSettings"/>
+ <menuitem observes="blockedPopupDontShowMessage"/>
+ <menuseparator observes="blockedPopupsSeparator"/>
+ </popup>
+
+ <menupopup id="autohide-context"
+ onpopupshowing="FullScreen.getAutohide(this.firstChild);">
+ <menuitem type="checkbox" label="&fullScreenAutohide.label;"
+ accesskey="&fullScreenAutohide.accesskey;"
+ oncommand="FullScreen.setAutohide();"/>
+ <menuseparator/>
+ <menuitem label="&fullScreenExit.label;"
+ accesskey="&fullScreenExit.accesskey;"
+ oncommand="BrowserFullScreen();"/>
+ </menupopup>
+
+ <popup id="contentAreaContextMenu"
+ onpopupshowing="if (event.target != this) return true; updateEditUIVisibility(); gContextMenu = new nsContextMenu(this, window.getBrowser()); return gContextMenu.shouldDisplay;"
+ onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }">
+#include browser-context.inc
+ </popup>
+
+ <popup id="placesContext"/>
+
+ <!-- Popup for site identity information -->
+ <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true"
+ onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
+ level="top">
+ <hbox id="identity-popup-container" align="top">
+ <image id="identity-popup-icon"/>
+ <vbox id="identity-popup-content-box">
+ <label id="identity-popup-connectedToLabel"
+ class="identity-popup-label"
+ value="&identity.connectedTo;"/>
+ <label id="identity-popup-connectedToLabel2"
+ class="identity-popup-label"
+ value="&identity.unverifiedsite2;"/>
+ <description id="identity-popup-content-host"
+ class="identity-popup-description"/>
+ <label id="identity-popup-runByLabel"
+ class="identity-popup-label"
+ value="&identity.runBy;"/>
+ <description id="identity-popup-content-owner"
+ class="identity-popup-description"/>
+ <description id="identity-popup-content-supplemental"
+ class="identity-popup-description"/>
+ <description id="identity-popup-content-verifier"
+ class="identity-popup-description"/>
+ <hbox id="identity-popup-encryption" flex="1">
+ <vbox>
+ <image id="identity-popup-encryption-icon"/>
+ </vbox>
+ <description id="identity-popup-encryption-label" flex="1"
+ class="identity-popup-description"/>
+ </hbox>
+ <!-- Footer button to open security page info -->
+ <hbox pack="end">
+ <button id="identity-popup-more-info-button"
+ label="&identity.moreInfoLinkText;"
+ onblur="gIdentityHandler.hideIdentityPopup();"
+ oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
+ </hbox>
+ </vbox>
+ </hbox>
+ </panel>
+
+ <tooltip id="urlTooltip">
+ <label crop="center" flex="1" class="tooltip-label"/>
+ </tooltip>
+
+ <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
+ <hbox>
+ <button class="ctrlTab-preview" flex="1"/>
+ <button class="ctrlTab-preview" flex="1"/>
+ <button class="ctrlTab-preview" flex="1"/>
+ <button class="ctrlTab-preview" flex="1"/>
+ <button class="ctrlTab-preview" flex="1"/>
+ <button class="ctrlTab-preview" flex="1"/>
+ </hbox>
+ <hbox pack="center">
+ <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
+ </hbox>
+ </panel>
+
+ <panel id="allTabs-panel" hidden="true" norestorefocus="true" ignorekeys="true"
+# XXX: KUI style disabled, because the transparent background slows down
+# interacting with the panel, esp. the search field.
+# class="KUI-panel"
+ onmouseover="allTabs._updateTabCloseButton(event);">
+ <hbox id="allTabs-meta" align="center">
+ <spacer flex="1"/>
+ <textbox id="allTabs-filter"
+ tooltiptext="&allTabs.filter.emptyText;"
+ type="search"
+ oncommand="allTabs.filter();"/>
+ <spacer flex="1"/>
+ <toolbarbutton class="KUI-panel-closebutton"
+ oncommand="allTabs.close()"
+ tooltiptext="&closeCmd.label;"/>
+ </hbox>
+ <stack id="allTabs-stack">
+ <box id="allTabs-container"/>
+ <toolbarbutton id="allTabs-tab-close-button"
+ class="tab-close-button"
+ oncommand="allTabs.closeTab(event);"
+ tooltiptext="&closeCmd.label;"
+ style="visibility:hidden"/>
+ </stack>
+ </panel>
+ </popupset>
+
+ <!-- Bookmarks and history tooltip -->
+ <tooltip id="bhTooltip"/>
+
+ <toolbox id="navigator-toolbox" class="toolbox-top" mode="icons"
+#ifdef WINCE
+ defaulticonsize="small" iconsize="small"
+#endif
+ defaultmode="icons">
+ <!-- Menu -->
+ <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
+ defaultset="menubar-items"
+ mode="icons" iconsize="small" defaulticonsize="small"
+#ifdef XP_WIN
+ toolbarname="&menubarCmd.label;"
+ accesskey="&menubarCmd.accesskey;"
+#endif
+ context="toolbar-context-menu">
+ <toolbaritem id="menubar-items" align="center">
+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
+# hiddenWindow.xul.
+#include browser-menubar.inc
+ </toolbaritem>
+ </toolbar>
+
+ <toolbarpalette id="BrowserToolbarPalette">
+
+ <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
+ context="backForwardMenu">
+ <toolbarbutton id="back-button" class="toolbarbutton-1"
+ label="&backCmd.label;"
+ command="Browser:BackOrBackDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&backButton.tooltip;"/>
+ <toolbarbutton id="forward-button" class="toolbarbutton-1"
+ label="&forwardCmd.label;"
+ command="Browser:ForwardOrForwardDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&forwardButton.tooltip;"/>
+ <toolbarbutton id="back-forward-dropmarker" type="menu"
+ disabled="true" tooltiptext="&backForwardMenu.tooltip;"
+ onbroadcast="if (this.disabled) this.disabled =
+ document.getElementById('Browser:Back').hasAttribute('disabled') &amp;&amp;
+ document.getElementById('Browser:Forward').hasAttribute('disabled');">
+ <!-- bug 415444: event.stopPropagation is here for the cloned version of
+ this menupopup -->
+ <menupopup context=""
+ position="after_start"
+ onpopupshowing="return FillHistoryMenu(event.target);"
+ oncommand="gotoHistoryIndex(event); event.stopPropagation();"
+ onclick="checkForMiddleClick(this, event);"/>
+ <observes element="Browser:Back" attribute="disabled"/>
+ <observes element="Browser:Forward" attribute="disabled"/>
+ </toolbarbutton>
+ </toolbaritem>
+
+ <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&reloadCmd.label;"
+ command="Browser:ReloadOrDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&reloadButton.tooltip;"/>
+
+ <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&stopCmd.label;"
+ command="Browser:Stop"
+ tooltiptext="&stopButton.tooltip;"/>
+
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class"
+ label="&homeButton.label;"
+ ondragover="homeButtonObserver.onDragOver(event)"
+ ondragenter="homeButtonObserver.onDragOver(event)"
+ ondrop="homeButtonObserver.onDrop(event)"
+ ondragleave="homeButtonObserver.onDragLeave(event)"
+ onclick="BrowserGoHome(event);"/>
+
+ <toolbaritem id="urlbar-container" align="center" flex="400" persist="width"
+ title="&locationItem.title;" class="chromeclass-location">
+ <textbox id="urlbar" flex="1"
+ bookmarkhistoryemptytext="&urlbar.bookmarkhistory.emptyText;"
+ bookmarkemptytext="&urlbar.bookmark.emptyText;"
+ historyemptytext="&urlbar.history.emptyText;"
+ noneemptytext="&urlbar.none.emptyText;"
+ type="autocomplete"
+ autocompletesearch="history"
+ autocompletepopup="PopupAutoCompleteRichResult"
+ completeselectedindex="true"
+ tabscrolling="true"
+ showcommentcolumn="true"
+ showimagecolumn="true"
+ enablehistory="true"
+ maxrows="6"
+ newlines="stripsurroundingwhitespace"
+ oninput="gBrowser.userTypedValue = this.value;"
+ ontextentered="this.handleCommand(param);"
+ ontextreverted="return this.handleRevert();"
+ pageproxystate="invalid"
+ onsearchbegin="LocationBarHelpers._searchBegin();"
+ onsearchcomplete="LocationBarHelpers._searchComplete();"
+ onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
+ onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
+ <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag events.
+ We only add the identity-box button to the tab order when the location bar
+ has focus, otherwise pressing F6 focuses it instead of the location bar -->
+ <box id="identity-box" role="button"
+ onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
+ <hbox id="identity-box-inner" align="center">
+ <stack id="page-proxy-stack"
+ onclick="PageProxyClickHandler(event);">
+ <image id="urlbar-throbber" busy="false"/>
+ <image id="page-proxy-favicon" validate="never"
+ pageproxystate="invalid"
+ ondragstart="proxyIconDNDObserver.onDragStart(event);"
+ onerror="this.removeAttribute('src');"/>
+ </stack>
+ <label id="identity-icon-label" crop="center" flex="1"/>
+ </hbox>
+ </box>
+ <hbox id="urlbar-icons">
+ <button type="menu"
+ style="-moz-user-focus: none"
+ class="plain urlbar-icon"
+ id="feed-button"
+ collapsed="true"
+ tooltiptext="&feedButton.tooltip;"
+ onclick="return FeedHandler.onFeedButtonClick(event);">
+ <menupopup position="after_end"
+ id="feed-menu"
+ onpopupshowing="return FeedHandler.buildFeedList(this);"
+ oncommand="return FeedHandler.subscribeToFeed(null, event);"
+ onclick="checkForMiddleClick(this, event);"/>
+ </button>
+ <image id="star-button"
+ class="urlbar-icon"
+ onclick="PlacesStarButton.onClick(event);"/>
+ <image id="go-button"
+ class="urlbar-icon"
+ tooltiptext="&goEndCap.tooltip;"
+ onclick="gURLBar.handleCommand(event);"/>
+ </hbox>
+ </textbox>
+ </toolbaritem>
+
+ <toolbaritem id="search-container" title="&searchItem.title;"
+ align="center" class="chromeclass-toolbar-additional"
+ flex="100" persist="width">
+ <searchbar id="searchbar" flex="1"/>
+ </toolbaritem>
+
+ <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&printButton.label;" command="cmd_print"
+ tooltiptext="&printButton.tooltip;"/>
+
+ <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center"
+ mousethrough="always">
+ <image/>
+ </toolbaritem>
+
+ <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;">
+ <hbox id="bookmarksBarContent" flex="1"
+ type="places"
+ place="place:folder=TOOLBAR"
+ context="placesContext"
+ onclick="BookmarksEventHandler.onClick(event);"
+ oncommand="BookmarksEventHandler.onCommand(event);"
+ onpopupshowing="BookmarksEventHandler.onPopupShowing(event);"
+ tooltip="bhTooltip" popupsinherittooltip="true"/>
+ </toolbaritem>
+
+ <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ observes="Tools:Downloads"
+ ondrop="DownloadsButtonDNDObserver.onDrop(event)"
+ ondragover="DownloadsButtonDNDObserver.onDragOver(event)"
+ ondragenter="DownloadsButtonDNDObserver.onDragOver(event)"
+ ondragleave="DownloadsButtonDNDObserver.onDragLeave(event)"
+ label="&downloads.label;"
+ tooltiptext="&downloads.tooltip;"/>
+
+ <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ observes="viewHistorySidebar" label="&historyButton.label;"
+ tooltiptext="&historyButton.tooltip;"/>
+
+ <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ observes="viewBookmarksSidebar"
+ tooltiptext="&bookmarksButton.tooltip;"
+ ondrop="bookmarksButtonObserver.onDrop(event)"
+ ondragover="bookmarksButtonObserver.onDragOver(event)"
+ ondragenter="bookmarksButtonObserver.onDragOver(event)"
+ ondragleave="bookmarksButtonObserver.onDragLeave(event)"/>
+
+ <toolbarbutton id="new-tab-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&tabCmd.label;"
+ command="cmd_newNavigatorTab"
+ tooltiptext="&newTabButton.tooltip;"
+ ondrop="newTabButtonObserver.onDrop(event)"
+ ondragover="newTabButtonObserver.onDragOver(event)"
+ ondragenter="newTabButtonObserver.onDragOver(event)"
+ ondragleave="newTabButtonObserver.onDragLeave(event)"/>
+
+ <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&newNavigatorCmd.label;"
+ command="key_newNavigator"
+ tooltiptext="&newWindowButton.tooltip;"
+ ondrop="newWindowButtonObserver.onDrop(event)"
+ ondragover="newWindowButtonObserver.onDragOver(event)"
+ ondragenter="newWindowButtonObserver.onDragOver(event)"
+ ondragleave="newWindowButtonObserver.onDragLeave(event)"/>
+
+ <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&cutCmd.label;"
+ command="cmd_cut"
+ tooltiptext="&cutButton.tooltip;"/>
+
+ <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&copyCmd.label;"
+ command="cmd_copy"
+ tooltiptext="&copyButton.tooltip;"/>
+
+ <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&pasteCmd.label;"
+ command="cmd_paste"
+ tooltiptext="&pasteButton.tooltip;"/>
+ <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ observes="View:FullScreen"
+ type="checkbox"
+ label="&fullScreenCmd.label;"
+ tooltiptext="&fullScreenButton.tooltip;"/>
+ </toolbarpalette>
+
+ <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
+ toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+ fullscreentoolbar="true" mode="icons"
+#ifdef WINCE
+ iconsize="small" defaulticonsize="small"
+#else
+ iconsize="large"
+#endif
+ customizable="true"
+#ifdef WINCE
+ defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,navigator-throbber,fullscreenflex,window-controls"
+#else
+ defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,fullscreenflex,window-controls"
+#endif
+ context="toolbar-context-menu">
+ <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>
+ <hbox id="window-controls" hidden="true" fullscreencontrol="true">
+ <toolbarbutton id="minimize-button" class="toolbarbutton-1"
+ tooltiptext="&fullScreenMinimize.tooltip;"
+ oncommand="window.minimize();"/>
+
+ <toolbarbutton id="restore-button" class="toolbarbutton-1"
+ tooltiptext="&fullScreenRestore.tooltip;"
+ oncommand="BrowserFullScreen();"/>
+
+ <toolbarbutton id="close-button" class="toolbarbutton-1"
+ tooltiptext="&fullScreenClose.tooltip;"
+ oncommand="BrowserTryToCloseWindow();"/>
+ </hbox>
+ </toolbar>
+
+ <toolbarset id="customToolbars" context="toolbar-context-menu"/>
+
+ <toolbar id="PersonalToolbar"
+ mode="icons" iconsize="small" defaulticonsize="small"
+ class="chromeclass-directories"
+ context="toolbar-context-menu"
+ defaultset="personal-bookmarks"
+ toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
+#ifdef WINCE
+ collapsed="true"
+#endif
+ customizable="true"/>
+ </toolbox>
+
+ <hbox flex="1" id="browser">
+ <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
+ <sidebarheader id="sidebar-header" align="center">
+ <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
+ <image id="sidebar-throbber"/>
+ <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
+ </sidebarheader>
+ <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
+ style="min-width: 14em; width: 18em; max-width: 36em;"/>
+ </vbox>
+
+ <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/>
+ <vbox id="appcontent" flex="1">
+ <tabbrowser id="content" disablehistory="true"
+ flex="1" contenttooltip="aHTMLTooltip"
+ contentcontextmenu="contentAreaContextMenu"
+ onnewtab="BrowserOpenTab();"
+ autocompletepopup="PopupAutoComplete"
+ ondrop="contentAreaDNDObserver.onDrop(event)"
+ onclick="return contentAreaClick(event, false);"/>
+ </vbox>
+ </hbox>
+ <panel id="customizeToolbarSheetPopup" noautohide="true">
+ <iframe id="customizeToolbarSheetIFrame"
+ style="&dialog.style;"
+ hidden="true"/>
+ </panel>
+
+ <vbox id="browser-bottombox">
+ <findbar browserid="content" id="FindToolbar"/>
+
+ <statusbar class="chromeclass-status" id="status-bar"
+#ifdef WINCE
+ hidden="true"
+#endif
+ ondrop="contentAreaDNDObserver.onDrop(event)">
+ <statusbarpanel id="statusbar-display" label="" flex="1"/>
+ <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
+ <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
+ </statusbarpanel>
+ <statusbarpanel id="download-monitor" class="statusbarpanel-iconic-text"
+ tooltiptext="&downloadMonitor2.tooltip;" hidden="true"
+ command="Tools:Downloads"/>
+ <statusbarpanel id="security-button" class="statusbarpanel-iconic"
+ hidden="true"
+ onclick="if (event.button == 0 &amp;&amp; event.detail == 1) displaySecurityInfo();"/>
+ <statusbarpanel id="page-report-button" type="menu"
+ class="statusbarpanel-menu-iconic"
+ hidden="true"
+ tooltiptext="&pageReportIcon.tooltip;">
+ <menupopup onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
+ <menuitem observes="blockedPopupAllowSite"/>
+ <menuitem observes="blockedPopupEditSettings"/>
+ <menuitem observes="blockedPopupDontShowMessage"/>
+ <menuseparator observes="blockedPopupsSeparator"/>
+ </menupopup>
+ </statusbarpanel>
+ </statusbar>
+ </vbox>
+</window>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -17,16 +17,18 @@ browser.jar:
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-icon-rtl.png (content/aboutRobots-icon-rtl.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutRobots-widget-right.png (content/aboutRobots-widget-right.png)
* content/browser/aboutSupport.xhtml (content/aboutSupport.xhtml)
* content/browser/browser.css (content/browser.css)
* content/browser/browser.js (content/browser.js)
* content/browser/browser.xul (content/browser.xul)
@ -44,10 +683,21 @@
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/credits.xhtml (content/credits.xhtml)
* content/browser/metaData.js (content/metaData.js)
--- mozilla/browser/components/build/nsModule.cpp.sav 2009-10-01 22:03:56.000000000 +0200
+++ mozilla/browser/components/build/nsModule.cpp 2009-10-01 22:04:57.000000000 +0200
@@ -46,7 +46,7 @@
* content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
* content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js)
* content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css)
* content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js)
* content/browser/pageinfo/feeds.xml (content/pageinfo/feeds.xml)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -41,17 +41,17 @@
#include "nsBrowserCompsCID.h"
#include "nsPlacesImportExportService.h"
#if defined(XP_WIN)
#include "nsWindowsShellService.h"
#elif defined(XP_MACOSX)
#include "nsMacShellService.h"
#elif defined(MOZ_WIDGET_GTK2)
@ -56,7 +706,17 @@
#endif
#ifndef WINCE
@@ -88,7 +88,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindows
#include "nsProfileMigrator.h"
#if !defined(XP_BEOS)
#include "nsDogbertProfileMigrator.h"
#endif
@@ -85,17 +85,18 @@ using namespace mozilla::browser;
/////////////////////////////////////////////////////////////////////////////
NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlacesImportExportService)
#if defined(XP_WIN)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
#elif defined(XP_MACOSX)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
#elif defined(MOZ_WIDGET_GTK2)
@ -66,7 +726,17 @@
#endif
#ifndef WINCE
@@ -132,7 +133,7 @@ static const nsModuleComponentInfo compo
#if !defined(XP_BEOS)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
#endif
#if !defined(XP_OS2)
@@ -129,17 +130,17 @@ static const nsModuleComponentInfo compo
NS_SHELLSERVICE_CID,
NS_SHELLSERVICE_CONTRACTID,
nsWindowsShellServiceConstructor},
#elif defined(MOZ_WIDGET_GTK2)
{ "Browser Shell Service",
NS_SHELLSERVICE_CID,
NS_SHELLSERVICE_CONTRACTID,
@ -75,9 +745,20 @@
#endif
--- mozilla/browser/components/shell/src/Makefile.in.sav 2009-10-01 22:03:56.000000000 +0200
+++ mozilla/browser/components/shell/src/Makefile.in 2009-10-01 22:04:57.000000000 +0200
@@ -75,11 +75,12 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_
{ "Places Import/Export Service",
NS_PLACESIMPORTEXPORTSERVICE_CID,
NS_PLACESIMPORTEXPORTSERVICE_CONTRACTID,
nsPlacesImportExportServiceConstructor},
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -70,21 +70,22 @@ CPPSRCS = nsWindowsShellService.cpp
REQUIRES += \
browsercomps \
$(NULL)
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
CPPSRCS = nsMacShellService.cpp
else
ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
@ -91,8 +772,15 @@
endif
endif
endif
--- mozilla/browser/components/shell/src/nsKDEShellService.cpp.sav 2009-10-01 22:03:56.000000000 +0200
+++ mozilla/browser/components/shell/src/nsKDEShellService.cpp 2009-10-01 22:04:57.000000000 +0200
ifdef CPPSRCS
LIBRARY_NAME = shellservice_s
endif
diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/src/nsKDEShellService.cpp
@@ -0,0 +1,193 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@ -287,8 +975,10 @@
+ NS_ADDREF(*_retval = defaultReader);
+ return NS_OK;
+ }
--- mozilla/browser/components/shell/src/nsKDEShellService.h.sav 2009-10-01 22:03:56.000000000 +0200
+++ mozilla/browser/components/shell/src/nsKDEShellService.h 2009-10-01 22:04:57.000000000 +0200
diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/src/nsKDEShellService.h
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@ -349,8 +1039,10 @@
+};
+
+#endif // nskdeshellservice_h____
--- mozilla/browser/components/shell/src/nsUnixShellService.cpp.sav 2009-10-01 22:03:56.000000000 +0200
+++ mozilla/browser/components/shell/src/nsUnixShellService.cpp 2009-10-01 22:04:57.000000000 +0200
diff --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/src/nsUnixShellService.cpp
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@ -404,8 +1096,10 @@
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
+}
--- mozilla/browser/components/shell/src/nsUnixShellService.h.sav 2009-10-01 22:03:56.000000000 +0200
+++ mozilla/browser/components/shell/src/nsUnixShellService.h 2009-10-01 22:04:57.000000000 +0200
diff --git a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/src/nsUnixShellService.h
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@ -452,14 +1146,24 @@
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+#endif // nsunixshellservice_h____
--- mozilla/browser/installer/unix/packages-static.sav 2009-10-01 22:03:56.000000000 +0200
+++ mozilla/browser/installer/unix/packages-static 2009-10-01 22:04:57.000000000 +0200
@@ -291,6 +291,7 @@ bin/icons/*.png
bin/@PREF_DIR@/firefox.js
bin/@PREF_DIR@/firefox-branding.js
bin/@PREF_DIR@/channel-prefs.js
+bin/@PREF_DIR@/kde.js
bin/greprefs/all.js
bin/greprefs/security-prefs.js
bin/greprefs/xpinstall.js
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -395,16 +395,17 @@
@BINPATH@/icons/*.png
#endif
; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs
@BINPATH@/@PREF_DIR@/firefox.js
@BINPATH@/@PREF_DIR@/firefox-branding.js
@BINPATH@/@PREF_DIR@/channel-prefs.js
+@BINPATH@/@PREF_DIR@/kde.js
@BINPATH@/greprefs/all.js
@BINPATH@/greprefs/security-prefs.js
@BINPATH@/greprefs/xpinstall.js
@BINPATH@/defaults/autoconfig/platform.js
@BINPATH@/defaults/autoconfig/prefcalls.js
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.

8
firefox-libxul-sdk.patch
View File

@ -1,10 +1,7 @@
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -188,15 +188,17 @@ endif
clobber-%:
$(RM) -rf $(DIST)/xpi-stage/locale-$*
@@ -192,9 +192,11 @@ endif
libs-%:
$(NSINSTALL) -D $(DIST)/install
@ -15,8 +12,5 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
@$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
- @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
ifdef MOZ_BRANDING_DIRECTORY
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
endif
@$(MAKE) tests AB_CD=$*

20
mozilla-linkorder.patch → firefox-linkorder.patch
View File

@ -2,25 +2,29 @@ From: Wolfgang Rosenauer
Subject: Build fails with --as-needed
References:
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -68,7 +68,6 @@ endif
@@ -78,19 +78,21 @@ LOCAL_INCLUDES += -I$(srcdir)/../migrati
SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
endif
# This has to come after the above chunk, because mozreg_s has dependencies on
# stuff in MOZ_COMPONENT_LIBS.
EXTRA_DSO_LDOPTS += \
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
- $(MOZ_COMPONENT_LIBS) \
$(NULL)
# migration requires mozreg, which doesn't build on WINCE; only include
@@ -80,6 +79,9 @@ SHARED_LIBRARY_LIBS += ../migration/src/
EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
endif
+# if built with --as-needed the NSPR libs need to be linked after mozreg_s
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
# GTK2: Need to link with glib for GNOME shell service
ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \
$(NULL)
endif

23
firefox-no-gnomevfs.patch
View File

@ -1,25 +1,22 @@
From: Wolfgang Rosenauer <wr@rosenauer.org>
Subject: Do not build nkgnomevfs in xul app builds
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=512671
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -5632,16 +5632,21 @@ done],
if test -z "$MOZ_ENABLE_GNOMEVFS" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
# Suppress warning on non-X11 platforms
if test -n "$MOZ_X11"; then
AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.])
fi
@@ -5744,6 +5744,13 @@ if test -z "$MOZ_ENABLE_GNOMEVFS" && tes
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
fi
+dnl Do not build gnomevfs with libxul based apps
+if test -n "$LIBXUL_SDK_DIR" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
+if test ! -z "$LIBXUL_SDK_DIR" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
+ if test -n "$MOZ_X11"; then
+ AC_MSG_WARN([nkgnomevfs is already part of xulrunner. Removing gnomevfs from MOZ_EXTENSIONS.])
+ fi
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
+fi
+
if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
fi
dnl This might be temporary: build tridentprofile only on Windows
if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then
AC_MSG_WARN([tridentprofile extension works only on Windows at this time. Removing tridentprofile from MOZ_EXTENSIONS.])

26
firefox-no-update.patch
View File

@ -1,26 +0,0 @@
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -487,7 +487,11 @@ function buildHelpMenu()
// administrator or if we cannot update for some other reason
var checkForUpdates = document.getElementById("checkForUpdates");
var canUpdate = updates.canUpdate;
+ var updateEnabled = getBoolPref("app.update.enabled", true);
checkForUpdates.setAttribute("disabled", !canUpdate);
+ checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled);
+ var updateSeparator = document.getElementById("updateSeparator");
+ updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled);
if (!canUpdate)
return;
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
@@ -410,6 +410,7 @@ var gAdvancedPane = {
var enableAppUpdate = document.getElementById("enableAppUpdate");
enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked;
+ enableAppUpdate.hidden = !aus.canUpdate || !enabledPref.value;
},
/**

1
firefox-suse-default-prefs.js
View File

@ -1,3 +1,2 @@
pref("general.useragent.vendor", "SUSE");
pref("general.useragent.vendorSub", "RPM_VERSION");
pref("app.update.enabled", false);

135
firefox-ui-lockdown.patch
View File

@ -1,34 +1,10 @@
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -64,21 +64,19 @@
<menuitem id="menu_closeWindow" hidden="true" command="cmd_closeWindow" key="key_closeWindow" label="&closeWindow.label;" accesskey="&closeWindow.accesskey;"/>
<menuitem id="menu_close" label="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" command="cmd_close"/>
<menuseparator/>
<menuitem label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" key="key_savePage" command="Browser:SavePage"
id="menu_savePage" />
<menuitem id="menu_saveFrame" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" command="Browser:SaveFrame" hidden="true"/>
<menuitem id="menu_sendLink" label="&sendPageCmd.label;" accesskey="&sendPageCmd.accesskey;" command="Browser:SendLink"/>
<menuseparator/>
- <menuitem label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_pageSetup"
- id="menu_printSetup" />
+ <menuitem id="menu_printSetup" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_pageSetup"/>
#ifndef XP_MACOSX
- <menuitem label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" command="cmd_printPreview"
- id="menu_printPreview" />
+ <menuitem id="menu_printPreview" label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" oncommand="PrintUtils.printPreview(onEnterPrintPreview, onExitPrintPreview);"/>
#endif
<menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="printKb" command="cmd_print"
id="menu_print" />
<menuseparator/>
<menuitem label="&import.label;" accesskey="&import.accesskey;" oncommand="BrowserImport();"
id="menu_import"/>
#ifndef XP_MACOSX
<menuseparator/>
From: various contributors
Subject: Firefox chrome lockdown hooks
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1192,32 +1192,186 @@ function prepareForStartup() {
@@ -1174,32 +1174,186 @@ function prepareForStartup() {
// setup our MozApplicationManifest listener
gBrowser.addEventListener("MozApplicationManifest",
OfflineApps, false);
@ -216,7 +192,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
PlacesStarButton.init();
// called when we go into full screen, even if it is
@@ -1401,16 +1555,18 @@ function BrowserShutdown()
@@ -1399,16 +1553,18 @@ function BrowserShutdown()
Components.utils.reportError(ex);
}
@ -235,8 +211,8 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
PlacesStarButton.uninit();
@@ -3200,16 +3356,22 @@ const BrowserSearch = {
function FillHistoryMenu(aParent) {
@@ -3208,16 +3364,23 @@ function FillHistoryMenu(aParent) {
// Remove old entries if any
var children = aParent.childNodes;
for (var i = children.length - 1; i >= 0; --i) {
@ -245,20 +221,21 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
}
+ // lockdown. Don't display anything if locked down.
+ var disableHistory = gPrefService.getBoolPref("config.lockdown.history");
+ if (disableHistory) {
+ return false;
+ }
+ try {
+ var disableHistory = gPrefService.getBoolPref("config.lockdown.history");
+ if (disableHistory)
+ return false;
+ } catch (ex) {}
+
var webNav = getWebNavigation();
var sessionHistory = webNav.sessionHistory;
var bundle_browser = document.getElementById("bundle_browser");
var count = sessionHistory.count;
var index = sessionHistory.index;
var end;
if (count <= 1) // don't display the popup for a single item
return false;
@@ -3346,16 +3508,17 @@ function BrowserCustomizeToolbar()
const MAX_HISTORY_MENU_ITEMS = 15;
@@ -3357,16 +3520,17 @@ function BrowserCustomizeToolbar()
{
// Disable the toolbar context menu items
var menubar = document.getElementById("main-menubar");
@ -274,35 +251,41 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
splitter.parentNode.removeChild(splitter);
var customizeURL = "chrome://global/content/customizeToolbar.xul";
#ifdef TOOLBAR_CUSTOMIZATION_SHEET
var sheetFrame = document.getElementById("customizeToolbarSheetIFrame");
@@ -3381,16 +3544,25 @@ function BrowserCustomizeToolbar()
#else
window.openDialog(customizeURL,
"CustomizeToolbar",
"chrome,titlebar,toolbar,location,resizable,dependent",
gNavToolbox);
#endif
gCustomizeSheet = getBoolPref("toolbar.customization.usesheet", false);
@@ -3394,16 +3558,31 @@ function BrowserCustomizeToolbar()
} else {
return window.openDialog(customizeURL,
"CustomizeToolbar",
"chrome,titlebar,toolbar,location,resizable,dependent",
gNavToolbox);
}
}
+function BrowserRestoreCustomizationDisabledState()
+{
+ var cmd = document.getElementById("cmd_CustomizeToolbars");
+ if (!gPrefService.getBoolPref("config.lockdown.toolbarediting")) {
+ try {
+ var disableToolBarEditing =
+ gPrefService.getBoolPref("config.lockdown.toolbarediting");
+ } catch (ex) {
+ var disableToolBarEditing = false;
+ }
+ if (!disableToolBarEditing) {
+ cmd.removeAttribute("disabled", "true");
+ }
+ cmd.removeAttribute("inCustomization");
+}
+
function BrowserToolboxCustomizeDone(aToolboxChanged) {
#ifdef TOOLBAR_CUSTOMIZATION_SHEET
document.getElementById("customizeToolbarSheetIFrame").hidden = true;
document.getElementById("customizeToolbarSheetPopup").hidePopup();
#endif
if (gCustomizeSheet) {
document.getElementById("customizeToolbarSheetIFrame").hidden = true;
document.getElementById("customizeToolbarSheetPopup").hidePopup();
}
// Update global UI elements that may have been added or removed
if (aToolboxChanged) {
@@ -3398,16 +3570,23 @@ function BrowserToolboxCustomizeDone(aTo
@@ -3411,16 +3590,27 @@ function BrowserToolboxCustomizeDone(aTo
if (gURLBar)
gURLBar.emptyText = gURLBarEmptyText.value;
@ -312,7 +295,11 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
window.XULBrowserWindow.init();
+ // make sure the search bar is not put back if locked down
+ var disableSearchBar = gPrefService.getBoolPref("config.lockdown.searchbar");
+ try {
+ var disableSearchBar = gPrefService.getBoolPref("config.lockdown.searchbar");
+ } catch (ex) {
+ var disableSearchBar = false;
+ }
+ if (disableSearchBar) {
+ document.getElementById("search-container")
+ .setAttribute("style", (disableSearchBar) ? "display: none;" : "");
@ -326,7 +313,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
// support downgrading to Firefox 2.0
var navBar = document.getElementById("nav-bar");
@@ -3432,18 +3611,17 @@ function BrowserToolboxCustomizeDone(aTo
@@ -3445,18 +3635,17 @@ function BrowserToolboxCustomizeDone(aTo
XULBrowserWindow.asyncUpdateUI();
PlacesStarButton.updateState();
}
@ -339,19 +326,19 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
- cmd.removeAttribute("disabled");
+ BrowserRestoreCustomizationDisabledState();
// XXXmano bug 287105: wallpaper to bug 309953,
// the reload button isn't in sync with the reload command.
var reloadButton = document.getElementById("reload-button");
if (reloadButton) {
reloadButton.disabled =
document.getElementById("Browser:Reload").getAttribute("disabled") == "true";
}
@@ -4568,16 +4746,19 @@ function onViewToolbarsPopupShowing(aEve
var toolbar = gNavToolbox.childNodes[i];
#ifdef XP_MACOSX
// make sure to re-enable click-and-hold
if (!getBoolPref("ui.click_hold_context_menus", false))
SetClickAndHoldHandlers();
#endif
// XXX Shouldn't have to do this, but I do
@@ -4544,16 +4733,19 @@ function onViewToolbarsPopupShowing(aEve
var toolbarName = toolbar.getAttribute("toolbarname");
var type = toolbar.getAttribute("type");
if (toolbarName && type != "menubar") {
var menuItem = document.createElement("menuitem");
if (toolbarName) {
let menuItem = document.createElement("menuitem");
let hidingAttribute = toolbar.getAttribute("type") == "menubar" ?
"autohide" : "collapsed";
menuItem.setAttribute("toolbarindex", i);
menuItem.setAttribute("type", "checkbox");
menuItem.setAttribute("label", toolbarName);
@ -359,14 +346,14 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
+ menuItem.setAttribute("disabled", "true");
+ }
menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey"));
menuItem.setAttribute("checked", toolbar.getAttribute("collapsed") != "true");
menuItem.setAttribute("checked", toolbar.getAttribute(hidingAttribute) != "true");
popup.insertBefore(menuItem, firstMenuItem);
menuItem.addEventListener("command", onViewToolbarCommand, false);
}
toolbar = toolbar.nextSibling;
}
@@ -6521,17 +6702,17 @@ BookmarkAllTabsHandler.prototype = {
@@ -6421,17 +6613,23 @@ BookmarkAllTabsHandler.prototype = {
_updateCommandState: function BATH__updateCommandState(aTabClose) {
var numTabs = gBrowser.tabContainer.childNodes.length;
@ -376,7 +363,13 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
numTabs--;
- if (numTabs > 1)
+ if (numTabs > 1 && !gPrefService.getBoolPref("config.lockdown.bookmark"))
+ try {
+ var disableBookmarks =
+ gPrefService.getBoolPref("config.lockdown.bookmark");
+ } catch (ex) {
+ var disableBookmarks = false;
+ }
+ if (numTabs > 1 && !disableBookmarks)
this._command.removeAttribute("disabled");
else
this._command.setAttribute("disabled", "true");

2
firefox.schemas
View File

@ -137,7 +137,7 @@
<applyto>/apps/firefox/general/homepage_url</applyto>
<owner>firefox</owner>
<type>string</type>
<default>www.mozilla.com</default>
<default>www.novell.com/linux</default>
<locale name="C">
<short>Home Page URL</short>
<long>Home Page URL</long>

3
l10n-3.5.7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e5c8659991a41d3d2b2bae5b93d7abaf5e2f3efb96412dcb2b6c2ba5dc14accd
size 36683717

3
l10n-3.6rc1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f08f7667687ae8023923d29006abd2bc5f6cff568c5925b07e696e2b5ecab9e
size 36258077

40
mozilla-abi.patch
View File

@ -1,40 +0,0 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1322,24 +1322,36 @@ fi
# Only set CPU_ARCH if we recognize the value of OS_TEST
case "$OS_TEST" in
*86 | i86pc)
CPU_ARCH=x86
;;
+powerpc64 | ppc64)
+ CPU_ARCH=ppc64
+ ;;
+
powerpc* | ppc | rs6000)
CPU_ARCH=ppc
;;
Alpha | alpha | ALPHA)
CPU_ARCH=Alpha
;;
+s390)
+ CPU_ARCH=s390
+ ;;
+
+s390x)
+ CPU_ARCH=s390x
+ ;;
+
hppa* | parisc)
CPU_ARCH=hppa
;;
sun4u | sparc*)
CPU_ARCH=sparc
;;