Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (5d41c9754e2ffe8b00e9adcca78a9aa89ee07837)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (5d41c9754e2ffe8b00e9adcca78a9aa89ee07837)
  • Date: Sun, 21 Jan 2007 06:23:24 -0600

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

http/firefox/BUILD | 78 -
http/firefox/CONFIGURE | 2
http/firefox/DETAILS | 2
http/firefox/HISTORY | 21
http/firefox/INSTALL | 84 -
http/firefox/PREPARE | 2
http/firefox/PRE_BUILD | 37
http/firefox/desktop/firefox.desktop | 2
http/firefox/embed-typeaheadfind-1.patch | 1153 -------------------
http/firefox/firefox-1.1-uriloader.patch | 459 -------
http/firefox/firefox-1.1-visibility.patch | 22
http/firefox/firefox-init.patch | 1679
----------------------------
http/firefox/firefox-nopangoxft.patch | 20
http/firefox/init-files | 12
http/firefox/mozconfig | 24
http/firefox/mozilla-firefox-1.5-mork.patch | 32
http/firefox/security_manager_makefile.diff | 142 --
http/firefox/x-lib.patch | 11
18 files changed, 118 insertions(+), 3664 deletions(-)

New commits:
commit 5d41c9754e2ffe8b00e9adcca78a9aa89ee07837
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

firefox: pretty major update to 2.0.0.1. Attempted to remove all the
accumulated hacks. Works good for me on two systms and I built liferea
and kazehakase against it with no problems. briareus also built.
Hopefully nothing major missing.

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index af0bfa1..aefebbc 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -1,59 +1,23 @@
-FIREFOX_HOME=${INSTALL_ROOT}/usr/lib/firefox &&
-export MOZ_PHOENIX=1 &&
-
-# No fast optimization for Mozilla, bit us so many times...
-export CFLAGS="${CFLAGS//-O3/-O2}" &&
-export CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
-
-# these two are simply bugs in the Makefile-s
-sedit 's#-lgfxshared_s#-L../shared -lgfxshared_s#g' gfx/src/gtk/Makefile.in
&&
-sedit 's#-lxprintutil#-L../xprintutil -lxprintutil#g'
gfx/src/gtk/Makefile.in &&
-
-mozilla_remove_nspr_nss &&
-
-if [ -f /root/.mozconfig ]; then
- rm -f /root/.mozconfig
+FIREFOX_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&
+export MOZ_PHOENIX=1 &&
+
+#
+# Only strip if the user wants us to
+#
+if echo $LDFLAGS | grep -q -- '-s'; then
+ OPTS="$OPTS --enable-strip"
fi &&

-if [ "$FIREFOX_CVS" == "y" ]; then
- OPTS="$OPTS --enable-application=browser"
-fi &&
-cp browser/config/mozconfig .mozconfig &&
-
-# Ugly hack to get spells using gecko engine to compile against the headers
and libs
-# under /usr/lib/firefox instead of /usr/lib.firefox-$VERSION, so that we
can avoid
-# to recompile them on each minor upgrade
-# This will make the replacement in pkconfig files and firefox-config command
-sedit 's#$(includedir)#/usr/include/firefox#g' build/unix/Makefile.in &&
-sedit 's#$(mozappdir)#/usr/lib/firefox#g' build/unix/Makefile.in &&
-sedit 's#$(idldir)#/usr/share/idl/firefox#g' build/unix/Makefile.in &&
-
-./configure \
- --prefix=${INSTALL_ROOT}/usr \
- --with-user-appdir=.firefox \
- --with-x \
- --with-pthreads \
- --enable-reorder \
- --enable-cpp-rtti \
- --enable-strip \
- --enable-optimize="$CFLAGS" \
- --with-default-mozilla-five-home=$FIREFOX_HOME \
- --disable-debug \
- --disable-tests \
- --disable-installer \
- --disable-pedantic \
- --disable-mailnews \
- --disable-composer \
- --enable-single-profile \
- --enable-extensions=default,typeaheadfind \
- --enable-canvas \
- $OPTS &&
-
-make_single &&
-make &&
-
-# fix pkgconfig files so that other spell using them can build properly
-# these files will be renamed to firefox-{nspr,nss}.pc during installation
-cp -f $GRIMOIRE/libs/nspr/mozilla-nspr.pc build/unix/firefox-nspr.pc &&
-cp -f $GRIMOIRE/crypto/nss/mozilla-nss.pc build/unix/firefox-nss.pc &&
-sedit 's|Requires:\s*firefox-nspr.*$|Requires: mozilla-nspr|g'
build/unix/firefox-xpcom.pc
+#
+# No fast optimization for Mozilla, bit us so many times...
+#
+CFLAGS="${CFLAGS//-O3/-O2}" &&
+CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
+
+./configure --prefix=$INSTALL_ROOT/usr \
+ --mandir=$INSTALL_ROOT/usr/share/man \
+ --enable-optimize="$CFLAGS" \
+ $OPTS &&
+make_single &&
+make -f client.mk build &&
+make_normal
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index 14c1ffc..aa1b263 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -1,3 +1,5 @@
config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n
config_query FIREFOX_NULLPLUGIN \
"Do you want nullplugin installed (to enable auto search and install of
other plugins)" y
+config_query FIREFOX_OFFICIAL "Enable official branding? If enabled, you \
+may be restricted in distributing these binaries IAW mozilla policies" n
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 846abff..7b3f545 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if [ "$FIREFOX_CVS" == "y" ]; then

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
SOURCE_IGNORE=volatile
else
- VERSION=1.5.0.9
+ VERSION=2.0.0.1
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 793b1b9..31c0e80 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,24 @@
+2007-01-21 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0.1
+ * PREPARE: Removed choice for gtk. Only could test with gtk+2
+ * CONFIGURE: Addeded query for official branding
+ * PRE_BUILD: Added patch to build against monolithic X.
+ Added sedit for official branding
+ cp mozconfig file to $SOURCE_DIRECTORY
+ Removed various 1.5 patches
+ * BUILD: Removed most configure options. Using mozconfig now.
+ Removed some nspr/nss hacks.
+ Removed hack for firefox libs. Installing now to /usr/lib/firefox
+ * INSTALL: Moved trick for installing to /usr/lib/firefox.
+ Added manual copying of files to /usr/lib/firefox
+ sedit *.pc files for correct installation directories
+ Don't run make install.
+ * x-lib.patch: Added patch for monolithic X.
+ * firefox-1.1-uriloader.patch, firefox-1.1-visibility.patch,
+ embed-typeaheadfind-1.patch, firefox-init.patch, init-files,
+ firefox-nopangoxft.patch, mozilla-firefox-1.5-mork.patch,
+ security_manager_makefile.diff: Removed old patches
+
2006-12-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.0.9, SECURITY_PATCH=6

http://www.mozilla.org/projects/security/known-vulnerabilities.html#Firefox
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index a583440..0c9e8f6 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -1,50 +1,30 @@
-FIREFOX_HOME=${INSTALL_ROOT}/usr/lib/firefox &&
+FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firefox &&

if spell_ok Firebird; then
dispel Firebird
fi &&

-#
-# Firefox now installs to /usr/lib/firefox and leaves /usr/lib/mozilla alone
-
-#
-# Make sure these directories exist, symlink them, and /then/ install
-# This fixes both Wolfgang's problems and johnny17's problems. :)
-#
-if [ ! -d $FIREFOX_HOME ]; then
- mkdir -p $FIREFOX_HOME
-fi &&
+# Not recommended by http://www.mozilla.org/build to use
+# make install. Manually install the files.

-if [ ! -d ${INSTALL_ROOT}/usr/share/idl/firefox-$VERSION ]; then
- mkdir -p ${INSTALL_ROOT}/usr/share/idl/firefox-$VERSION
-fi &&
-
-if [ ! -d ${INSTALL_ROOT}/usr/include/firefox-$VERSION ]; then
- mkdir -p ${INSTALL_ROOT}/usr/include/firefox-$VERSION
-fi &&
+mkdir -p $INSTALL_ROOT/usr/lib/firefox &&
+cd $SOURCE_DIRECTORY &&
+cp -RLv dist/bin/* $INSTALL_ROOT/usr/lib/firefox/ &&
+mkdir -p $INSTALL_ROOT/usr/include/firefox/ &&
+cp -LfRv dist/include/* $INSTALL_ROOT/usr/include/firefox/ &&
+mkdir -p $INSTALL_ROOT/usr/share/idl/firefox/ &&
+cp -LfRv dist/idl/* $INSTALL_ROOT/usr/share/idl/firefox/ &&

-ln -fns $FIREFOX_HOME $FIREFOX_HOME-$VERSION &&
-ln -fns ${INSTALL_ROOT}/usr/share/idl/firefox-$VERSION \
- ${INSTALL_ROOT}/usr/share/idl/firefox &&
-ln -fns ${INSTALL_ROOT}/usr/include/firefox-$VERSION \
- ${INSTALL_ROOT}/usr/include/firefox &&
-make install &&
+#fix install directories in *.pc files.
+sed -i s#usr/local#usr# build/unix/firefox-* &&
+sed -i s#-2.0.0.1## build/unix/firefox-* &&
+cp build/unix/firefox*.pc $INSTALL_ROOT/usr/lib/pkgconfig &&

-#
-# Don't do this!
-# http://lists.freebsd.org/pipermail/freebsd-gnome/2004-October/008443.html
-#
-#if ! grep -q firefox /etc/ld.so.conf; then
-# echo '/usr/lib/firefox' >> /etc/ld.so.conf
-#fi &&

#
-# Make sure $INSTALL_ROOT/usr/lib/firefox is not in
$INSTALL_ROOT/etc/ld.so.conf
+# Script to set MOZILLA_FIVE_HOME
#
-if grep -q firefox $INSTALL_ROOT/etc/ld.so.conf; then
- sedit "s:/usr/lib/firefox::" $INSTALL_ROOT/etc/ld.so.conf &&
- /sbin/ldconfig
-fi &&
+cp ${SCRIPT_DIRECTORY}/${SPELL}.sh $INSTALL_ROOT/etc/profile.d &&

#
# Create symlink to mozilla for hardwired applications
@@ -63,43 +43,29 @@ fi &&
# to be in the same directory as the current application binary. See:
# http://www.mozilla.org/projects/security/pki/nss/loadable_certs.html
# https://bugzilla.mozilla.org/show_bug.cgi?id=128290
-# Only create if $FIREFOX_HOME/libnssckbi.so does not exist or is already a
+# Only create if $MOZILLA_HOME/libnssckbi.so does not exist or is already a
# symlink.
#
if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
if ! test -f $FIREFOX_HOME/libnssckbi.so ||
test -h $FIREFOX_HOME/libnssckbi.so; then
ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $FIREFOX_HOME/libnssckbi.so
- fi
+ fi
fi &&
+if [[ "$FIREFOX_NULLPLUGIN" == "n" ]]
+then
+ rm $FIREFOX_HOME/plugins/libnullplugin.so
+fi &&

-#
-# Fix for starting firefox without running as root first
-# Bug #7114 (thanks to Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-#
-# first remove the files the patch creates so patch doesn't fail, see bug
#8874
-while read firefox_remove_file; do
- rm -f $FIREFOX_HOME/$firefox_remove_file
-done < $SCRIPT_DIRECTORY/init-files &&
-# now patch
-patch -d $FIREFOX_HOME -p1 -N \
- < $SCRIPT_DIRECTORY/firefox-init.patch &&
-
-#
-# Script to set MOZILLA_FIVE_HOME
-#
-cp ${SCRIPT_DIRECTORY}/${SPELL}.sh $INSTALL_ROOT/etc/profile.d &&

-if test "$FIREFOX_NULLPLUGIN" == "n"; then
- rm $FIREFOX_HOME/plugins/libnullplugin.so
-fi &&
#
-# Install firefox script so it loads properly
+# install firefox script so it loads properly even if MOZILLA_FIVE_HOME is
+# not set or set to a different mozilla/firefox directory
#
install -m 755 -o root -g root $SCRIPT_DIRECTORY/firefox \
$INSTALL_ROOT/usr/bin &&

# make the pkgconfig files reference the nspr from the standalone nspr spell
-#sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
+sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc
&&
sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc
diff --git a/http/firefox/PREPARE b/http/firefox/PREPARE
index 8fbbab0..50df2b8 100755
--- a/http/firefox/PREPARE
+++ b/http/firefox/PREPARE
@@ -12,8 +12,6 @@ fi &&

config_query FIREFOX_CVS \
"Checkout the CVS version?" n &&
-config_query_list FIREFOX_GTK \
- "Which version of gtk+ do you want?" "2.x" "1.x" &&

# touch the SOURCE tarball if you update via cvs and already have a cvs
tarball
# otherwise you have to download 40 MB of crap
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 9e01662..042d15f 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,3 +1,5 @@
+if [ "$FIREFOX_CVS" = "y" ] &&
+ [ -f $SOURCE_CACHE/$FIREFOX_TARBALL ]; then
if [ ! -f /root/.cvspass ]; then
touch /root/.cvspass
fi
&&
@@ -6,19 +8,9 @@ mk_source_dir $SOURCE_DIRECTORY

FIREFOX_TARBALL=firefox-1.0+.tar.bz2 &&

-if [ "$FIREFOX_CVS" = "y" ] &&
- [ -f $SOURCE_CACHE/$FIREFOX_TARBALL ]; then
message "${MESSAGE_COLOR}Unpacking source file $FIREFOX_TARBALL" \
"$for ${SPELL_COLOR}$SPELL${DEFAULT_COLOR}"
&&
- tar jxf $SOURCE_CACHE/$FIREFOX_TARBALL
-else
- unpack_file ''
-fi
&&
-
-#
-#cvs updates anyone?
-#
-if [ "$FIREFOX_CVS" = "y" ]; then
+ tar jxf $SOURCE_CACHE/$FIREFOX_TARBALL
&&
message "${MESSAGE_COLOR}\tIt can take some considerable time to" \
"\tregenerate the cvs tags you will not see much progress or a" \
"\ttime but do not despair, GOOD THINGS are happening in the" \
@@ -32,18 +24,13 @@ if [ "$FIREFOX_CVS" = "y" ]; then
tar jcf $FIREFOX_TARBALL mozilla/
&&
message "Moving $FIREFOX_TARBALL to/var/spool/sorcery${DEFAULT_COLOR}"
&&
mv -v $FIREFOX_TARBALL $SOURCE_CACHE/
-fi
&&
-
-cd $SOURCE_DIRECTORY
&&
+else
+ default_pre_build
+ cd $SOURCE_DIRECTORY &&
+ patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
+fi &&

-# 1.5 patches
-# 1) visibility
-patch -p0 < $SCRIPT_DIRECTORY/firefox-1.1-visibility.patch &&
-# 2) removing pangoxft
-patch -p1 < $SCRIPT_DIRECTORY/firefox-nopangoxft.patch &&
-# 3) no crash uri loader with gnome-vfs
-patch -p0 < $SCRIPT_DIRECTORY/firefox-1.1-uriloader.patch &&
-# 4) typeahead
-patch -p1 < $SCRIPT_DIRECTORY/embed-typeaheadfind-1.patch &&
-# 5) sec fix
-patch -p0 < $SCRIPT_DIRECTORY/mozilla-firefox-1.5-mork.patch
+cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig &&
+if [ "$FIREFOX_OFFICIAL" == "y" ]; then
+ sedit '24iac_add_options --enable-official-branding'
$SOURCE_DIRECTORY/.mozconfig
+fi
diff --git a/http/firefox/desktop/firefox.desktop
b/http/firefox/desktop/firefox.desktop
index e65295f..6701acd 100644
--- a/http/firefox/desktop/firefox.desktop
+++ b/http/firefox/desktop/firefox.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Firefox
Exec=firefox
-Icon=/usr/lib/firefox/icons/default.xpm
+Icon=/usr/lib/firefox/icons/mozicon16.xpm
Terminal=false
Type=Application
Categories=Application;Network;Browsers
diff --git a/http/firefox/embed-typeaheadfind-1.patch
b/http/firefox/embed-typeaheadfind-1.patch
deleted file mode 100644
index d29780c..0000000
--- a/http/firefox/embed-typeaheadfind-1.patch
+++ /dev/null
@@ -1,1153 +0,0 @@
-diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/Makefile.in
mozilla/extensions/typeaheadfind/Makefile.in
---- mozilla.orig/extensions/typeaheadfind/Makefile.in 2005-03-26
00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/Makefile.in 2005-03-26
11:39:29.000000000 -0500
-@@ -31,7 +31,7 @@
-
- include $(DEPTH)/config/autoconf.mk
-
--MODULE = typeaheadfind
-+MODULE = typeaheadfindsea
- DIRS = public src resources
-
- include $(topsrcdir)/config/rules.mk
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/public/Makefile.in
mozilla/extensions/typeaheadfind/public/Makefile.in
---- mozilla.orig/extensions/typeaheadfind/public/Makefile.in 2005-03-26
00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/public/Makefile.in 2005-03-26
11:39:29.000000000 -0500
-@@ -31,11 +31,11 @@
-
- include $(DEPTH)/config/autoconf.mk
-
--MODULE=typeaheadfind
--XPIDL_MODULE=typeaheadfind
-+MODULE=typeaheadfindsea
-+XPIDL_MODULE=typeaheadfindsea
- GRE_MODULE = 1
-
--XPIDLSRCS= ./nsITypeAheadFind.idl \
-+XPIDLSRCS= ./nsITypeAheadFindSea.idl \
- $(NULL)
-
-
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFind.idl
mozilla/extensions/typeaheadfind/public/nsITypeAheadFind.idl
---- mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFind.idl
2005-03-26 00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/public/nsITypeAheadFind.idl
1969-12-31 19:00:00.000000000 -0500
-@@ -1,88 +0,0 @@
--/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
--/* ***** 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.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- * Original Author: Aaron Leventhal (aaronl AT netscape.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 ***** */
--
--#include "nsISupports.idl"
--#include "domstubs.idl"
--#include "nsISupportsPrimitives.idl"
--
--%{ C++
-- #include "nsIDOMEvent.h"
--
-- #define NS_TYPEAHEADFIND_CID \
-- {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45,
0xa4}}
--
-- #define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/typeaheadfind;1"
--%}
--
--interface nsIDOMEvent;
--
--[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
--interface nsITypeAheadFind : nsISupports
--{
-- /** Is type ahead find mode currently on? */
-- readonly attribute boolean isActive;
--
-- /** Manually start type ahead find mode */
-- void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly);
--
-- /** Manually cancel type ahead find mode */
-- void cancelFind();
--
-- /**
-- * Will find as you type start automatically if the user
-- * types with the focus on page content other than a textfield or select?
-- * If autostart is off, the startNewFind() method can be used to enact
-- * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText.
-- */
-- void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn);
-- boolean getAutoStart(in nsIDOMWindow aWindow);
--
-- /**
-- * Find next recurrence if typeaheadfind was the last used find,
-- * as opposed to regular find. Returns false in nsISupportsPRBool if we
-- * don't handle the request.
-- */
-- void findNext(in boolean aReverse, in nsISupportsInterfacePointer
aCallerWindowSupports);
--
-- /*
-- * Go back and remove one character from find string
-- * Returns true if backspace used
-- */
-- boolean backOneChar();
--};
--
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
mozilla/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
---- mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
2005-03-26 11:39:29.000000000 -0500
-@@ -0,0 +1,88 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
-+/* ***** 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.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Original Author: Aaron Leventhal (aaronl AT netscape.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 ***** */
-+
-+#include "nsISupports.idl"
-+#include "domstubs.idl"
-+#include "nsISupportsPrimitives.idl"
-+
-+%{ C++
-+ #include "nsIDOMEvent.h"
-+
-+ #define NS_TYPEAHEADFINDSEA_CID \
-+ {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45,
0xa4}}
-+
-+ #define NS_TYPEAHEADFINDSEA_CONTRACTID "@mozilla.org/typeaheadfindsea;1"
-+%}
-+
-+interface nsIDOMEvent;
-+
-+[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
-+interface nsITypeAheadFindSea : nsISupports
-+{
-+ /** Is type ahead find mode currently on? */
-+ readonly attribute boolean isActive;
-+
-+ /** Manually start type ahead find mode */
-+ void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly);
-+
-+ /** Manually cancel type ahead find mode */
-+ void cancelFind();
-+
-+ /**
-+ * Will find as you type start automatically if the user
-+ * types with the focus on page content other than a textfield or select?
-+ * If autostart is off, the startNewFind() method can be used to enact
-+ * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText.
-+ */
-+ void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn);
-+ boolean getAutoStart(in nsIDOMWindow aWindow);
-+
-+ /**
-+ * Find next recurrence if typeaheadfindsea was the last used find,
-+ * as opposed to regular find. Returns false in nsISupportsPRBool if we
-+ * don't handle the request.
-+ */
-+ void findNext(in boolean aReverse, in nsISupportsInterfacePointer
aCallerWindowSupports);
-+
-+ /*
-+ * Go back and remove one character from find string
-+ * Returns true if backspace used
-+ */
-+ boolean backOneChar();
-+};
-+
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
mozilla/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
----
mozilla.orig/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
2005-03-26 00:12:02.000000000 -0500
-+++
mozilla/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
2005-03-26 11:39:29.000000000 -0500
-@@ -36,7 +36,7 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--pref("accessibility.typeaheadfind", true);
--pref("accessibility.typeaheadfind.linksonly", true);
--pref("accessibility.typeaheadfind.startlinksonly", false);
--pref("accessibility.typeaheadfind.timeout", 5000);
-+pref("accessibility.typeaheadfindsea", true);
-+pref("accessibility.typeaheadfindsea.linksonly", true);
-+pref("accessibility.typeaheadfindsea.startlinksonly", false);
-+pref("accessibility.typeaheadfindsea.timeout", 5000);
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/resources/jar.mn
mozilla/extensions/typeaheadfind/resources/jar.mn
---- mozilla.orig/extensions/typeaheadfind/resources/jar.mn 2005-03-26
00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/resources/jar.mn 2005-03-26
11:39:29.000000000 -0500
-@@ -1,5 +1,5 @@
- en-US.jar:
-- locale/en-US/global/typeaheadfind.properties
(locale/en-US/typeaheadfind.properties)
-+ locale/en-US/global/typeaheadfindsea.properties
(locale/en-US/typeaheadfindsea.properties)
-
- toolkit.jar:
- content/global/notfound.wav (content/notfound.wav)
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties

mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties
----
mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties
2005-03-26 00:12:02.000000000 -0500
-+++
mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties
1969-12-31 19:00:00.000000000 -0500
-@@ -1,13 +0,0 @@
--openparen = (
--closeparen = )
--textfound = Text found: "
--textnotfound = Text not found: "
--linkfound = Link found: "
--linknotfound = Link not found: "
--closequote = "
--stopfind = Find stopped.
--starttextfind = Starting -- find text as you type
--startlinkfind = Starting -- find links as you type
--repeated = repeated
--nextmatch = - next match
--prevmatch = - previous match
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties

mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties
----
mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties
1969-12-31 19:00:00.000000000 -0500
-+++
mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties
2005-03-26 11:39:29.000000000 -0500
-@@ -0,0 +1,13 @@
-+openparen = (
-+closeparen = )
-+textfound = Text found: "
-+textnotfound = Text not found: "
-+linkfound = Link found: "
-+linknotfound = Link not found: "
-+closequote = "
-+stopfind = Find stopped.
-+starttextfind = Starting -- find text as you type
-+startlinkfind = Starting -- find links as you type
-+repeated = repeated
-+nextmatch = - next match
-+prevmatch = - previous match
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/src/Makefile.in
mozilla/extensions/typeaheadfind/src/Makefile.in
---- mozilla.orig/extensions/typeaheadfind/src/Makefile.in 2005-03-26
00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/src/Makefile.in 2005-03-26
11:39:29.000000000 -0500
-@@ -31,15 +31,15 @@
-
- include $(DEPTH)/config/autoconf.mk
-
--MODULE = typeaheadfind
--LIBRARY_NAME = typeaheadfind
-+MODULE = typeaheadfindsea
-+LIBRARY_NAME = typeaheadfindsea
- ifneq ($(OS_ARCH),WINNT)
--SHORT_LIBNAME = typahead
-+SHORT_LIBNAME = typaheadsea
- endif
- GRE_MODULE = 1
- MOZILLA_INTERNAL_API = 1
-
--PACKAGE_FILE = typeaheadfind.pkg
-+PACKAGE_FILE = typeaheadfindsea.pkg
-
- REQUIRES = appcomps \
- embedcomponents \
-@@ -66,7 +66,7 @@
-
- EXPORT_LIBRARY = 1
- IS_COMPONENT = 1
--MODULE_NAME = nsTypeAheadFind
-+MODULE_NAME = nsTypeAheadFindSea
-
- CPPSRCS = \
- nsTypeAheadFind.cpp \
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
---- mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
2005-03-26 00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp 2005-03-26
11:39:29.000000000 -0500
-@@ -114,8 +114,8 @@
- ////////////////////////////////////////////////////////////////////////
-
-
--NS_INTERFACE_MAP_BEGIN(nsTypeAheadFind)
-- NS_INTERFACE_MAP_ENTRY(nsITypeAheadFind)
-+NS_INTERFACE_MAP_BEGIN(nsTypeAheadFindSea)
-+ NS_INTERFACE_MAP_ENTRY(nsITypeAheadFindSea)
- NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
- NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
- NS_INTERFACE_MAP_ENTRY(nsIScrollPositionListener)
-@@ -128,8 +128,8 @@
- NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMKeyListener)
- NS_INTERFACE_MAP_END
-
--NS_IMPL_ADDREF(nsTypeAheadFind)
--NS_IMPL_RELEASE(nsTypeAheadFind)
-+NS_IMPL_ADDREF(nsTypeAheadFindSea)
-+NS_IMPL_RELEASE(nsTypeAheadFindSea)
-
- static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
- static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
-@@ -138,11 +138,11 @@
-
- #define NS_FIND_CONTRACTID "@mozilla.org/embedcomp/rangefind;1"
-
--nsTypeAheadFind* nsTypeAheadFind::sInstance = nsnull;
--PRInt32 nsTypeAheadFind::sAccelKey = -1; // magic value of -1 when
unitialized
-+nsTypeAheadFindSea* nsTypeAheadFindSea::sInstance = nsnull;
-+PRInt32 nsTypeAheadFindSea::sAccelKey = -1; // magic value of -1 when
unitialized
-
-
--nsTypeAheadFind::nsTypeAheadFind():
-+nsTypeAheadFindSea::nsTypeAheadFindSea():
- mIsFindAllowedInWindow(PR_FALSE), mAutoStartPref(PR_FALSE),
- mLinksOnlyPref(PR_FALSE), mStartLinksOnlyPref(PR_FALSE),
- mLinksOnly(PR_FALSE), mIsTypeAheadOn(PR_FALSE),
mCaretBrowsingOn(PR_FALSE),
-@@ -161,25 +161,25 @@
- static PRInt32 gInstanceCount;
- ++gInstanceCount;
- NS_ASSERTION(gInstanceCount == 1,
-- "There should be only 1 instance of nsTypeAheadFind!");
-+ "There should be only 1 instance of nsTypeAheadFindSea!");
- #endif
- }
-
-
--nsTypeAheadFind::~nsTypeAheadFind()
-+nsTypeAheadFindSea::~nsTypeAheadFindSea()
- {
- RemoveDocListeners();
- mTimer = nsnull;
-
- nsCOMPtr<nsIPrefBranch2>
prefInternal(do_GetService(NS_PREFSERVICE_CONTRACTID));
- if (prefInternal) {
-- prefInternal->RemoveObserver("accessibility.typeaheadfind", this);
-+ prefInternal->RemoveObserver("accessibility.typeaheadfindsea", this);
- prefInternal->RemoveObserver("accessibility.browsewithcaret", this);
- }
- }
-
- nsresult
--nsTypeAheadFind::Init()
-+nsTypeAheadFindSea::Init()
- {
- nsresult rv = NS_NewISupportsArray(getter_AddRefs(mManualFindWindows));
- NS_ENSURE_SUCCESS(rv, rv);
-@@ -196,7 +196,7 @@
- }
-
- // ----------- Listen to prefs ------------------
-- rv = prefInternal->AddObserver("accessibility.typeaheadfind", this,
PR_FALSE);
-+ rv = prefInternal->AddObserver("accessibility.typeaheadfindsea", this,
PR_FALSE);
- NS_ENSURE_SUCCESS(rv, rv);
-
- rv = prefInternal->AddObserver("accessibility.browsewithcaret", this,
PR_FALSE);
-@@ -217,11 +217,11 @@
- return rv;
- }
-
--nsTypeAheadFind *
--nsTypeAheadFind::GetInstance()
-+nsTypeAheadFindSea *
-+nsTypeAheadFindSea::GetInstance()
- {
- if (!sInstance) {
-- sInstance = new nsTypeAheadFind();
-+ sInstance = new nsTypeAheadFindSea();
- if (!sInstance)
- return nsnull;
-
-@@ -241,14 +241,14 @@
-
-
- void
--nsTypeAheadFind::ReleaseInstance()
-+nsTypeAheadFindSea::ReleaseInstance()
- {
- NS_IF_RELEASE(sInstance);
- }
-
-
- void
--nsTypeAheadFind::Shutdown()
-+nsTypeAheadFindSea::Shutdown()
- {
- // Application shutdown
- mTimer = nsnull;
-@@ -264,14 +264,14 @@
- // ------- Pref Callbacks (2) ---------------
-
- nsresult
--nsTypeAheadFind::PrefsReset()
-+nsTypeAheadFindSea::PrefsReset()
- {
- nsCOMPtr<nsIPrefBranch>
prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
- NS_ENSURE_TRUE(prefBranch, NS_ERROR_FAILURE);
-
- PRBool wasTypeAheadOn = mIsTypeAheadOn;
-
-- prefBranch->GetBoolPref("accessibility.typeaheadfind", &mIsTypeAheadOn);
-+ prefBranch->GetBoolPref("accessibility.typeaheadfindsea",
&mIsTypeAheadOn);
-
- if (mIsTypeAheadOn != wasTypeAheadOn) {
- if (!mIsTypeAheadOn) {
-@@ -291,7 +291,7 @@
- do_GetService(kStringBundleServiceCID);
-
- if (stringBundleService)
-- stringBundleService->CreateBundle(TYPEAHEADFIND_BUNDLE_URL,
-+ stringBundleService->CreateBundle(TYPEAHEADFINDSEA_BUNDLE_URL,
- getter_AddRefs(mStringBundle));
-
- // Observe find again commands. We'll handle them if we were the last
find
-@@ -306,34 +306,34 @@
- }
-
- PRBool oldAutoStartPref = mAutoStartPref;
-- prefBranch->GetBoolPref("accessibility.typeaheadfind.autostart",
-+ prefBranch->GetBoolPref("accessibility.typeaheadfindsea.autostart",
- &mAutoStartPref);
- if (mAutoStartPref != oldAutoStartPref) {
- ResetGlobalAutoStart(mAutoStartPref);
- }
-
-- prefBranch->GetBoolPref("accessibility.typeaheadfind.linksonly",
-+ prefBranch->GetBoolPref("accessibility.typeaheadfindsea.linksonly",
- &mLinksOnlyPref);
-
-- prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
-+ prefBranch->GetBoolPref("accessibility.typeaheadfindsea.startlinksonly",
- &mStartLinksOnlyPref);
-
- PRBool isSoundEnabled = PR_TRUE;
-- prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
-+ prefBranch->GetBoolPref("accessibility.typeaheadfindsea.enablesound",
- &isSoundEnabled);
- nsXPIDLCString soundStr;
- if (isSoundEnabled) {
-- prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
-+ prefBranch->GetCharPref("accessibility.typeaheadfindsea.soundURL",
- getter_Copies(soundStr));
- }
- mNotFoundSoundURL = soundStr;
-
- PRBool isTimeoutEnabled = PR_FALSE;
-- prefBranch->GetBoolPref("accessibility.typeaheadfind.enabletimeout",
-+ prefBranch->GetBoolPref("accessibility.typeaheadfindsea.enabletimeout",
- &isTimeoutEnabled);
- PRInt32 timeoutLength = 0;
- if (isTimeoutEnabled) {
-- prefBranch->GetIntPref("accessibility.typeaheadfind.timeout",
-+ prefBranch->GetIntPref("accessibility.typeaheadfindsea.timeout",
- &timeoutLength);
- }
- mTimeoutLength = timeoutLength;
-@@ -349,7 +349,7 @@
- // ------- nsITimer Methods (1) ---------------
-
- NS_IMETHODIMP
--nsTypeAheadFind::Notify(nsITimer *timer)
-+nsTypeAheadFindSea::Notify(nsITimer *timer)
- {
- CancelFind();
- return NS_OK;
-@@ -358,7 +358,7 @@
- // ----------- nsIObserver Methods (1) -------------------
-
- NS_IMETHODIMP
--nsTypeAheadFind::Observe(nsISupports *aSubject, const char *aTopic,
-+nsTypeAheadFindSea::Observe(nsISupports *aSubject, const char *aTopic,
- const PRUnichar *aData)
- {
- PRBool isOpening;
-@@ -476,7 +476,7 @@
-
-
- nsresult
--nsTypeAheadFind::UseInWindow(nsIDOMWindow *aDOMWin)
-+nsTypeAheadFindSea::UseInWindow(nsIDOMWindow *aDOMWin)
- {
- NS_ENSURE_ARG_POINTER(aDOMWin);
-
-@@ -529,7 +529,7 @@
- // ------- nsIDOMEventListener Methods (1) ---------------
-
- NS_IMETHODIMP
--nsTypeAheadFind::HandleEvent(nsIDOMEvent* aEvent)
-+nsTypeAheadFindSea::HandleEvent(nsIDOMEvent* aEvent)
- {
- nsAutoString eventType;
- aEvent->GetType(eventType);
-@@ -589,21 +589,21 @@
- // ------- nsIDOMKeyListener Methods (3) ---------------
-
- NS_IMETHODIMP
--nsTypeAheadFind::KeyDown(nsIDOMEvent* aEvent)
-+nsTypeAheadFindSea::KeyDown(nsIDOMEvent* aEvent)
- {
- return NS_OK;
- }
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::KeyUp(nsIDOMEvent* aEvent)
-+nsTypeAheadFindSea::KeyUp(nsIDOMEvent* aEvent)
- {
- return NS_OK;
- }
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::KeyPress(nsIDOMEvent* aEvent)
-+nsTypeAheadFindSea::KeyPress(nsIDOMEvent* aEvent)
- {
- if (!mIsTypeAheadOn || mIsMenuBarActive || mIsMenuPopupActive) {
- return NS_OK;
-@@ -733,7 +733,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::BackOneChar(PRBool *aIsBackspaceUsed)
-+nsTypeAheadFindSea::BackOneChar(PRBool *aIsBackspaceUsed)
- {
- if (!mFocusedDocSelection) {
- *aIsBackspaceUsed = PR_FALSE;
-@@ -863,7 +863,7 @@
-
-
- nsresult
--nsTypeAheadFind::HandleChar(PRUnichar aChar)
-+nsTypeAheadFindSea::HandleChar(PRUnichar aChar)
- {
- // Add a printable char to mTypeAheadBuffer, then search for buffer
contents
-
-@@ -1039,7 +1039,7 @@
-
-
- void
--nsTypeAheadFind::SaveFind()
-+nsTypeAheadFindSea::SaveFind()
- {
- // Store find string for find-next
- mFindNextBuffer = mTypeAheadBuffer;
-@@ -1060,14 +1060,14 @@
- mFindService->SetSearchString(mFindNextBuffer);
- }
-
-- // --- If accessibility.typeaheadfind.timeout is set,
-+ // --- If accessibility.typeaheadfindsea.timeout is set,
- // cancel find after specified # milliseconds ---
- StartTimeout();
- }
-
-
- void
--nsTypeAheadFind::PlayNotFoundSound()
-+nsTypeAheadFindSea::PlayNotFoundSound()
- {
- if (mNotFoundSoundURL.IsEmpty()) // no sound
- return;
-@@ -1097,7 +1097,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::HandleText(nsIDOMEvent* aTextEvent)
-+nsTypeAheadFindSea::HandleText(nsIDOMEvent* aTextEvent)
- {
- // This is called multiple times in the middle of an
- // IME composition
-@@ -1145,7 +1145,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::HandleStartComposition(nsIDOMEvent* aCompositionEvent)
-+nsTypeAheadFindSea::HandleStartComposition(nsIDOMEvent* aCompositionEvent)
- {
- // This is called once at the start of an IME composition
-
-@@ -1167,7 +1167,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::HandleEndComposition(nsIDOMEvent* aCompositionEvent)
-+nsTypeAheadFindSea::HandleEndComposition(nsIDOMEvent* aCompositionEvent)
- {
- // This is called once at the end of an IME composition
-
-@@ -1198,28 +1198,28 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::HandleQueryComposition(nsIDOMEvent* aCompositionEvent)
-+nsTypeAheadFindSea::HandleQueryComposition(nsIDOMEvent* aCompositionEvent)
- {
- return NS_OK;
- }
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::HandleQueryReconversion(nsIDOMEvent* aCompositionEvent)
-+nsTypeAheadFindSea::HandleQueryReconversion(nsIDOMEvent* aCompositionEvent)
- {
- return NS_OK;
- }
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::HandleQueryCaretRect(nsIDOMEvent* aCompositionEvent)
-+nsTypeAheadFindSea::HandleQueryCaretRect(nsIDOMEvent* aCompositionEvent)
- {
- return NS_OK;
- }
-
-
- nsresult
--nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell,
-+nsTypeAheadFindSea::FindItNow(nsIPresShell *aPresShell,
- PRBool aIsRepeatingSameChar, PRBool aIsLinksOnly,
- PRBool aIsFirstVisiblePreferred)
- {
-@@ -1241,7 +1241,7 @@
-
- nsCOMPtr<nsISupports> startingContainer = presContext->GetContainer();
- nsCOMPtr<nsIDocShellTreeItem>
treeItem(do_QueryInterface(startingContainer));
-- NS_ASSERTION(treeItem, "Bug 175321 Crashes with Type Ahead Find [@
nsTypeAheadFind::FindItNow]");
-+ NS_ASSERTION(treeItem, "Bug 175321 Crashes with Type Ahead Find [@
nsTypeAheadFindSea::FindItNow]");
- if (!treeItem) {
- return NS_ERROR_FAILURE;
- }
-@@ -1465,7 +1465,7 @@
-
-
- nsresult
--nsTypeAheadFind::GetSearchContainers(nsISupports *aContainer,
-+nsTypeAheadFindSea::GetSearchContainers(nsISupports *aContainer,
- PRBool aIsRepeatingSameChar,
- PRBool aIsFirstVisiblePreferred,
- PRBool aCanUseDocSelection,
-@@ -1573,7 +1573,7 @@
-
-
- void
--nsTypeAheadFind::RangeStartsInsideLink(nsIDOMRange *aRange,
-+nsTypeAheadFindSea::RangeStartsInsideLink(nsIDOMRange *aRange,
- nsIPresShell *aPresShell,
- PRBool *aIsInsideLink,
- PRBool *aIsStartingLink)
-@@ -1680,7 +1680,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::ScrollPositionWillChange(nsIScrollableView *aView,
-+nsTypeAheadFindSea::ScrollPositionWillChange(nsIScrollableView *aView,
- nscoord aX, nscoord aY)
- {
- return NS_OK;
-@@ -1688,7 +1688,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::ScrollPositionDidChange(nsIScrollableView *aScrollableView,
-+nsTypeAheadFindSea::ScrollPositionDidChange(nsIScrollableView
*aScrollableView,
- nscoord aX, nscoord aY)
- {
- if (!mIsFindingText)
-@@ -1699,7 +1699,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::NotifySelectionChanged(nsIDOMDocument *aDoc,
-+nsTypeAheadFindSea::NotifySelectionChanged(nsIDOMDocument *aDoc,
- nsISelection *aSel, PRInt16 aReason)
- {
- if (!mIsFindingText) {
-@@ -1716,10 +1716,10 @@
- }
-
-
--// ---------------- nsITypeAheadFind --------------------
-+// ---------------- nsITypeAheadFindSea --------------------
-
- NS_IMETHODIMP
--nsTypeAheadFind::FindNext(PRBool aFindBackwards,
nsISupportsInterfacePointer *aCallerWindowSupports)
-+nsTypeAheadFindSea::FindNext(PRBool aFindBackwards,
nsISupportsInterfacePointer *aCallerWindowSupports)
- {
- NS_ENSURE_TRUE(aCallerWindowSupports, NS_ERROR_FAILURE);
-
-@@ -1731,7 +1731,7 @@
- return NS_OK;
- }
-
-- // Compare the top level content pres shell of typeaheadfind
-+ // Compare the top level content pres shell of typeaheadfindsea
- // with the top level content pres shell window where find next is
happening
- // If they're different, exit so that webbrowswerfind can handle
FindNext()
-
-@@ -1764,7 +1764,7 @@
- NS_ENSURE_TRUE(callerPresShell, NS_OK);
-
- if (callerPresShell != typeAheadPresShell) {
-- // This means typeaheadfind is active in a different window or doc
-+ // This means typeaheadfindsea is active in a different window or doc
- // So it's not appropriate to find next for the current window
- mFindNextBuffer.Truncate();
- return NS_OK;
-@@ -1782,7 +1782,7 @@
- webBrowserFind->GetSearchString(getter_Copies(webBrowserFindString));
- if (!webBrowserFindString.Equals(mFindNextBuffer)) {
- // If they're not equal, then the find dialog was used last,
-- // not typeaheadfind. Typeaheadfind applies to the last find,
-+ // not typeaheadfindsea. Typeaheadfind applies to the last find,
- // so we should let nsIWebBrowserFind::FindNext() do it.
- mFindNextBuffer.Truncate();
- return NS_OK;
-@@ -1832,7 +1832,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::GetIsActive(PRBool *aIsActive)
-+nsTypeAheadFindSea::GetIsActive(PRBool *aIsActive)
- {
- *aIsActive = mLinksOnlyManuallySet || !mTypeAheadBuffer.IsEmpty();
-
-@@ -1845,7 +1845,7 @@
- */
-
- NS_IMETHODIMP
--nsTypeAheadFind::StartNewFind(nsIDOMWindow *aWindow, PRBool aLinksOnly)
-+nsTypeAheadFindSea::StartNewFind(nsIDOMWindow *aWindow, PRBool aLinksOnly)
- {
- if (!mFind || !mIsTypeAheadOn || !aWindow)
- return NS_ERROR_FAILURE; // Type Ahead Find not correctly initialized
-@@ -1878,7 +1878,7 @@
- }
-
- void
--nsTypeAheadFind::ResetGlobalAutoStart(PRBool aAutoStart)
-+nsTypeAheadFindSea::ResetGlobalAutoStart(PRBool aAutoStart)
- {
- // Enumerate through the current top level windows
- // and either attach or remove window listeners
-@@ -1916,7 +1916,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::SetAutoStart(nsIDOMWindow *aDOMWin, PRBool aAutoStartOn)
-+nsTypeAheadFindSea::SetAutoStart(nsIDOMWindow *aDOMWin, PRBool aAutoStartOn)
- {
- if (!aDOMWin) {
- return NS_ERROR_FAILURE;
-@@ -1946,7 +1946,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::GetAutoStart(nsIDOMWindow *aDOMWin, PRBool *aIsAutoStartOn)
-+nsTypeAheadFindSea::GetAutoStart(nsIDOMWindow *aDOMWin, PRBool
*aIsAutoStartOn)
- {
- *aIsAutoStartOn = PR_FALSE;
-
-@@ -2014,7 +2014,7 @@
-
-
- NS_IMETHODIMP
--nsTypeAheadFind::CancelFind()
-+nsTypeAheadFindSea::CancelFind()
- {
- // Stop current find if:
- // 1. Escape pressed
-@@ -2070,7 +2070,7 @@
- // ------- Helper Methods ---------------
-
- void
--nsTypeAheadFind::GetTopContentPresShell(nsIDocShellTreeItem
*aDocShellTreeItem,
-+nsTypeAheadFindSea::GetTopContentPresShell(nsIDocShellTreeItem
*aDocShellTreeItem,
- nsIPresShell **aPresShell)
- {
- *aPresShell = nsnull;
-@@ -2086,7 +2086,7 @@
- }
-
- void
--nsTypeAheadFind::GetStartWindow(nsIDOMWindow *aWindow, nsIDOMWindow
**aStartWindow)
-+nsTypeAheadFindSea::GetStartWindow(nsIDOMWindow *aWindow, nsIDOMWindow
**aStartWindow)
- {
- // Return the root ancestor content window of aWindow
-
-@@ -2118,7 +2118,7 @@
- }
-
- nsresult
--nsTypeAheadFind::GetWebBrowserFind(nsIDOMWindow *aWin,
-+nsTypeAheadFindSea::GetWebBrowserFind(nsIDOMWindow *aWin,
- nsIWebBrowserFind **aWebBrowserFind)
- {
- NS_ENSURE_ARG_POINTER(aWin);
-@@ -2143,7 +2143,7 @@
-
-
- void
--nsTypeAheadFind::StartTimeout()
-+nsTypeAheadFindSea::StartTimeout()
- {
- if (mTimeoutLength) {
- if (!mTimer) {
-@@ -2159,7 +2159,7 @@
- }
-
- void
--nsTypeAheadFind::SetSelectionLook(nsIPresShell *aPresShell,
-+nsTypeAheadFindSea::SetSelectionLook(nsIPresShell *aPresShell,
- PRBool aChangeColor,
- PRBool aEnabled)
- {
-@@ -2167,8 +2167,8 @@
- return;
-
- // Show caret when type ahead find is on
-- // Also paint selection bright (typeaheadfind on) or normal
-- // (typeaheadfind off)
-+ // Also paint selection bright (typeaheadfindsea on) or normal
-+ // (typeaheadfindsea off)
-
- if (aChangeColor) {
-
mFocusedDocSelCon->SetDisplaySelection(nsISelectionController::SELECTION_ATTENTION);
-@@ -2211,7 +2211,7 @@
-
-
- void
--nsTypeAheadFind::RemoveDocListeners()
-+nsTypeAheadFindSea::RemoveDocListeners()
- {
- nsCOMPtr<nsIPresShell> presShell(GetPresShell());
- nsIViewManager* vm = nsnull;
-@@ -2245,7 +2245,7 @@
-
-
- void
--nsTypeAheadFind::AttachDocListeners(nsIPresShell *aPresShell)
-+nsTypeAheadFindSea::AttachDocListeners(nsIPresShell *aPresShell)
- {
- if (!aPresShell) {
- return;
-@@ -2275,7 +2275,7 @@
-
-
- void
--nsTypeAheadFind::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
-+nsTypeAheadFindSea::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
- {
- nsCOMPtr<nsIDOMEventTarget> chromeEventHandler;
- GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler));
-@@ -2332,7 +2332,7 @@
-
-
- void
--nsTypeAheadFind::AttachWindowListeners(nsIDOMWindow *aDOMWin)
-+nsTypeAheadFindSea::AttachWindowListeners(nsIDOMWindow *aDOMWin)
- {
- nsCOMPtr<nsIDOMEventTarget> chromeEventHandler;
- GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler));
-@@ -2385,7 +2385,7 @@
-
-
- void
--nsTypeAheadFind::GetChromeEventHandler(nsIDOMWindow *aDOMWin,
-+nsTypeAheadFindSea::GetChromeEventHandler(nsIDOMWindow *aDOMWin,
- nsIDOMEventTarget **aChromeTarget)
- {
- nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aDOMWin));
-@@ -2401,7 +2401,7 @@
- }
-
- PRBool
--nsTypeAheadFind::IsTargetContentOkay(nsIContent *aContent)
-+nsTypeAheadFindSea::IsTargetContentOkay(nsIContent *aContent)
- {
- if (!aContent) {
- return PR_FALSE;
-@@ -2439,7 +2439,7 @@
-
-
- nsresult
--nsTypeAheadFind::GetTargetIfTypeAheadOkay(nsIDOMEvent *aEvent,
-+nsTypeAheadFindSea::GetTargetIfTypeAheadOkay(nsIDOMEvent *aEvent,
- nsIContent **aTargetContent,
- nsIPresShell **aTargetPresShell)
- {
-@@ -2522,7 +2522,7 @@
-
-
- void
--nsTypeAheadFind::GetSelection(nsIPresShell *aPresShell,
-+nsTypeAheadFindSea::GetSelection(nsIPresShell *aPresShell,
- nsISelectionController **aSelCon,
- nsISelection **aDOMSel)
- {
-@@ -2544,7 +2544,7 @@
-
-
- PRBool
--nsTypeAheadFind::IsRangeVisible(nsIPresShell *aPresShell,
-+nsTypeAheadFindSea::IsRangeVisible(nsIPresShell *aPresShell,
- nsPresContext *aPresContext,
- nsIDOMRange *aRange, PRBool
aMustBeInViewPort,
- PRBool aGetTopVisibleLeaf,
-@@ -2698,7 +2698,7 @@
-
-
- nsresult
--nsTypeAheadFind::GetTranslatedString(const nsAString& aKey,
-+nsTypeAheadFindSea::GetTranslatedString(const nsAString& aKey,
- nsAString& aStringOut)
- {
- nsXPIDLString xsValue;
-@@ -2716,7 +2716,7 @@
-
-
- void
--nsTypeAheadFind::DisplayStatus(PRBool aSuccess, nsIContent *aFocusedContent,
-+nsTypeAheadFindSea::DisplayStatus(PRBool aSuccess, nsIContent
*aFocusedContent,
- PRBool aClearStatus, const PRUnichar *aText)
- {
- // pres shell -> pres context -> container -> tree item ->
-@@ -2863,7 +2863,7 @@
- // Make sure we're not focused on a text field, listbox
- // or other form control that needs typeahead keystrokes
- if (focusedContent) {
-- *aResult = nsTypeAheadFind::IsTargetContentOkay(focusedContent);
-+ *aResult = nsTypeAheadFindSea::IsTargetContentOkay(focusedContent);
- return NS_OK;
- }
-
-@@ -2928,8 +2928,8 @@
- EnsureContentWindow(domWinInternal, getter_AddRefs(startContentWin));
- NS_ENSURE_TRUE(startContentWin, NS_ERROR_FAILURE);
-
-- nsCOMPtr<nsITypeAheadFind> typeAhead =
-- do_GetService(NS_TYPEAHEADFIND_CONTRACTID);
-+ nsCOMPtr<nsITypeAheadFindSea> typeAhead =
-+ do_GetService(NS_TYPEAHEADFINDSEA_CONTRACTID);
- NS_ENSURE_TRUE(typeAhead, NS_ERROR_FAILURE);
-
- return typeAhead->StartNewFind(startContentWin, isLinkSearch);
-@@ -3013,7 +3013,7 @@
- }
-
- already_AddRefed<nsIPresShell>
--nsTypeAheadFind::GetPresShell()
-+nsTypeAheadFindSea::GetPresShell()
- {
- if (!mFocusedWeakShell)
- return nsnull;
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.h
mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h
---- mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.h
2005-03-26 00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h 2005-03-26
11:39:29.000000000 -0500
-@@ -62,13 +62,13 @@
- #include "nsIDOMRange.h"
- #include "nsIDOMWindow.h"
- #include "nsIDocShellTreeItem.h"
--#include "nsITypeAheadFind.h"
-+#include "nsITypeAheadFindSea.h"
- #include "nsIStringBundle.h"
- #include "nsISupportsArray.h"
- #include "nsISound.h"
-
--#define TYPEAHEADFIND_BUNDLE_URL \
-- "chrome://global/locale/typeaheadfind.properties"
-+#define TYPEAHEADFINDSEA_BUNDLE_URL \
-+ "chrome://global/locale/typeaheadfindsea.properties"
- #define TYPEAHEADFIND_NOTFOUND_WAV_URL \
- "chrome://global/content/notfound.wav"
-
-@@ -82,7 +82,7 @@
-
- const int kMaxBadCharsBeforeCancel = 3;
-
--class nsTypeAheadFind : public nsITypeAheadFind,
-+class nsTypeAheadFindSea : public nsITypeAheadFindSea,
- public nsIDOMKeyListener,
- public nsIDOMTextListener,
- public nsIDOMCompositionListener,
-@@ -93,13 +93,13 @@
- public nsSupportsWeakReference
- {
- public:
-- nsTypeAheadFind();
-- virtual ~nsTypeAheadFind();
-+ nsTypeAheadFindSea();
-+ virtual ~nsTypeAheadFindSea();
-
-- NS_DEFINE_STATIC_CID_ACCESSOR(NS_TYPEAHEADFIND_CID);
-+ NS_DEFINE_STATIC_CID_ACCESSOR(NS_TYPEAHEADFINDSEA_CID);
-
- NS_DECL_ISUPPORTS
-- NS_DECL_NSITYPEAHEADFIND
-+ NS_DECL_NSITYPEAHEADFINDSEA
- NS_DECL_NSIOBSERVER
- NS_DECL_NSIDOMEVENTLISTENER
- NS_DECL_NSISELECTIONLISTENER
-@@ -127,7 +127,7 @@
- // ----- nsITimerCallback -----------------------------
- NS_DECL_NSITIMERCALLBACK
-
-- static nsTypeAheadFind *GetInstance();
-+ static nsTypeAheadFindSea *GetInstance();
- static void ReleaseInstance(void);
- static PRBool IsTargetContentOkay(nsIContent *aContent);
-
-@@ -185,7 +185,7 @@
- nsresult GetTranslatedString(const nsAString& aKey, nsAString&
aStringOut);
-
- // Used by GetInstance and ReleaseInstance
-- static nsTypeAheadFind *sInstance;
-+ static nsTypeAheadFindSea *sInstance;
-
- // Current find state
- nsString mTypeAheadBuffer;
-@@ -196,7 +196,7 @@
-
- // PRBool's are used instead of PRPackedBool's where the address of the
- // boolean variable is getting passed into a method. For example:
-- // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
-+ // GetBoolPref("accessibility.typeaheadfindsea.linksonly",
&mLinksOnlyPref);
- PRBool mIsFindAllowedInWindow;
- PRBool mAutoStartPref;
- PRBool mLinksOnlyPref;
-@@ -251,7 +251,7 @@
- nsCOMPtr<nsIDOMWindow> mFocusedWindow;
- nsCOMPtr<nsIWeakReference> mFocusedWeakShell;
-
-- // Windows where typeaheadfind doesn't auto start as the user types
-+ // Windows where typeaheadfindsea doesn't auto start as the user types
- nsCOMPtr<nsISupportsArray> mManualFindWindows;
- };
-
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp
mozilla/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp
----
mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp
2005-03-26 00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp
2005-03-26 11:39:40.000000000 -0500
-@@ -55,7 +55,7 @@
-
- // This function is called at component registration time
- static NS_METHOD
--nsTypeAheadFindRegistrationProc(nsIComponentManager *aCompMgr, nsIFile
*aPath,
-+nsTypeAheadFindSeaRegistrationProc(nsIComponentManager *aCompMgr, nsIFile
*aPath,
- const char *registryLocation,
- const char *componentType,
- const nsModuleComponentInfo *info)
-@@ -64,7 +64,7 @@
- // an application component. This makes sure that we're
- // initialized on application startup.
-
-- // Register nsTypeAheadFind to be instantiated on startup.
-+ // Register nsTypeAheadFindSea to be instantiated on startup.
- // XXX This is needed on linux, but for some reason not needed on win32.
- nsresult rv;
- nsCOMPtr<nsICategoryManager> categoryManager =
-@@ -74,7 +74,7 @@
- rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY,
-- "Type Ahead Find",
-+ "Type Ahead Find Sea",
- "service,"
-- NS_TYPEAHEADFIND_CONTRACTID,
-+ NS_TYPEAHEADFINDSEA_CONTRACTID,
- PR_TRUE, PR_TRUE, nsnull);
- }
-
-@@ -82,22 +82,22 @@
- }
-
-
--NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsTypeAheadFind,
-- nsTypeAheadFind::GetInstance)
-+NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsTypeAheadFindSea,
-+ nsTypeAheadFindSea::GetInstance)
-
- static void PR_CALLBACK
--TypeAheadFindModuleDtor(nsIModule* self)
-+TypeAheadFindSeaModuleDtor(nsIModule* self)
- {
-- nsTypeAheadFind::ReleaseInstance();
-+ nsTypeAheadFindSea::ReleaseInstance();
- }
-
- static const nsModuleComponentInfo components[] =
- {
-- { "TypeAheadFind Component", NS_TYPEAHEADFIND_CID,
-- NS_TYPEAHEADFIND_CONTRACTID, nsTypeAheadFindConstructor,
-- nsTypeAheadFindRegistrationProc, nsnull // Unregistration proc
-+ { "TypeAheadFindSea Component", NS_TYPEAHEADFINDSEA_CID,
-+ NS_TYPEAHEADFINDSEA_CONTRACTID, nsTypeAheadFindSeaConstructor,
-+ nsTypeAheadFindSeaRegistrationProc, nsnull // Unregistration proc
- }
- };
-
--NS_IMPL_NSGETMODULE_WITH_DTOR(nsTypeAheadFind, components,
-- TypeAheadFindModuleDtor)
-+NS_IMPL_NSGETMODULE_WITH_DTOR(nsTypeAheadFindSea, components,
-+ TypeAheadFindSeaModuleDtor)
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/src/typeaheadfind.pkg
mozilla/extensions/typeaheadfind/src/typeaheadfind.pkg
---- mozilla.orig/extensions/typeaheadfind/src/typeaheadfind.pkg
2005-03-26 00:12:02.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/src/typeaheadfind.pkg 1969-12-31
19:00:00.000000000 -0500
-@@ -1,9 +0,0 @@
--# why not ship this with GRE/embedding, if we're building it?
--
--[xpfe-browser browser]
--#if SHARED_LIBRARY
--dist/bin/components/@SHARED_LIBRARY@
--#else
--!staticcomp @LIBRARY@ @MODULE_NAME@
--#endif
--!xpt dist/bin/components/typeaheadfind.xpt
-diff -urN --exclude=CVS
mozilla.orig/extensions/typeaheadfind/src/typeaheadfindsea.pkg
mozilla/extensions/typeaheadfind/src/typeaheadfindsea.pkg
---- mozilla.orig/extensions/typeaheadfind/src/typeaheadfindsea.pkg
1969-12-31 19:00:00.000000000 -0500
-+++ mozilla/extensions/typeaheadfind/src/typeaheadfindsea.pkg 2005-03-26
11:39:29.000000000 -0500
-@@ -0,0 +1,9 @@
-+# why not ship this with GRE/embedding, if we're building it?
-+
-+[xpfe-browser browser]
-+#if SHARED_LIBRARY
-+dist/bin/components/@SHARED_LIBRARY@
-+#else
-+!staticcomp @LIBRARY@ @MODULE_NAME@
-+#endif
-+!xpt dist/bin/components/typeaheadfindsea.xpt
diff --git a/http/firefox/firefox-1.1-uriloader.patch
b/http/firefox/firefox-1.1-uriloader.patch
deleted file mode 100644
index 08c7e96..0000000
--- a/http/firefox/firefox-1.1-uriloader.patch
+++ /dev/null
@@ -1,459 +0,0 @@
-Index: uriloader/exthandler/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v
-retrieving revision 1.60
-diff -d -u -p -r1.60 Makefile.in
---- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60
-+++ uriloader/exthandler/Makefile.in 21 Jul 2005 03:07:39 -0000
-@@ -102,7 +102,7 @@ endif
- LOCAL_INCLUDES = -I$(srcdir)
-
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
--OSHELPER += nsGNOMERegistry.cpp
-+OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
- endif
-
- ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v
-retrieving revision 1.10
-diff -d -u -p -r1.10 nsGNOMERegistry.cpp
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp 16 Oct 2004 13:46:17
-0000 1.10
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 21 Jul 2005 03:07:40
-0000
-@@ -42,7 +42,7 @@
- #include "nsString.h"
- #include "nsIComponentManager.h"
- #include "nsILocalFile.h"
--#include "nsMIMEInfoImpl.h"
-+#include "nsMIMEInfoUnix.h"
- #include "nsAutoPtr.h"
-
- #include <glib.h>
-@@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient;
- typedef struct _GnomeProgram GnomeProgram;
- typedef struct _GnomeModuleInfo GnomeModuleInfo;
-
--typedef struct {
-+struct GnomeVFSMimeApplication {
- char *id;
- char *name;
- char *command;
- /* there is more here, but we don't need it */
--} GnomeVFSMimeApplication;
-+};
-
- typedef GConfClient * (*_gconf_client_get_default_fn)();
- typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
-@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con
- }
-
-
--/* static */ already_AddRefed<nsMIMEInfoBase>
-+/* static */ already_AddRefed<nsMIMEInfoUnix>
- nsGNOMERegistry::GetFromExtension(const char *aFileExt)
- {
- if (!gconfLib)
-@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const
- return GetFromType(mimeType);
- }
-
--/* static */ already_AddRefed<nsMIMEInfoBase>
-+/* static */ already_AddRefed<nsMIMEInfoUnix>
- nsGNOMERegistry::GetFromType(const char *aMIMEType)
- {
- if (!gconfLib)
-@@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char
- if (!handlerApp)
- return nsnull;
-
-- nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
-+ nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
- NS_ENSURE_TRUE(mimeInfo, nsnull);
-
-+ mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp);
-+
- // Get the list of extensions and append then to the mimeInfo.
- GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType);
- for (GList *extension = extensions; extension; extension =
extension->next)
-@@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char
- return nsnull;
- }
-
-- gchar *commandPath = g_find_program_in_path(nativeCommand);
-+ gchar **argv;
-+ gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
-+ if (!res) {
-+ NS_ERROR("Could not convert helper app command to filesystem encoding");
-+ _gnome_vfs_mime_application_free(handlerApp);
-+ return nsnull;
-+ }
-+
-+ gchar *commandPath = g_find_program_in_path(argv[0]);
-
- g_free(nativeCommand);
-+ g_strfreev(argv);
-
- if (!commandPath) {
-+ NS_WARNING("could not find command in path");
- _gnome_vfs_mime_application_free(handlerApp);
- return nsnull;
- }
-@@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char
-
- _gnome_vfs_mime_application_free(handlerApp);
-
-- nsMIMEInfoBase* retval;
-+ nsMIMEInfoUnix* retval;
- NS_ADDREF((retval = mimeInfo));
- return retval;
- }
-Index: uriloader/exthandler/unix/nsGNOMERegistry.h
-===================================================================
-RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v
-retrieving revision 1.3
-diff -d -u -p -r1.3 nsGNOMERegistry.h
---- uriloader/exthandler/unix/nsGNOMERegistry.h 16 Oct 2004 13:46:17
-0000 1.3
-+++ uriloader/exthandler/unix/nsGNOMERegistry.h 21 Jul 2005 03:07:40
-0000
-@@ -35,10 +35,13 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
-+#ifndef nsGNOMERegistry_h__
-+#define nsGNOMERegistry_h__
-+
- #include "nsIURI.h"
- #include "nsCOMPtr.h"
-
--class nsMIMEInfoBase;
-+class nsMIMEInfoUnix;
-
- class nsGNOMERegistry
- {
-@@ -52,7 +55,9 @@ class nsGNOMERegistry
- static void GetAppDescForScheme(const nsACString& aScheme,
- nsAString& aDesc);
-
-- static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char
*aFileExt);
-+ static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char
*aFileExt);
-
-- static already_AddRefed<nsMIMEInfoBase> GetFromType(const char
*aMIMEType);
-+ static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char
*aMIMEType);
- };
-+
-+#endif // nsGNOMERegistry_h__
-Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-===================================================================
-RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 21 Jul 2005 03:07:40
-0000
-@@ -0,0 +1,196 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.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.org Code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Red Hat, Inc.
-+ * Portions created by the Initial Developer are Copyright (C) 2005
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Christopher Aillon <caillon AT redhat.com> (Original author)
-+ *
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#include "nsMIMEInfoUnix.h"
-+#include "prlink.h"
-+#include "prmem.h"
-+#include <glib.h>
-+#include <glib-object.h>
-+
-+static PRLibrary *gnomeLib;
-+static PRLibrary *vfsLib;
-+
-+typedef struct _GnomeProgram GnomeProgram;
-+typedef struct _GnomeModuleInfo GnomeModuleInfo;
-+
-+typedef enum {
-+ GNOME_VFS_OK // there's more but we don't care about them.
-+} GnomeVFSResult;
-+
-+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
-+ (GnomeVFSMimeApplication *app,
-+ GList *uris);
-+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication
*);
-+typedef GnomeVFSMimeApplication *
(*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
-+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
-+ const GnomeModuleInfo *, int,
-+ char **, const char *, ...);
-+typedef const char *
(*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
-+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
-+typedef GnomeProgram * (*_gnome_program_get_fn)();
-+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
-+
-+#define DECL_FUNC_PTR(func) static _##func##_fn _##func
-+
-+DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
-+DECL_FUNC_PTR(gnome_vfs_mime_application_free);
-+DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
-+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
-+DECL_FUNC_PTR(gnome_program_init);
-+DECL_FUNC_PTR(gnome_program_get);
-+DECL_FUNC_PTR(libgnome_module_info_get);
-+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
-+
-+static PRLibrary *
-+LoadVersionedLibrary(const char* libName, const char* libVersion)
-+{
-+ char *platformLibName = PR_GetLibraryName(nsnull, libName);
-+ nsCAutoString versionLibName(platformLibName);
-+ versionLibName.Append(libVersion);
-+ PR_Free(platformLibName);
-+ return PR_LoadLibrary(versionLibName.get());
-+}
-+
-+static void
-+Cleanup()
-+{
-+ // Unload all libraries
-+ if (gnomeLib)
-+ PR_UnloadLibrary(gnomeLib);
-+ if (vfsLib)
-+ PR_UnloadLibrary(vfsLib);
-+
-+ gnomeLib = vfsLib = nsnull;
-+}
-+
-+static void
-+InitGnomeVFS()
-+{
-+ static PRBool initialized = PR_FALSE;
-+
-+ if (initialized)
-+ return;
-+
-+ #define ENSURE_LIB(lib) \
-+ PR_BEGIN_MACRO \
-+ if (!lib) { \
-+ Cleanup(); \
-+ return; \
-+ } \
-+ PR_END_MACRO
-+
-+ #define GET_LIB_FUNCTION(lib, func, failure) \
-+ PR_BEGIN_MACRO \
-+ _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
-+ if (!_##func) { \
-+ failure; \
-+ } \
-+ PR_END_MACRO
-+
-+ // Attempt to open libgnome
-+ gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+ ENSURE_LIB(gnomeLib);
-+
-+ GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
-+ GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
-+ GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
-+
-+ // Attempt to open libgnomevfs
-+ vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+ ENSURE_LIB(vfsLib);
-+
-+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing
*/);
-+ GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
-+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return
Cleanup());
-+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
-+ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
-+
-+ // Initialize GNOME, if it's not already initialized. It's not
-+ // necessary to tell GNOME about our actual command line arguments.
-+
-+ if (!_gnome_program_get()) {
-+ char *argv[1] = { "gecko" };
-+ _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
-+ 1, argv, NULL);
-+ }
-+
-+ // Note: after GNOME has been initialized, do not ever unload these
-+ // libraries. They register atexit handlers, so if they are unloaded,
we'll
-+ // crash on exit.
-+}
-+
-+void
-+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication*
app)
-+{
-+ if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free)
{
-+ mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
-+
-+ mPreferredAction = nsIMIMEInfo::useSystemDefault;
-+
-+ const gchar * name =
_gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
-+ if (name)
-+ mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
-+ }
-+}
-+
-+nsMIMEInfoUnix::~nsMIMEInfoUnix()
-+{
-+ if (mDefaultVFSApplication)
-+ _gnome_vfs_mime_application_free(mDefaultVFSApplication);
-+}
-+
-+nsresult
-+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
-+{
-+ NS_ENSURE_ARG_POINTER(aFile);
-+
-+ InitGnomeVFS();
-+
-+ if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
-+ nsCAutoString nativePath;
-+ aFile->GetNativePath(nativePath);
-+
-+ gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
-+
-+ GList *uris = NULL;
-+ uris = g_list_append(uris, uri);
-+
-+ GnomeVFSResult result =
_gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
-+
-+ g_free(uri);
-+ g_list_free(uris);
-+
-+ if (result != GNOME_VFS_OK)
-+ return NS_ERROR_FAILURE;
-+
-+ return NS_OK;
-+ }
-+
-+ if (!mDefaultApplication)
-+ return NS_ERROR_FILE_NOT_FOUND;
-+
-+ return LaunchWithIProcess(mDefaultApplication, aFile);
-+}
-Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h
-===================================================================
-RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h
-diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 21 Jul 2005 03:07:40 -0000
-@@ -0,0 +1,50 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.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.org Code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Red Hat, Inc.
-+ * Portions created by the Initial Developer are Copyright (C) 2005
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Christopher Aillon <caillon AT redhat.com> (Original author)
-+ *
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef nsMimeInfoUnix_h__
-+#define nsMimeInfoUnix_h__
-+
-+#include "nsMIMEInfoImpl.h"
-+
-+struct GnomeVFSMimeApplication;
-+
-+class nsMIMEInfoUnix : public nsMIMEInfoImpl
-+{
-+public:
-+ nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType),
mDefaultVFSApplication(nsnull) {}
-+ nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType)
{};
-+
-+ virtual ~nsMIMEInfoUnix();
-+
-+ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
-+
-+protected:
-+ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
-+
-+ GnomeVFSMimeApplication *mDefaultVFSApplication;
-+};
-+
-+#endif // nsMimeInfoUnix_h__
-Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp
-===================================================================
-RCS file:
/cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v
-retrieving revision 1.58
-diff -d -u -p -r1.58 nsOSHelperAppService.cpp
---- uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01
-0000 1.58
-+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 21 Jul 2005 03:07:40
-0000
-@@ -44,6 +44,7 @@
- #include "nsOSHelperAppService.h"
- #ifdef MOZ_WIDGET_GTK2
- #include "nsGNOMERegistry.h"
-+#include "nsMIMEInfoUnix.h"
- #endif
- #include "nsISupports.h"
- #include "nsString.h"
-@@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const
-
- LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get()));
-
-+#ifdef MOZ_WIDGET_GTK2
-+ // Look in GNOME registry first since it is the preferred method in GNOME,
-+ // should trump the mailcap entry
-+ LOG(("Looking in GNOME registry\n"));
-+ nsMIMEInfoBase *gnomeInfo =
nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
-+ if (gnomeInfo) {
-+ LOG(("Got MIMEInfo from GNOME registry\n"));
-+ return gnomeInfo;
-+ }
-+#endif
-+
- // extract the major and minor types
- NS_ConvertASCIItoUTF16 mimeType(aMIMEType);
- nsAString::const_iterator start_iter, end_iter,
-@@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const
- mozillaFlags,
- PR_TRUE);
-
--
-- if (handler.IsEmpty() && extensions.IsEmpty() &&
-- mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) {
-- // No useful data yet
--
--#ifdef MOZ_WIDGET_GTK2
-- LOG(("Looking in GNOME registry\n"));
-- nsMIMEInfoBase *gnomeInfo =
nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
-- if (gnomeInfo) {
-- LOG(("Got MIMEInfo from GNOME registry\n"));
-- return gnomeInfo;
-- }
--#endif
-- }
--
- if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
- DoLookUpHandlerAndDescription(majorType,
- minorType,
diff --git a/http/firefox/firefox-1.1-visibility.patch
b/http/firefox/firefox-1.1-visibility.patch
deleted file mode 100644
index e0665fe..0000000
--- a/http/firefox/firefox-1.1-visibility.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvsroot/mozilla/configure,v
-retrieving revision 1.1443
-diff -u -p -6 -r1.1443 configure
---- configure 2 Jun 2005 04:00:20 -0000 1.1443
-+++ configure 6 Jun 2005 07:34:06 -0000
-@@ -7303,13 +7303,13 @@ else
- int foo_default = 1;
- EOF
- ac_cv_visibility_pragma=no
- if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
- if grep '\.hidden.*foo_hidden' conftest.s
>/dev/null; then
- if ! grep '\.hidden.*foo_default' conftest.s >
/dev/null; then
-- ac_cv_visibility_pragma=yes
-+ ac_cv_visibility_pragma=no
- fi
- fi
- fi
- rm -f conftest.cs
-
- fi
diff --git a/http/firefox/firefox-init.patch b/http/firefox/firefox-init.patch
deleted file mode 100644
index f19f62c..0000000
--- a/http/firefox/firefox-init.patch
+++ /dev/null
@@ -1,1679 +0,0 @@
-diff -Nur firefox.orig/chrome/chrome.rdf firefox/chrome/chrome.rdf
---- firefox.orig/chrome/chrome.rdf 1970-01-01 01:00:00.000000000 +0100
-+++ firefox/chrome/chrome.rdf 2005-05-13 22:34:47.000000000 +0200
-@@ -0,0 +1,320 @@
-+<?xml version="1.0"?>
-+<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#";
-+ xmlns:NC="http://home.netscape.com/NC-rdf#";
-+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
-+ <RDF:Description RDF:about="urn:mozilla:skin:classic/1.0:communicator"
-+ c:skinVersion="1.5"
-+
c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/communicator/"
-+ c:allowScripts="false">
-+ <c:package RDF:resource="urn:mozilla:package:communicator"/>
-+ </RDF:Description>
-+ <RDF:Seq RDF:about="urn:mozilla:locale:root">
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US"/>
-+ </RDF:Seq>
-+ <RDF:Seq RDF:about="urn:mozilla:skin:classic/1.0:packages">
-+ <RDF:li RDF:resource="urn:mozilla:skin:classic/1.0:communicator"/>
-+ <RDF:li RDF:resource="urn:mozilla:skin:classic/1.0:global"/>
-+ <RDF:li RDF:resource="urn:mozilla:skin:classic/1.0:mozapps"/>
-+ <RDF:li RDF:resource="urn:mozilla:skin:classic/1.0:help"/>
-+ <RDF:li RDF:resource="urn:mozilla:skin:classic/1.0:inspector"/>
-+ <RDF:li RDF:resource="urn:mozilla:skin:classic/1.0:browser"/>
-+ </RDF:Seq>
-+ <RDF:Description RDF:about="urn:mozilla:package:mozapps"
-+
c:baseURL="jar:resource:/chrome/toolkit.jar!/content/mozapps/"
-+ c:locType="install"
-+ c:displayName="Mozilla Application Support"
-+ c:author="mozilla.org"
-+ c:name="mozapps"
-+ c:skinVersion="1.5"
-+ c:localeVersion="1.7" />
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:global-region"
-+ c:localeVersion="1.7"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/global-region/">
-+ <c:package RDF:resource="urn:mozilla:package:global-region"/>
-+ </RDF:Description>
-+ <RDF:Seq RDF:about="urn:mozilla:skin:root">
-+ <RDF:li RDF:resource="urn:mozilla:skin:modern/1.0"/>
-+ <RDF:li RDF:resource="urn:mozilla:skin:classic/1.0"/>
-+ </RDF:Seq>
-+ <RDF:Description RDF:about="urn:mozilla:package:browser-region"
-+
c:baseURL="jar:resource:/chrome/browser.jar!/content/browser-region/"
-+ c:locType="install"
-+ c:name="browser-region"
-+ c:localeVersion="0.9.9" />
-+ <RDF:Description RDF:about="urn:mozilla:package:help"
-+ c:baseURL="jar:resource:/chrome/help.jar!/content/help/"
-+ c:locType="install"
-+ c:name="help" />
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:global-platform"
-+ c:localeVersion="1.7"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/global-platform/">
-+ <c:package RDF:resource="urn:mozilla:package:global-platform"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:package:embed"
-+
c:baseURL="jar:resource:/chrome/embed-sample.jar!/content/embed/"
-+ c:locType="install"
-+ c:displayName="Embed"
-+ c:author="mozilla.org"
-+ c:name="embed" />
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:cookie"
-+ c:localeVersion="1.7"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/cookie/">
-+ <c:package RDF:resource="urn:mozilla:package:cookie"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:package:inspector"
-+ c:hasOverlays="true"
-+
c:baseURL="jar:resource:/chrome/inspector.jar!/content/inspector/"
-+ c:locType="install"
-+ c:displayName="Document Inspector"
-+ c:author="Joe Hewitt"
-+ c:name="inspector"
-+ c:localeVersion="1.7"
-+ c:skinVersion="1.5" />
-+ <RDF:Description RDF:about="urn:mozilla:package:pipnss"
-+
c:baseURL="jar:resource:/chrome/pipnss.jar!/content/pipnss/"
-+ c:locType="install"
-+ c:displayName="pipnss"
-+ c:author="PSM Team"
-+ c:name="pipnss"
-+ c:localeVersion="1.7" />
-+ <RDF:Description RDF:about="urn:mozilla:package:messenger"
-+ c:hasOverlays="true" />
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:pipnss"
-+ c:localeVersion="1.7"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/pipnss/">
-+ <c:package RDF:resource="urn:mozilla:package:pipnss"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:skin:classic/1.0:browser"
-+
c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/browser/"
-+ c:allowScripts="false"
-+ c:skinVersion="1.5">
-+ <c:package RDF:resource="urn:mozilla:package:browser"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:package:communicator"
-+ c:hasOverlays="true"
-+
c:baseURL="jar:resource:/chrome/comm.jar!/content/communicator/"
-+ c:locType="install"
-+ c:displayName="Communicator Shared"
-+ c:author="mozilla.org"
-+ c:name="communicator"
-+ c:localeVersion="1.7"
-+ c:skinVersion="1.5" />
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:inspector"
-+ c:localeVersion="1.7"
-+
c:baseURL="jar:resource:/chrome/inspector.jar!/locale/en-US/inspector/">
-+ <c:package RDF:resource="urn:mozilla:package:inspector"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:global"
-+ c:localeVersion="1.7"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/global/">
-+ <c:package RDF:resource="urn:mozilla:package:global"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:browser"
-+ c:localeVersion="0.9.9"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/browser/">
-+ <c:package RDF:resource="urn:mozilla:package:browser"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:package:global-platform"
-+
c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global-platform/"
-+ c:locType="install"
-+ c:displayName="Platform Specific"
-+ c:author="mozilla.org"
-+ c:name="global-platform"
-+ c:localeVersion="1.7"
-+ c:platformPackage="true" />
-+ <RDF:Description RDF:about="urn:mozilla:package:passwordmgr"
-+
c:baseURL="jar:resource:/chrome/toolkit.jar!/content/passwordmgr/"
-+ c:locType="install"
-+ c:displayName="Password Manager"
-+ c:author="mozilla.org"
-+ c:name="passwordmgr"
-+ c:localeVersion="1.7" />
-+ <RDF:Description RDF:about="urn:mozilla:skin:classic/1.0"
-+ c:name="classic/1.0"
-+ c:locType="install">
-+ <c:packages RDF:resource="urn:mozilla:skin:classic/1.0:packages"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:package:global"
-+
c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global/"
-+ c:locType="install"
-+ c:displayName="Toolkit"
-+ c:author="mozilla.org"
-+ c:name="global"
-+ c:localeVersion="1.7"
-+ c:skinVersion="1.5" />
-+ <RDF:Description RDF:about="urn:mozilla:skin:modern/1.0:embed"
-+
c:baseURL="jar:resource:/chrome/embed-sample.jar!/skin/classic/embed/"
-+ c:allowScripts="false">
-+ <c:package RDF:resource="urn:mozilla:package:embed"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:embed"
-+
c:baseURL="jar:resource:/chrome/embed-sample.jar!/locale/en-US/embed/">
-+ <c:package RDF:resource="urn:mozilla:package:embed"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:package:xbl-marquee"
-+
c:baseURL="jar:resource:/chrome/comm.jar!/content/xbl-marquee/"
-+ c:locType="install"
-+ c:displayName="XBL Marquee Emulation"
-+ c:author="Netscape Communications Corporation"
-+ c:name="xbl-marquee" />
-+ <RDF:Description RDF:about="urn:mozilla:package:autoconfig"
-+
c:baseURL="jar:resource:/chrome/comm.jar!/content/autoconfig/"
-+ c:locType="install"
-+ c:displayName="AutoConfig"
-+ c:author="mozilla.org"
-+ c:name="autoconfig"
-+ c:localeVersion="1.7" />
-+ <RDF:Description RDF:about="urn:mozilla:skin:classic/1.0:help"
-+
c:baseURL="jar:resource:/chrome/help.jar!/skin/classic/help/"
-+ c:allowScripts="false"
-+ c:skinVersion="1.5">
-+ <c:package RDF:resource="urn:mozilla:package:help"/>
-+ </RDF:Description>
-+ <RDF:Seq RDF:about="urn:mozilla:locale:en-US:packages">
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:embed"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:global"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:global-region"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:global-platform"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:necko"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:mozapps"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:passwordmgr"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:pippki"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:pipnss"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:help"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:inspector"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:browser"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:browser-region"/>
-+ <RDF:li RDF:resource="urn:mozilla:locale:en-US:cookie"/>
-+ </RDF:Seq>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:browser-region"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/browser-region/"
-+ c:localeVersion="0.9.9">
-+ <c:package RDF:resource="urn:mozilla:package:browser-region"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:pippki"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/pippki/"
-+ c:localeVersion="1.7">
-+ <c:package RDF:resource="urn:mozilla:package:pippki"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:package:global-region"
-+
c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global-region/"
-+ c:locType="install"
-+ c:displayName="US Regional Contents"
-+ c:author="mozilla.org"
-+ c:name="global-region"
-+ c:localeVersion="1.7" />
-+ <RDF:Description RDF:about="urn:mozilla:package:cookie"
-+
c:baseURL="jar:resource:/chrome/comm.jar!/content/cookie/"
-+ c:locType="install"
-+ c:displayName="Cookie Manager"
-+ c:author="mozilla.org"
-+ c:name="cookie"
-+ c:localeVersion="1.7" />
-+ <RDF:Description RDF:about="urn:mozilla:package:navigator"
-+ c:hasOverlays="true" />
-+ <RDF:Description RDF:about="urn:mozilla:skin:modern/1.0"
-+ c:displayName="Modern"
-+ c:author="mozilla.org"
-+ c:name="modern/1.0"
-+ c:locType="install">
-+ <c:packages RDF:resource="urn:mozilla:skin:modern/1.0:packages"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:help"
-+
c:baseURL="jar:resource:/chrome/help.jar!/locale/en-US/help/">
-+ <c:package RDF:resource="urn:mozilla:package:help"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:skin:classic/1.0:mozapps"
-+
c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/mozapps/"
-+ c:allowScripts="false"
-+ c:skinVersion="1.5">
-+ <c:package RDF:resource="urn:mozilla:package:mozapps"/>
-+ </RDF:Description>
-+ <RDF:Seq RDF:about="urn:mozilla:package:root">
-+ <RDF:li RDF:resource="urn:mozilla:package:necko"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:xbl-marquee"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:embed"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:pipnss"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:pippki"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:global"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:global-platform"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:global-region"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:help"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:passwordmgr"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:mozapps"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:cookie"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:autoconfig"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:inspector"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:browser"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:browser-region"/>
-+ <RDF:li RDF:resource="urn:mozilla:package:communicator"/>
-+ </RDF:Seq>
-+ <RDF:Description RDF:about="urn:mozilla:package:necko"
-+ c:baseURL="jar:resource:/chrome/comm.jar!/content/necko/"
-+ c:locType="install"
-+ c:displayName="Necko"
-+ c:author="mozilla.org"
-+ c:name="necko"
-+ c:localeVersion="1.7" />
-+ <RDF:Description RDF:about="urn:mozilla:skin:modern/1.0:inspector"
-+ c:skinVersion="1.5"
-+
c:baseURL="jar:resource:/chrome/inspector.jar!/skin/modern/inspector/"
-+ c:allowScripts="false">
-+ <c:package RDF:resource="urn:mozilla:package:inspector"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:mozapps"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/mozapps/"
-+ c:localeVersion="1.7">
-+ <c:package RDF:resource="urn:mozilla:package:mozapps"/>
-+ </RDF:Description>
-+ <RDF:Seq RDF:about="urn:mozilla:skin:modern/1.0:packages">
-+ <RDF:li RDF:resource="urn:mozilla:skin:modern/1.0:embed"/>
-+ <RDF:li RDF:resource="urn:mozilla:skin:modern/1.0:inspector"/>
-+ </RDF:Seq>
-+ <RDF:Description RDF:about="urn:mozilla:package:pippki"
-+
c:baseURL="jar:resource:/chrome/pippki.jar!/content/pippki/"
-+ c:locType="install"
-+ c:displayName="pippki"
-+ c:author="PSM Team"
-+ c:name="pippki"
-+ c:localeVersion="1.7" />
-+ <RDF:Description RDF:about="urn:mozilla:package:browser"
-+ c:hasOverlays="true"
-+
c:baseURL="jar:resource:/chrome/browser.jar!/content/browser/"
-+ c:locType="install"
-+ c:displayName="Browser"
-+ c:author="mozilla.org"
-+ c:name="browser"
-+ c:localeVersion="0.9.9"
-+ c:skinVersion="1.5" />
-+ <RDF:Description RDF:about="urn:mozilla:skin:classic/1.0:inspector"
-+
c:baseURL="jar:resource:/chrome/inspector.jar!/skin/classic/inspector/"
-+ c:allowScripts="false"
-+ c:skinVersion="1.5">
-+ <c:package RDF:resource="urn:mozilla:package:inspector"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:necko"
-+ c:baseURL="jar:resource:/chrome/en-US.jar!/locale/necko/"
-+ c:localeVersion="1.7">
-+ <c:package RDF:resource="urn:mozilla:package:necko"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US:passwordmgr"
-+ c:localeVersion="1.7"
-+
c:baseURL="jar:resource:/chrome/en-US.jar!/locale/passwordmgr/">
-+ <c:package RDF:resource="urn:mozilla:package:passwordmgr"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:skin:classic/1.0:global"
-+
c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/global/"
-+ c:allowScripts="false"
-+ c:skinVersion="1.5">
-+ <c:package RDF:resource="urn:mozilla:package:global"/>
-+ </RDF:Description>
-+ <RDF:Description RDF:about="urn:mozilla:locale:en-US"
-+ c:author="mozilla.org"
-+ c:previewURL="http://www.mozilla.org/locales/en-US.gif";
-+ c:displayName="English (US)"
-+ c:localeVersion="1.7"
-+ c:name="en-US"
-+ c:locType="install">
-+ <c:packages RDF:resource="urn:mozilla:locale:en-US:packages"/>
-+ </RDF:Description>
-+</RDF:RDF>
-diff -Nur firefox.orig/chrome/overlayinfo/browser/content/overlays.rdf
firefox/chrome/overlayinfo/browser/content/overlays.rdf
---- firefox.orig/chrome/overlayinfo/browser/content/overlays.rdf
1970-01-01 01:00:00.000000000 +0100
-+++ firefox/chrome/overlayinfo/browser/content/overlays.rdf 2005-05-13
22:34:47.000000000 +0200
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#";
-+ xmlns:NC="http://home.netscape.com/NC-rdf#";
-+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
-+ <RDF:Seq RDF:about="chrome://browser/content/pageInfo.xul">
-+ <RDF:li>chrome://pippki/content/PageInfoOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+ <RDF:Seq RDF:about="chrome://browser/content/browser.xul">
-+ <RDF:li>chrome://help/content/helpMenuOverlay.xul</RDF:li>
-+ <RDF:li>chrome://inspector/content/tasksOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+</RDF:RDF>
-diff -Nur firefox.orig/chrome/overlayinfo/communicator/content/overlays.rdf
firefox/chrome/overlayinfo/communicator/content/overlays.rdf
---- firefox.orig/chrome/overlayinfo/communicator/content/overlays.rdf
1970-01-01 01:00:00.000000000 +0100
-+++ firefox/chrome/overlayinfo/communicator/content/overlays.rdf
2005-05-13 22:34:47.000000000 +0200
-@@ -0,0 +1,11 @@
-+<?xml version="1.0"?>
-+<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#";
-+ xmlns:NC="http://home.netscape.com/NC-rdf#";
-+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
-+ <RDF:Seq
RDF:about="chrome://communicator/content/contentAreaContextOverlay.xul">
-+ <RDF:li>chrome://cookie/content/cookieContextOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+ <RDF:Seq RDF:about="chrome://communicator/content/pref/preftree.xul">
-+ <RDF:li>chrome://cookie/content/cookiePrefsOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+</RDF:RDF>
-diff -Nur firefox.orig/chrome/overlayinfo/inspector/content/overlays.rdf
firefox/chrome/overlayinfo/inspector/content/overlays.rdf
---- firefox.orig/chrome/overlayinfo/inspector/content/overlays.rdf
1970-01-01 01:00:00.000000000 +0100
-+++ firefox/chrome/overlayinfo/inspector/content/overlays.rdf 2005-05-13
22:34:47.000000000 +0200
-@@ -0,0 +1,18 @@
-+<?xml version="1.0"?>
-+<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#";
-+ xmlns:NC="http://home.netscape.com/NC-rdf#";
-+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
-+ <RDF:Seq RDF:about="chrome://inspector/content/popupOverlay.xul">
-+ <RDF:li>chrome://inspector/content/viewers/dom/popupOverlay.xul</RDF:li>
-+
<RDF:li>chrome://inspector/content/viewers/styleRules/popupOverlay.xul</RDF:li>
-+
<RDF:li>chrome://inspector/content/search/modules/popupOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+ <RDF:Seq RDF:about="chrome://inspector/content/keysetOverlay.xul">
-+
<RDF:li>chrome://inspector/content/viewers/dom/keysetOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+ <RDF:Seq RDF:about="chrome://inspector/content/commandOverlay.xul">
-+
<RDF:li>chrome://inspector/content/viewers/dom/commandOverlay.xul</RDF:li>
-+
<RDF:li>chrome://inspector/content/viewers/styleRules/commandOverlay.xul</RDF:li>
-+
<RDF:li>chrome://inspector/content/search/modules/commandOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+</RDF:RDF>
-diff -Nur firefox.orig/chrome/overlayinfo/messenger/content/overlays.rdf
firefox/chrome/overlayinfo/messenger/content/overlays.rdf
---- firefox.orig/chrome/overlayinfo/messenger/content/overlays.rdf
1970-01-01 01:00:00.000000000 +0100
-+++ firefox/chrome/overlayinfo/messenger/content/overlays.rdf 2005-05-13
22:34:47.000000000 +0200
-@@ -0,0 +1,8 @@
-+<?xml version="1.0"?>
-+<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#";
-+ xmlns:NC="http://home.netscape.com/NC-rdf#";
-+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
-+ <RDF:Seq RDF:about="chrome://messenger/content/mailWindowOverlay.xul">
-+ <RDF:li>chrome://cookie/content/cookieContextOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+</RDF:RDF>
-diff -Nur firefox.orig/chrome/overlayinfo/navigator/content/overlays.rdf
firefox/chrome/overlayinfo/navigator/content/overlays.rdf
---- firefox.orig/chrome/overlayinfo/navigator/content/overlays.rdf
1970-01-01 01:00:00.000000000 +0100
-+++ firefox/chrome/overlayinfo/navigator/content/overlays.rdf 2005-05-13
22:34:47.000000000 +0200
-@@ -0,0 +1,9 @@
-+<?xml version="1.0"?>
-+<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#";
-+ xmlns:NC="http://home.netscape.com/NC-rdf#";
-+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
-+ <RDF:Seq RDF:about="chrome://navigator/content/navigatorOverlay.xul">
-+ <RDF:li>chrome://cookie/content/cookieNavigatorOverlay.xul</RDF:li>
-+ <RDF:li>chrome://cookie/content/cookieTasksOverlay.xul</RDF:li>
-+ </RDF:Seq>
-+</RDF:RDF>
-diff -Nur firefox.orig/components/xpti.dat firefox/components/xpti.dat
---- firefox.orig/components/xpti.dat 1970-01-01 01:00:00.000000000 +0100
-+++ firefox/components/xpti.dat 2005-05-13 22:34:45.000000000 +0200
-@@ -0,0 +1,1190 @@
-+# Generated file. ** DO NOT EDIT! **
-+
-+[Header,2]
-+0,Version,2,0
-+1,AppDir,/usr/lib/firefox
-+
-+[Directories,2]
-+0,/usr/lib/firefox/components
-+1,/usr/lib/firefox/plugins
-+
-+[Files,120]
-+0,dom_html.xpt,0,17387,1116010199000
-+1,websrvcs.xpt,0,14664,1116015401000
-+2,necko.xpt,0,12634,1116008667000
-+3,dom_css.xpt,0,11187,1116010201000
-+4,editor.xpt,0,10902,1116013378000
-+5,pipnss.xpt,0,10289,1116014627000
-+6,docshell.xpt,0,8897,1116013226000
-+7,accessibility.xpt,0,8851,1116013807000
-+8,gfx.xpt,0,8769,1116009573000
-+9,xpcom_ds.xpt,0,8634,1116007534000
-+10,dom_base.xpt,0,8110,1116010193000
-+11,xpconnect.xpt,0,6834,1116008049000
-+12,xpcom_io.xpt,0,6515,1116007591000
-+13,content_base.xpt,0,6408,1116010569000
-+14,dom_core.xpt,0,6377,1116010194000
-+15,dom_xul.xpt,0,6231,1116010205000
-+16,jsdservice.xpt,0,5953,1116015067000
-+17,dom_events.xpt,0,5889,1116010200000
-+18,widget.xpt,0,5502,1116010462000
-+19,webBrowser_core.xpt,0,5287,1116013365000
-+20,plugin.xpt,0,4757,1116010099000
-+21,rdf.xpt,0,4644,1116009314000
-+22,caps.xpt,0,3841,1116009272000
-+23,appshell.xpt,0,3663,1116013715000
-+24,xpcom_components.xpt,0,3624,1116007632000
-+25,xpcom_obsolete.xpt,0,3399,1116007871000
-+26,pref.xpt,0,3145,1116009246000
-+27,uriloader.xpt,0,3095,1116009204000
-+28,inspector.xpt,0,2980,1116015576000
-+29,autocomplete.xpt,0,2935,1116014800000
-+30,layout_xul_tree.xpt,0,2797,1116012798000
-+31,xpcom_threads.xpt,0,2664,1116007673000
-+32,dom_loadsave.xpt,0,2621,1116010203000
-+33,xpcom_base.xpt,0,2543,1116007466000
-+34,accessibility-atk.xpt,0,2500,1116013806000
-+35,imglib2.xpt,0,2318,1116010021000
-+36,shistory.xpt,0,2257,1116013145000
-+37,necko_cache.xpt,0,2180,1116008879000
-+38,layout_xul.xpt,0,2154,1116012578000
-+39,windowwatcher.xpt,0,2139,1116013247000
-+40,necko_http.xpt,0,2081,1116008983000
-+41,locale.xpt,0,1959,1116008433000
-+42,webbrowserpersist.xpt,0,1876,1116013289000
-+43,profile.xpt,0,1860,1116013237000
-+44,commandhandler.xpt,0,1789,1116013308000
-+45,downloads.xpt,0,1777,1116014879000
-+46,necko_cookie.xpt,0,1666,1116008776000
-+47,xpcom_xpti.xpt,0,1560,1116007675000
-+48,update.xpt,0,1471,1116014902000
-+49,mimetype.xpt,0,1467,1116008808000
-+50,xmlextras.xpt,0,1458,1116015099000
-+51,necko_strconv.xpt,0,1409,1116008813000
-+52,dom_range.xpt,0,1397,1116010202000
-+53,xultmpl.xpt,0,1376,1116011692000
-+54,uconv.xpt,0,1339,1116008240000
-+55,mozgnome.xpt,0,1330,1116014021000
-+56,dom_xpath.xpt,0,1312,1116010202000
-+57,dom_traversal.xpt,0,1282,1116010202000
-+58,xuldoc.xpt,0,1269,1116011564000
-+59,txmgr.xpt,0,1258,1116013682000
-+60,xpinstall.xpt,0,1233,1116014921000
-+61,webshell_idls.xpt,0,1191,1116013236000
-+62,extensions.xpt,0,1160,1116014902000
-+63,exthandler.xpt,0,1147,1116009241000
-+64,unicharutil.xpt,0,1146,1116008219000
-+65,oji.xpt,0,1120,1116008591000
-+66,search.xpt,0,1119,1116014694000
-+67,bookmarks.xpt,0,1109,1116014921000
-+68,find.xpt,0,1036,1116013272000
-+69,xml-rpc.xpt,0,989,1116015099000
-+70,toolkitprofile.xpt,0,981,1116014772000
-+71,necko_socket.xpt,0,980,1116008807000
-+72,jar.xpt,0,941,1116008557000
-+73,mozfind.xpt,0,845,1116014691000
-+74,dom_stylesheets.xpt,0,818,1116010200000
-+75,necko_dns.xpt,0,793,1116008789000
-+76,content_xslt.xpt,0,766,1116011907000
-+77,cookie.xpt,0,705,1116015097000
-+78,content_xmldoc.xpt,0,693,1116011534000
-+79,composer.xpt,0,690,1116013682000
-+80,chardet.xpt,0,676,1116008494000
-+81,intl.xpt,0,645,1116008465000
-+82,pipboot.xpt,0,628,1116014473000
-+83,dom.xpt,0,604,1116010205000
-+84,satchel.xpt,0,570,1116014851000
-+85,shellservice.xpt,0,565,1116014921000
-+86,content_html.xpt,0,564,1116010927000
-+87,dom_xbl.xpt,0,498,1116010202000
-+88,migration.xpt,0,488,1116015679000
-+89,necko_jar.xpt,0,485,1116008968000
-+90,filepicker.xpt,0,482,1116014685000
-+91,mozbrwsr.xpt,0,463,1116013775000
-+92,content_htmldoc.xpt,0,449,1116011267000
-+93,fastfind.xpt,0,439,1116014865000
-+94,htmlparser.xpt,0,416,1116009446000
-+95,necko_file.xpt,0,408,1116008959000
-+96,embed_base.xpt,0,390,1116013246000
-+97,proxyObjInst.xpt,0,388,1116007749000
-+98,pippki.xpt,0,377,1116014628000
-+99,directory.xpt,0,373,1116014685000
-+100,history.xpt,0,371,1116014667000
-+101,necko_about.xpt,0,357,1116008924000
-+102,xremoteservice.xpt,0,342,1116013775000
-+103,autoconfig.xpt,0,334,1116015134000
-+104,layout_base.xpt,0,303,1116011988000
-+105,helperAppDlg.xpt,0,292,1116013321000
-+106,necko_ftp.xpt,0,287,1116009091000
-+107,progressDlg.xpt,0,286,1116013321000
-+108,necko_res.xpt,0,285,1116008953000
-+109,jsurl.xpt,0,237,1116010436000
-+110,dom_views.xpt,0,226,1116010200000
-+111,windowds.xpt,0,212,1116014744000
-+112,sidebar.xpt,0,207,1116015726000
-+113,prefetch.xpt,0,192,1116009246000
-+114,necko_viewsource.xpt,0,188,1116009073000
-+115,txtsvc.xpt,0,188,1116013378000
-+116,jsconsole.xpt,0,186,1116013322000
-+117,lwbrk.xpt,0,174,1116008488000
-+118,passwordmgr.xpt,0,169,1116014846000
-+119,necko_data.xpt,0,122,1116008943000
-+
-+[ArchiveItems,0]
-+
-+[Interfaces,1055]
-+0,nsIFontCatalogService,{a3057187-c40f-4ffa-9160-2b16482053b1},8,-1,0
-+1,nsPIPromptService,{d16e906d-bab3-49e0-8688-7f49a6f4293a},39,-1,0
-+2,nsIContentSniffer,{a5710331-74ec-45fb-aa85-ed3bc7c36924},2,-1,1
-+3,nsIConsoleMessage,{41bd8784-1dd2-11b2-9553-8606958fffe1},33,-1,1
-+4,nsIInterfaceInfoToIDL,{b01eb40c-026b-49c9-af55-25e8c9d034c8},1,-1,1
-+5,nsITimer,{29ee628e-a3ea-471f-965d-dc9f11d1c183},31,-1,1
-+6,nsPIExternalProtocolService,{33d824bc-638a-42ae-9452-19e531147854},63,-1,1
-+7,nsIWebServiceProxyFactory,{693611be-bb38-40e0-a98e-b46ff8a5bcca},1,-1,1
-+8,nsIDOMNSXBLFormControl,{1c28ed66-1dd2-11b2-95af-e2cf10931adb},0,-1,1
-+9,nsIGnomeVFSService,{4d6b9f23-8682-41b3-bbff-937a958e6496},55,-1,1
-+10,nsIScrollBoxObject,{56e2ada8-4631-11d4-ba11-001083023c1e},38,-1,1
-+11,nsICachingChannel,{b1f95f5e-ee05-4434-9d34-89a935d7feef},2,-1,1
-+12,nsIDOMXMLDocument,{8816d003-e7c8-4065-8827-829b8d07b6e0},14,-1,1
-+13,nsIJARURI,{c7e410d3-85f2-11d3-9f63-006008a6efe9},89,-1,1
-+14,nsIClassicPluginFactory,{07bfa284-1dd2-11b2-90f8-fef5608e8a56},20,-1,0
-+15,nsISOAPService,{9927fa40-1dd1-11b2-a8d1-857ad21b872c},1,-1,1
-+16,nsIDOMHTMLTableElement,{a6cf90b2-15b3-11d2-932e-00805f8add32},0,-1,1
-+17,nsILocalFile,{aa610f20-a889-11d3-8c81-000064657374},12,-1,1
-+18,nsISupportsPRInt16,{e30d94b0-4a1c-11d3-9890-006008962422},9,-1,1
-+19,nsIStorageStream,{604ad9d0-753e-11d3-90ca-0040056a906e},12,-1,1
-+20,nsISupportsDouble,{b32523a0-4ac0-11d3-baea-00805f8a5dd7},9,-1,1
-+21,nsPIXPIStubHook,{089929f0-4ed9-11d3-abdd-000064657374},60,-1,0
-+22,nsIDownloadObserver,{44b3153e-a54e-4077-a527-b0325e40924e},2,-1,1
-+23,nsIUnicharStreamLoaderObserver,{e06e8b08-8cdd-4503-a0a0-6f3b943602af},2,-1,1
-+24,nsIDocumentLoader,{f43ba260-0737-11d2-beb9-00805f8a66dc},27,-1,1
-+25,nsIDOMHTMLTableCellElement,{a6cf90b7-15b3-11d2-932e-00805f8add32},0,-1,1
-+26,nsIException,{f3a8d3b4-c424-4edc-8bf6-8974c983ba78},33,-1,1
-+27,nsISupportsPRUint16,{dfacb090-4a1c-11d3-9890-006008962422},9,-1,1
-+28,nsIRDFDataSource,{0f78da58-8321-11d2-8eac-00805f29f370},21,-1,1
-+29,nsIPrefLocalizedString,{ae419e24-1dd1-11b2-b39a-d3e5e7073802},26,-1,1
-+30,nsIJSIID,{e08dcda0-d651-11d2-9843-006008962422},11,-1,1
-+31,nsICacheEntryInfo,{72c64022-1dd2-11b2-b3a5-b8b859e0a1b2},37,-1,1
-+32,nsIInterfaceInfoManager,{8b161900-be2b-11d2-9831-006008962422},47,-1,0
-+33,nsIWebNavigation,{f5d9e7b0-d930-11d3-b057-00a024ffc08c},6,-1,1
-+34,nsIJAR,{04501db2-0409-11d3-bcf8-00805f0e1353},72,-1,0
-+35,nsIWSPInterfaceInfoService,{8c7bf4bc-d3fe-4524-b213-ce578bfe936e},1,-1,1
-+36,nsIWSDLSOAPBinding,{bb76b72e-d143-4738-804a-53b311466dd9},1,-1,1
-+37,nsISimpleStreamListener,{a9b84f6a-0824-4278-bae6-bfca0570a26e},2,-1,1
-+38,nsISearchContext,{31aba0f0-2d93-11d3-8069-00600811a9c3},73,-1,1
-+39,nsIAsyncStreamCopier,{eaa49141-c21c-4fe8-a79b-77860a3910aa},2,-1,1
-+40,nsIDocShellTreeNodeTmp,{3fa20a60-e37f-42be-a6df-1c8d910742f1},6,-1,1
-+41,nsIX509Cert,{f0980f60-ee3d-11d4-998b-00b0d02354a0},5,-1,1
-+42,nsPIExternalAppLauncher,{d0b5d7d3-9565-403d-9fb5-e5089c4567c6},63,-1,1
-+43,nsIRDFNode,{0f78da50-8321-11d2-8eac-00805f29f370},21,-1,1
-+44,nsIDOMNSHTMLFrameElement,{d67bd267-f984-4993-b378-95851b71f0a3},0,-1,1
-+45,nsIProxyInfo,{b65d22b0-1dd1-11b2-8f95-920e5b7b56f0},2,-1,1
-+46,nsISupportsPRUint32,{e01dc470-4a1c-11d3-9890-006008962422},9,-1,1
-+47,nsICurrentCharsetListener,{cf9428c1-df50-11d3-9d0c-0050040007b2},54,-1,1
-+48,nsIXSLTProcessorObsolete,{3fbff728-2d20-11d3-aef3-00108300ff91},76,-1,1
-+49,nsICacheListener,{638c3848-778b-4851-8ff3-9400f65b8773},37,-1,1
-+50,jsdIScriptHook,{ae89a7e2-1dd1-11b2-8c2f-af82086291a5},16,-1,1
-+51,nsIRunnable,{4a2abaf0-6886-11d3-9382-00104ba0fd40},31,-1,1
-+52,nsIDirectoryService,{57a66a60-d43a-11d3-8cc2-00609792278c},12,-1,1
-+53,nsITransactionList,{97f863f3-f886-11d4-9d39-0060b0f8baff},59,-1,1
-+54,nsIPK11TokenDB,{4ee28c82-1dd2-11b2-aabf-bb4017abe395},5,-1,1
-+55,nsIAccessibleText,{e44d3fa6-9cb2-432a-8bdb-69d72b6ada00},34,-1,1
-+56,nsIDOMXPathException,{75506f89-b504-11d5-a7f2-ca108ab8b6fc},56,-1,1
-+57,nsISchemaParticle,{3c14a029-6f4e-11d5-9b46-000064657374},1,-1,1
-+58,nsIMIMEHeaderParam,{ddbbdfb8-a1c0-4dd5-a31b-5d2a7a3bb6ec},49,-1,1
-+59,nsIScriptableInterfacesByID,{c99cffac-5aed-4267-ad2f-f4a4c9d4a081},11,-1,1
-+60,nsIGlobalHistory,{9491c383-e3c4-11d2-bdbe-0050040a9b44},6,-1,1
-+61,imgIContainerObserver,{153f1518-1dd2-11b2-b9cd-b16eb63e0471},35,-1,0
-+62,nsIStringEnumerator,{50d3ef6c-9380-4f06-9fb2-95488f7d141c},9,-1,1
-+63,nsIHttpAuthManager,{7ce8e9d1-8b4b-4883-a307-66fe12a50153},40,-1,1
-+64,nsIDOMSerializer,{9fd4ba15-e67c-4c98-b52c-7715f62c9196},50,-1,1
-+65,nsIMemory,{59e7e77a-38e4-11d4-8cf5-0060b0fc14a3},33,-1,1
-+66,nsIGeneratingKeypairInfoDialogs,{11bf5cdc-1dd2-11b2-ba6a-c76afb326fa1},5,-1,1
-+67,nsILineInputStream,{c97b466c-1e6e-4773-a4ab-2b2b3190a7a6},12,-1,1
-+68,nsIPrompt,{a63f70c0-148b-11d3-9333-00104ba0fd40},2,-1,1
-+69,nsIScriptableParamInfo,{2309482b-4631-455f-833f-5e4e9ce38589},1,-1,1
-+70,nsICache,{ec1c0063-197d-44bb-84ba-7525d50fc937},37,-1,1
-+71,nsIWyciwygChannel,{280da566-6f19-4487-a8ca-70c5ba1602c1},92,-1,1
-+72,nsIXULBuilderListener,{ac46be8f-c863-4c23-84a2-d0fcc8dfa9f4},53,-1,1
-+73,nsIDownloader,{fafe41a9-a531-4d6d-89bc-588a6522fb4e},2,-1,1
-+74,nsIOutputStream,{0d0acd2a-61b4-11d4-9877-00c04fa0cf4a},12,-1,1
-+75,nsIDOMCounter,{31adb439-0055-402d-9b1d-d5ca94f3f55b},3,-1,1
-+76,nsISOAPTransport,{99ec6695-535f-11d4-9a58-000064657374},1,-1,1
-+77,jsdIObject,{d500e8b8-1dd1-11b2-89a1-cdf55d91cbbd},16,-1,1
-+78,nsIDOMNSLocation,{a6cf9108-15b3-11d2-932e-00805f8add32},10,-1,1
-+79,nsISecureBrowserUI,{081e31e0-a144-11d3-8c7c-00609792278c},2,-1,1
-+80,nsIAuthenticationInfo,{078a1b99-6be2-4a57-a749-378f4a506097},65,-1,0
-+81,nsICertPickDialogs,{51d59b08-1dd2-11b2-ad4a-a51b92f8a184},5,-1,1
-+82,nsIToolkit,{18032bd0-b265-11d1-aa2a-000000000000},18,-1,0
-+83,nsISupportsFloat,{abeaa390-4ac0-11d3-baea-00805f8a5dd7},9,-1,1
-+84,nsIDOMHTMLSelectElement,{a6cf9090-15b3-11d2-932e-00805f8add32},0,-1,1
-+85,nsIBufferedOutputStream,{6476378a-da09-11d3-8cda-0060b0fc14a3},2,-1,1
-+86,nsIDOMXPathExpression,{75506f82-b504-11d5-a7f2-ca108ab8b6fc},56,-1,1
-+87,nsISOAPCallCompletion,{86114dd8-1dd2-11b2-ab2b-91d0c995e03a},1,-1,1
-+88,nsIByteArrayInputStream,{b5a21556-35fc-4815-aff1-f9142639686e},12,-1,1
-+89,nsIPluginManager2,{d2962dc0-4eb6-11d2-8164-006008119d7a},20,-1,0
-+90,nsITokenDialogs,{bb4bae9c-39c5-11d5-ba26-00108303b117},5,-1,1
-+91,nsISignatureVerifier,{7bdbdb36-1dd2-11b2-a44f-e303037f214d},22,-1,0
-+92,nsIDOMDocumentCSS,{39f76c23-45b2-428a-9240-a981e5abf148},3,-1,1
-+93,nsIScriptableRegion,{82d8f400-5bde-11d3-b033-b27a62766bbc},8,-1,1
-+94,nsITransportSecurityInfo,{68e21b66-1dd2-11b2-aa67-e2b87175e792},71,-1,0
-+95,nsIBoxPaintManager,{5da1e8f0-6255-4b9c-af80-aa3dad7f2fdb},38,-1,1
-+96,nsITextToSubURI,{8b042e24-6f87-11d3-b3c8-00805f8a6670},54,-1,1
-+97,nsIDOMHTMLFrameElement,{a6cf90b9-15b3-11d2-932e-00805f8add32},0,-1,1
-+98,nsITokenPasswordDialogs,{be26b580-1dd1-11b2-9946-c598d0d07727},5,-1,1
-+99,nsICookie,{e9fcb9a4-d376-458f-b720-e65e7df593bc},46,-1,1
-+100,jsdIExecutionHook,{9a7b6ad0-1dd1-11b2-a789-fcfae96356a2},16,-1,1
-+101,nsIDOMPopupBlockedEvent,{9e201104-78e9-4cb3-aff5-7f0a9cf446c0},17,-1,1
-+102,nsIURIContentListener,{94928ab3-8b63-11d3-989d-001083010e9b},27,-1,1
-+103,nsIXPIProgressDialog,{8cdf1192-8709-4428-ab97-c5b6ceecd7e9},60,-1,1
-+104,nsIDirectoryListing,{a465d8ed-3661-483d-a6f1-a82a6bd617b3},2,-1,1
-+105,nsISelectionPrivate,{2d5535e2-1dd2-11b2-8e38-d53ec833adf6},13,-1,1
-+106,nsISchemaType,{3c14a022-6f4e-11d5-9b46-000064657374},1,-1,1
-+107,nsICookieService,{011c3190-1434-11d6-a618-0010a401eb10},46,-1,1
-+108,nsIJARChannel,{c7e410d1-85f2-11d3-9f63-006008a6efe9},89,-1,1
-+109,nsIPrincipalObsolete,{ff9313d0-25e1-11d2-8160-006008119d7a},22,-1,0
-+110,nsIBinaryOutputStream,{204ee610-8765-11d3-90cf-0040056a906e},12,-1,1
-+111,nsIDOMElementCSSInlineStyle,{99715845-95fc-4a56-aa53-214b65c26e22},3,-1,1
-+112,nsIImageLoadingContent,{f3138741-353d-4b2b-beb8-01c308428895},13,-1,1
-+113,nsIExceptionService,{35a88f54-f267-4414-92a7-191f6454ab52},33,-1,1
-+114,nsIFileOutputStream,{e6f68040-c7ec-11d3-8cda-0060b0fc14a3},2,-1,1
-+115,nsIStreamBufferAccess,{ac923b72-ac87-4892-ac7a-ca385d429435},12,-1,0
-+116,nsIDOMCSSMediaRule,{a6cf90bc-15b3-11d2-932e-00805f8add32},3,-1,1
-+117,nsIErrorService,{e72f94b2-5f85-11d4-9877-00c04fa0cf4a},33,-1,1
-+118,nsIRDFInMemoryDataSource,{17c4e0aa-1dd2-11b2-8029-bf6f668de500},21,-1,1
-+119,nsIEditorMailSupport,{fdf23301-4a94-11d3-9ce4-9960496c41bc},4,-1,1
-+120,nsIDOMHTMLPreElement,{a6cf90a4-15b3-11d2-932e-00805f8add32},0,-1,1
-+121,nsIDOMDocumentTraversal,{13f236c0-47f8-11d5-b6a3-009027446e84},57,-1,1
-+122,gfxIImageFrame,{51cc27a8-1dd2-11b2-a1aa-dad33ab193b4},8,-1,1
-+123,nsITableEditor,{4805e684-49b9-11d3-9ce4-ed60bd6cb5bc},4,-1,1
-+124,nsPICommandUpdater,{b135f602-0bfe-11d5-a73c-f0e420e8293c},44,-1,1
-+125,nsIExternalProtocolService,{100fd4b3-4557-11d4-98d0-001083010e9b},63,-1,1
-+126,nsIUTF8ConverterService,{249f52a3-2599-4b00-ba40-0481364831a2},54,-1,1
-+127,nsIPluginInstancePeer,{4b7cea20-019b-11d2-815b-006008119d7a},20,-1,0
-+128,nsIRDFService,{bfd05261-834c-11d2-8eac-00805f29f370},21,-1,1
-+129,nsIContentViewerContainer,{ea2ce7a0-5c3d-11d4-90c2-0050041caf44},61,-1,1
-+130,nsIChromeEventHandler,{7bc08970-9e6c-11d3-afb2-00a024ffc08c},104,-1,1
-+131,nsICookie2,{d3493503-7854-46ed-8284-8af54a847efb},46,-1,1
-+132,nsIPKCS11ModuleDB,{ff9fbcd7-9517-4334-b97a-ceed78909974},5,-1,1
-+133,nsIBrowserInstance,{8af0fa40-598d-11d3-806a-00600811a9c3},91,-1,1
-+134,inICSSValueSearch,{e0d39e48-1dd1-11b2-81bd-9a0c117f0736},28,-1,1
-+135,nsIProtocolProxyService,{91c4fe40-76c2-433f-9324-ffdae12df4b4},2,-1,1
-+136,nsIDOMCDATASection,{a6cf9071-15b3-11d2-932e-00805f8add32},14,-1,1
-+137,nsIXPCScriptable,{fa2c3b80-0e9d-11d5-9092-0010a4e73d9a},11,-1,0
-+138,nsIJVMConfigManager,{ca29fff1-a677-493c-9d80-3dc60432212b},65,-1,1
-+139,nsIContentHandler,{2f0f927a-8677-11d3-989d-001083010e9b},27,-1,1
-+140,nsIPKIParamBlock,{b6fe3d78-1dd1-11b2-9058-ced9016984c8},98,-1,1
-+141,nsIUTF8StringEnumerator,{9bdf1010-3695-4907-95ed-83d0410ec307},9,-1,1
-+142,nsISchemaComponent,{3c14a020-6f4e-11d5-9b46-000064657374},1,-1,1
-+143,jsdIStackFrame,{b6d50784-1dd1-11b2-a932-882246c6fe45},16,-1,1
-+144,nsISHEntry,{65281ba1-988a-11d3-bdc7-0050040a9b44},36,-1,1
-+145,nsISHistoryInternal,{dd335421-b8b8-11d3-bdc8-0050040a9b44},36,-1,1
-+146,nsIURIFixup,{2efd4a40-a5e1-11d4-9589-0020183bf181},6,-1,1
-+147,nsIXPIDialogService,{8cdd8baa-1dd2-11b2-909a-f0178da5c5ff},60,-1,1
-+148,nsIEditActionListener,{b22907b1-ee93-11d2-8d50-000064657374},4,-1,1
-+149,nsIAccessibleAction,{829b36d4-125a-4279-abc4-87d834664f82},34,-1,1
-+150,nsIDOMAttr,{a6cf9070-15b3-11d2-932e-00805f8add32},14,-1,1
-+151,nsIDOMNotation,{a6cf907e-15b3-11d2-932e-00805f8add32},14,-1,1
-+152,nsIDOMMouseEvent,{ff751edc-8b02-aae7-0010-8301838a3123},17,-1,1
-+153,nsIFileUtilities,{89a31ce0-019a-11d2-815b-006008119d7a},20,-1,0
-+154,nsIPassword,{cf39c2b0-1e4b-11d5-a549-0010a401eb10},118,-1,1
-+155,nsIProfileLock,{6f987826-e4dd-453d-bb66-a1e46088fced},70,-1,1
-+156,nsIDirectoryServiceProvider,{bbf8cab0-d43a-11d3-8cc2-00609792278c},12,-1,1
-+157,nsISelectElement,{35bd8ed5-5f34-4126-8c4f-38ba01681836},86,-1,1
-+158,nsIPopupBoxObject,{33c60e14-5150-4876-9a96-2732557e6895},38,-1,1
-+159,nsIMarkupDocumentViewer,{c33a616e-8020-4f01-a1eb-19a32370d566},6,-1,1
-+160,jsdIValue,{b7964304-1dd1-11b2-ba20-cf4205772e9d},16,-1,1
-+161,nsIPlaintextEditor,{b5f39ed4-1dd1-11b2-9d00-fd54d6f54962},4,-1,1
-+162,nsIDOMNSHTMLSelectElement,{a6cf9105-15b3-11d2-932e-00805f8add32},0,-1,1
-+163,nsIDOMHTMLModElement,{a6cf90a9-15b3-11d2-932e-00805f8add32},0,-1,1
-+164,nsIASN1Sequence,{b6b957e6-1dd1-11b2-89d7-e30624f50b00},5,-1,1
-+165,nsICRLInfo,{c185d920-4a3e-11d5-ba27-00108303b117},5,-1,1
-+166,jsdIContext,{a2dd25a4-1dd1-11b2-bda6-ed525acd4c35},16,-1,1
-+167,nsIScrollable,{61792520-82c2-11d3-af76-00a024ffc08c},6,-1,1
-+168,inIFlasher,{7b4a099f-6f6e-4565-977b-fb622adbff49},28,-1,1
-+169,nsISupportsWeakReference,{9188bc86-f92e-11d2-81ef-0060083a0bcf},33,-1,1
-+170,nsIDOMHTMLAreaElement,{a6cf90b0-15b3-11d2-932e-00805f8add32},0,-1,1
-+171,nsIRDFRemoteDataSource,{1d297320-27f7-11d3-be01-000064657374},21,-1,1
-+172,nsIDOMXULButtonElement,{6852d9a6-1dd2-11b2-a29d-cd7977a91b1b},15,-1,1
-+173,nsIClipboardDragDropHooks,{e03e6c5e-0d84-4c0b-8739-e6b8d51922de},18,-1,1
-+174,nsIDOMRect,{71735f62-ac5c-4236-9a1f-5ffb280d531c},3,-1,1
-+175,nsICRLManager,{486755db-627a-4678-a21b-f6a63bb9c56a},5,-1,1
-+176,imgIEncoder,{ccc5b3ad-3e67-4e3d-97e1-b06b2e96fef8},35,-1,1
-+177,nsIDOMCSS2Properties,{a6cf90d1-15b3-11d2-932e-00805f8add32},3,-1,1
-+178,nsIDOMXPathNamespace,{75506f87-b504-11d5-a7f2-ca108ab8b6fc},56,-1,1
-+179,nsIBookmarksService,{2c31ecce-4157-4820-8631-ec65b2e0ca93},67,-1,1
-+180,nsIDOMHTMLHRElement,{a6cf90a8-15b3-11d2-932e-00805f8add32},0,-1,1
-+181,nsISHistoryListener,{3b07f591-e8e1-11d4-9882-00c04fa02f40},36,-1,1
-+182,nsIEditingSession,{d39fd2b4-3978-45d2-a4be-ba448171b61b},79,-1,1
-+183,nsIWebBrowserFocus,{9c5d3c58-1dd1-11b2-a1c9-f3699284657a},19,-1,1
-+184,nsIAppUpdateInfo,{2daab124-9bc7-4c35-bb7b-0fecdea03ce8},48,-1,1
-+185,nsIHTMLObjectResizer,{b0338f6c-ded3-4c39-a953-56e8bae494f5},4,-1,1
-+186,nsIAppUpdateInfoItem,{24aee3ca-a274-4247-bd3b-d0acbb5a98aa},48,-1,1
-+187,nsIInputStreamCallback,{d1f28e94-3a6e-4050-a5f5-2e81b1fc2a43},12,-1,1
-+188,nsISupportsPRUint64,{e13567c0-4a1c-11d3-9890-006008962422},9,-1,1
-+189,nsIClipboard,{8b5314ba-db01-11d2-96ce-0060b0fb9956},18,-1,1
-+190,nsIBufEntropyCollector,{485b87a8-5dd7-4b8d-8ea8-dee53201f899},82,-1,0
-+191,inIDOMUtils,{ffffd059-13d1-4ef7-acb1-91188c6e31dd},28,-1,1
-+192,nsIXmlRpcFault,{691cb864-0a7e-448c-98ee-4a7f359cf145},69,-1,1
-+193,nsIRandomAccessIterator,{9bd6fdb0-1dd1-11b2-9101-d15375968230},9,-1,1
-+194,nsITransactionListener,{58e330c4-7b48-11d2-98b9-00805f297d89},59,-1,1
-+195,nsIDOMCharacterData,{a6cf9072-15b3-11d2-932e-00805f8add32},14,-1,1
-+196,nsIDOMWindow,{a6cf906b-15b3-11d2-932e-00805f8add32},10,-1,1
-+197,nsIHelperAppLauncher,{9503d0fe-4c9d-11d4-98d0-001083010e9b},63,-1,1
-+198,nsITransaction,{58e330c1-7b48-11d2-98b9-00805f297d89},59,-1,1
-+199,nsIAutoCompleteObserver,{18c36504-9a4c-4ac3-8494-bd05e00ae27f},29,-1,1
-+200,nsIScriptEventHandler,{375f787f-8d3a-4344-b540-293d5645c22c},13,-1,0
-+201,nsISSLStatus,{7b2ca1ca-1dd2-11b2-87ec-d217dbe22b85},5,-1,1
-+202,nsIDOMDocumentStyle,{3d9f4973-dd2e-48f5-b5f7-2634e09eadd9},74,-1,1
-+203,nsIRDFObserver,{3cc75360-484a-11d2-bc16-00805f912fe7},21,-1,1
-+204,nsIWebBrowser,{69e5df00-7b8b-11d3-af61-00a024ffc08c},19,-1,1
-+205,nsIRDFXMLSource,{4da56f10-99fe-11d2-8ebb-00805f29f370},21,-1,1
-+206,nsIDOMElement,{a6cf9078-15b3-11d2-932e-00805f8add32},14,-1,1
-+207,nsIRegistryEnumerator,{8cecf236-1dd2-11b2-893c-f9848956eaec},25,-1,1
-+208,jsdIFilter,{05593438-1b83-4517-864f-3cea3d37a266},16,-1,1
-+209,nsIHTMLEditor,{4b0fd0d0-1dd2-11b2-bf2e-ef20fbca2c88},4,-1,1
-+210,nsISchemaUnionType,{3c14a026-6f4e-11d5-9b46-000064657374},1,-1,1
-+211,nsIContentViewer,{70b8f22d-135c-4c94-8044-1bd3238d0990},6,-1,1
-+212,nsIDOMJSWindow,{c8188620-1dd1-11b2-bc88-df8440498add},10,-1,1
-+213,nsIStreamConverterService,{00362090-3b97-11d3-a16c-0050041caf44},51,-1,1
-+214,nsIFastLoadReadControl,{652ecec6-d40b-45b6-afef-641d6c63a35b},12,-1,1
-+215,nsICommandController,{ebe55080-c8a9-11d5-a73c-dd620d6e04bc},58,-1,1
-+216,nsIBidiKeyboard,{bb961ae1-7432-11d4-b77a-00104b4119f8},18,-1,1
-+217,nsIXPConnectWrappedJS,{bed52030-bca6-11d2-ba79-00805f8a5dd7},11,-1,0
-+218,nsILocalSearchService,{1222e6f0-a5e3-11d2-8b7c-00805f8a7db6},66,-1,1
-+219,nsIAutoCompleteController,{75866768-ed00-4ff4-b950-485449a67a88},29,-1,1
-+220,nsIWSDLLoader,{0458dac5-65de-11d5-9b42-00104bdf5339},1,-1,1
-+221,nsIPrefBranch,{56c35506-f14b-11d3-99d3-ddbfac2ccf65},26,-1,1
-+222,nsIDOMPlugin,{f6134681-f28b-11d2-8360-c90899049c3c},10,-1,1
-+223,nsISelectionListener,{a6cf90e2-15b3-11d2-932e-00805f8add32},13,-1,1
-+224,nsIMIMEInputStream,{dcbce63c-1dd1-11b2-b94d-91f6d49a3161},2,-1,1
-+225,nsISelectionController,{d2d1d179-85a7-11d3-9932-00108301233c},13,-1,1
-+226,nsIExtensionDownloadProgressListener,{9048223f-ec50-49e5-9866-80ee8f26179d},62,-1,1
-+227,nsIStreamLoaderObserver,{359f7990-d4e9-11d3-a1a5-0050041caf44},2,-1,1
-+228,nsIScriptableInterfaces,{01c78c65-31da-456b-90bf-da39d09fdcbf},11,-1,1
-+229,nsIPluginManager,{da58ad80-4eb6-11d2-8164-006008119d7a},20,-1,1
-+230,nsIXPInstallManager,{50941e6a-ecfd-481c-9725-d0695c7c538e},60,-1,1
-+231,nsISOAPAttachments,{6192dcbe-1dd2-11b2-81ad-a4597614c4ae},1,-1,1
-+232,nsISOAPCall,{a8fefe40-52bc-11d4-9a57-000064657374},1,-1,1
-+233,nsIInterfaceInfo,{215dbe04-94a7-11d2-ba58-00805f8a5dd7},47,-1,0
-+234,nsIDOMNSHTMLHRElement,{19b5879f-c125-447c-aaaf-719de3ef221a},0,-1,1
-+235,nsIInputStreamTee,{44e8b2c8-1ecb-4a63-8b23-3e3500c34f32},12,-1,1
-+236,nsIWritableVariant,{5586a590-8c82-11d5-90f3-0010a4e73d9a},9,-1,1
-+237,nsIFontEnumerator,{a6cf9114-15b3-11d2-932e-00805f8add32},8,-1,1
-+238,nsIAppShellService,{e5e5af70-8a38-11d2-9938-0080c7cb1080},23,-1,1
-+239,nsIDOMPluginArray,{f6134680-f28b-11d2-8360-c90899049c3c},10,-1,1
-+240,nsIDOMDOMConfiguration,{cfb5b821-9016-4a79-9d98-87b57c3ea0c7},14,-1,1
-+241,nsIPKCS11Module,{8a44bdf9-d1a5-4734-bd5a-34ed7fe564c2},5,-1,1
-+242,nsIFormatConverter,{948a0023-e3a7-11d2-96cf-0060b0fb9956},18,-1,1
-+243,nsIChannel,{c63a055a-a676-4e71-bf3c-6cfa11082018},2,-1,1
-+244,nsIShellService,{7d8a7a34-f492-43c0-9657-ec7dbbeba236},85,-1,1
-+245,nsISocketTransport,{ee783990-c87c-4ace-87ca-54e5fcc477b0},2,-1,1
-+246,imgILoader,{a32826ff-9e56-4425-a811-97a8dba64ff5},35,-1,1
-+247,nsIXPCNativeCallContext,{0fa68a60-8289-11d3-bb1a-00805f8a5dd7},11,-1,0
-+248,nsIExternalProtocolHandler,{0e61f3b2-34d7-4c79-bfdc-4860bc7341b7},2,-1,1
-+249,nsICertificateDialogs,{a03ca940-09be-11d5-ac5d-000064657374},5,-1,1
-+250,nsIFilePicker,{80faf095-c807-4558-a2cc-185ed70754ea},18,-1,1
-+251,nsIPropertyElement,{283ee646-1aef-11d4-98b3-00c04fa0ce9a},9,-1,1
-+252,nsIStandardURL,{8793370a-311f-11d4-9876-00c04fa0cf4a},2,-1,1
-+253,nsIAccessibleEvent,{87f29033-c4a6-40a3-ac7a-3ba391f9992d},7,-1,1
-+254,nsIDOMWindowInternal,{f914492c-0138-4123-a634-6ef8e3f126f8},10,-1,1
-+255,nsISeekableStream,{e9de5df0-c7ec-11d3-8cda-0060b0fc14a3},12,-1,1
-+256,nsIRDFCompositeDataSource,{96343820-307c-11d2-bc15-00805f912fe7},21,-1,1
-+257,nsIDocumentLoaderFactory,{df15f850-5d98-11d4-9f4d-0010a4053fd0},61,-1,1
-+258,nsIStreamListenerTee,{fb683e76-d42b-41a4-8ae6-65a6c2b146e5},2,-1,1
-+259,nsIBrowserProfileMigrator,{6c64bc4a-881f-4fd8-8f19-3b4125dcee50},88,-1,1
-+260,nsINSSCertCache,{6c143dac-bd65-4333-b594-7ed1e748e0f9},5,-1,1
-+261,nsISyncStreamListener,{7e1aa658-6e3f-4521-9946-9685a169f764},2,-1,1
-+262,nsIDOMLSParserFilter,{10e8893d-ddf5-45d1-8872-615d72065fb4},32,-1,1
-+263,nsIDOMNSDocument,{a6cf90cd-15b3-11d2-932e-00805f8add32},14,-1,1
-+264,nsIScriptError,{fc9e5a94-1dd1-11b2-888b-d8907b2c6996},11,-1,1
-+265,nsIXPConnectJSObjectHolder,{8916a320-d118-11d3-8f3a-0010a4e73d9a},11,-1,0
-+266,nsIXULWindow,{5d72a699-a252-4161-a45f-e7d35e78b7f3},23,-1,1
-+267,nsIEventTarget,{ea99ad5b-cc67-4efb-97c9-2ef620a59f2a},31,-1,1
-+268,nsIURLParser,{7281076d-cf37-464a-815e-698235802604},2,-1,1
-+269,nsIX509CertValidity,{e701dfd8-1dd1-11b2-a172-ffa6cc6156ad},5,-1,1
-+270,nsISchemaFacet,{3c14a031-6f4e-11d5-9b46-000064657374},1,-1,1
-+271,nsINativeAppSupport,{5fdf8480-1f98-11d4-8077-00600811a9c3},23,-1,1
-+272,nsIWebServicePropertyBagWrapper,{e0b1765e-c0be-4a28-aca3-b292c5c3788b},1,-1,0
-+273,nsIDOMHTMLLIElement,{a6cf909e-15b3-11d2-932e-00805f8add32},0,-1,1
-+274,nsIUpdateService,{c8a2339e-770a-417d-ab9c-efde1f23ba24},48,-1,1
-+275,nsIASN1Object,{ba8bf582-1dd1-11b2-898c-f40246bc9a63},5,-1,1
-+276,nsIDOMCSSFontFaceRule,{a6cf90bb-15b3-11d2-932e-00805f8add32},3,-1,1
-+277,nsIDOMXULElement,{0574ed81-c088-11d2-96ed-00104b7b7deb},15,-1,1
-+278,nsIInterfaceRequestor,{033a1470-8b2a-11d3-af88-00a024ffc08c},33,-1,1
-+279,nsIDOMLSProgressEvent,{b9a2371f-70e9-4657-b0e8-28e15b40857e},32,-1,1
-+280,nsIServiceManager,{8bb35ed9-e332-462d-9155-4a002ab5c958},24,-1,1
-+281,nsIDOMHTMLOptGroupElement,{a6cf9091-15b3-11d2-932e-00805f8add32},0,-1,1
-+282,nsIDOMLSSerializer,{96ea4792-d362-4c28-a8c2-0337790d648a},32,-1,1
-+283,nsITraceRefcnt,{273dc92f-0fe6-4545-96a9-21be77828039},33,-1,0
-+284,nsITimelineService,{93276790-3daf-11d5-b67d-000064657374},9,-1,1
-+285,nsIStackFrame,{91d82105-7c62-4f8b-9779-154277c0ee90},33,-1,1
-+286,nsIDataType,{4d12e540-83d7-11d5-90ed-0010a4e73d9a},9,-1,1
-+287,nsIDOMCSSStyleSheet,{a6cf90c2-15b3-11d2-932e-00805f8add32},3,-1,1
-+288,nsIDOMCryptoDialogs,{1f8fe77e-1dd2-11b2-8dd2-e55f8d3465b8},5,-1,1
-+289,nsICookieManager,{aaab6710-0f2c-11d5-a53b-0010a401eb10},46,-1,1
-+290,nsIInternetSearchContext,{7b171610-80ca-4d33-b16c-4186cd7b7e73},66,-1,0
-+291,nsIInputStreamPump,{f7dd8d87-efa7-48cc-9d94-df488df0b3f9},2,-1,1
-+292,nsIDOMLSParser,{2a31a3a0-be68-40af-9f64-914192f0fba2},32,-1,1
-+293,nsIDOMCSSStyleDeclaration,{a6cf90be-15b3-11d2-932e-00805f8add32},3,-1,1
-+294,nsIFlavorDataProvider,{7e225e5f-711c-11d7-9fae-000393636592},18,-1,1
-+295,nsISOAPHeaderBlock,{063d4a4e-1dd2-11b2-a365-cbaf1651f140},1,-1,1
-+296,nsIDOMXULTextboxElement,{71135b6c-294e-4634-a8e4-a72398f1e72a},15,-1,1
-+297,nsIDOMHTMLTableSectionElement,{a6cf90b5-15b3-11d2-932e-00805f8add32},0,-1,1
-+298,nsIDOMNode,{a6cf907c-15b3-11d2-932e-00805f8add32},14,-1,1
-+299,imgICache,{075e424c-1dd2-11b2-97bc-e5beb94b874e},35,-1,1
-+300,nsIEditorIMESupport,{4805e680-49b9-11d3-9ce4-ed60bd6cb5bc},4,-1,1
-+301,nsISupportsPRUint8,{dec2e4e0-4a1c-11d3-9890-006008962422},9,-1,1
-+302,nsIURILoader,{40aecb53-8b65-11d3-989d-001083010e9b},27,-1,1
-+303,nsIPrintProgressParams,{ca89b55b-6faf-4051-9645-1c03ef5108f8},13,-1,1
-+304,nsIEditorLogging,{4805e681-49b9-11d3-9ce4-ed60bd6cb5bc},4,-1,1
-+305,nsIRegistryNode,{d1b54831-ac07-11d2-805e-00600811a9c3},25,-1,1
-+306,nsIXPCScriptNotify,{2d45f33d-fd6e-4f1b-90e5-73e38478d836},11,-1,0
-+307,nsIDOMXULSelectControlItemElement,{6aaaa30d-54ab-434a-8ae8-6d29a566d870},15,-1,1
-+308,nsIAccessibilityService,{68d9720a-0984-42b6-a3f5-8237ed925727},7,-1,1
-+309,nsINativeScrollbar,{dd1cb116-1dd1-11b2-9e67-abac4e09d533},18,-1,0
-+310,nsIDOMHTMLDocument,{a6cf9084-15b3-11d2-932e-00805f8add32},0,-1,1
-+311,nsIRDFPurgeableDataSource,{951700f0-fed0-11d2-bdd9-00104bde6048},21,-1,1
-+312,nsITransportEventSink,{561de8af-1b74-4cd4-8479-89447d48185c},2,-1,1
-+313,nsIDOMCustomEvent,{55c7af7b-1a64-40bf-87eb-2c2cbee0491b},17,-1,1
-+314,nsIDOMCSSPrimitiveValue,{e249031f-8df9-4e7a-b644-18946dce0019},3,-1,1
-+315,nsIWSDLOperation,{0458dac2-65de-11d5-9b42-00104bdf5339},1,-1,1
-+316,nsIXmlRpcClient,{37127241-1e6e-46aa-ba87-601d41bb47df},69,-1,1
-+317,imgIRequest,{ccf705f6-1dd1-11b2-82ef-e18eccf7f7ec},35,-1,1
-+318,nsIPluginDocument,{0d8129f1-5a55-4eaa-851f-15e43ce3d183},20,-1,0
-+319,nsISOAPDecoder,{4c2e02ae-1dd2-11b2-b1cd-c79dea3d46db},1,-1,1
-+320,nsIRecyclingAllocator,{d064a04c-9cee-4319-be31-64d565bccba9},9,-1,1
-+321,nsIWebServiceProxy,{2122421c-1326-41db-87f8-25519d8a12cb},1,-1,1
-+322,nsIRDFXMLSink,{eb1a5d31-ab33-11d2-8ec6-00805f29f370},21,-1,1
-+323,nsIDOMHTMLIFrameElement,{a6cf90ba-15b3-11d2-932e-00805f8add32},0,-1,1
-+324,nsIURI,{07a22cc0-0ce5-11d3-9331-00104ba0fd40},2,-1,1
-+325,nsIUserInfo,{6c1034f0-1dd2-11b2-aa14-e6657ed7bb0b},23,-1,1
-+326,nsICacheEntryDescriptor,{49c1a11d-f5d2-4f09-8262-551e64908ada},37,-1,1
-+327,nsIHTMLAbsPosEditor,{91375f52-20e6-4757-9835-eb04fabe5498},4,-1,1
-+328,nsIDOMNSHTMLInputElement,{993d2efc-a768-11d3-bccd-0060b0fc76bd},0,-1,1
-+329,nsIPrintProgress,{7e46bc35-fb7d-4b45-ab35-82fd61015380},13,-1,1
-+330,nsIFileSpec,{d8c0a080-0868-11d3-915f-d9d889d48e3c},25,-1,1
-+331,nsIWSDLBinding,{0458dac0-65de-11d5-9b42-00104bdf5339},1,-1,1
-+332,nsISOAPBlock,{843afaa8-1dd2-11b2-8b0d-9b5d16fe64ea},1,-1,1
-+333,nsIImageDocument,{b482f6d8-40a9-4f20-89f3-772d417a4c81},92,-1,1
-+334,nsITransport,{cbb0baeb-5fcb-408b-a2be-9f8fc98d0af1},2,-1,1
-+335,nsISOAPFault,{99ec6694-535f-11d4-9a58-000064657374},1,-1,1
-+336,nsIScriptContextOwner,{a94ec640-0bba-11d2-b326-00805f8a3859},83,-1,1
-+337,jsdICallHook,{f102caf6-1dd1-11b2-bd43-c1dbacb95a98},16,-1,1
-+338,nsILDAPSyncQuery,{0308fb36-1dd2-11b2-b16f-8510e8c5311a},103,-1,1
-+339,nsISOAPEncodingRegistry,{9fe91a61-3048-40e3-99ef-e39ab946ae0b},1,-1,1
-+340,nsIImgManager,{d60b3710-166d-11d5-a542-0010a401eb10},77,-1,1
-+341,nsICategoryManager,{3275b2cd-af6d-429a-80d7-f0c5120342ac},24,-1,1
-+342,nsIWindowMediatorListener,{2f276982-0d60-4377-a595-d350ba516395},23,-1,1
-+343,nsIAuthPromptProvider,{129d3bd5-8a26-4b0b-b8a0-19fdea029196},2,-1,1
-+344,nsPIPluginHost,{8e3d71e6-2319-11d5-9cf8-0060b0fbd8ac},20,-1,0
-+345,nsIEditor,{06b979ce-1dd2-11b2-b6c7-a8bc47aa06b6},4,-1,1
-+346,nsIDOMHistory,{896d1d20-b4c4-11d2-bd93-00805f8ae3f4},10,-1,1
-+347,nsIZipEntry,{6ca5e43e-9632-11d3-8cd9-0060b0fc14a3},72,-1,1
-+348,nsIRegistryGetter,{3a15fc88-7a61-4ab4-8e58-31e95fab3da8},25,-1,0
-+349,nsIFontPackageProxy,{6712fdd4-f978-11d4-a144-005004832142},41,-1,1
-+350,nsIFontList,{702909c6-1dd2-11b2-b833-8a740f643539},8,-1,1
-+351,nsIDOMAbstractView,{f51ebade-8b1a-11d3-aae7-0010830123b4},110,-1,1
-+352,nsIScriptLoader,{501209d3-7edf-437d-9948-3c6d1c08ef7a},13,-1,1
-+353,nsIDOMXULSelectControlElement,{59fec127-2a0e-445b-84b5-a66dc90245db},15,-1,1
-+354,nsIVariant,{6c9eb060-8c6a-11d5-90f3-0010a4e73d9a},9,-1,1
-+355,nsIDOMLSLoadEvent,{6c16a810-a37d-4859-b557-337341631aee},32,-1,1
-+356,nsISupportsVoid,{464484f0-568d-11d3-baf8-00805f8a5dd7},9,-1,1
-+357,nsIDOMCSSImportRule,{a6cf90cf-15b3-11d2-932e-00805f8add32},3,-1,1
-+358,nsIContentFilter,{c18c49a8-62f0-4045-9884-4aa91e388f14},4,-1,1
-+359,nsIClipboardOwner,{5a31c7a1-e122-11d2-9a57-000064657374},18,-1,1
-+360,nsICharsetResolver,{d143a084-b626-4614-845f-41f3ca43a674},80,-1,1
-+361,inIDOMView,{3eb4c760-dffd-4983-94a8-18bcb99100e4},28,-1,1
-+362,nsISupportsString,{d79dc970-4a1c-11d3-9890-006008962422},9,-1,1
-+363,nsIDOMHTMLCollection,{a6cf9083-15b3-11d2-932e-00805f8add32},0,-1,1
-+364,nsICacheDeviceInfo,{31d1c294-1dd2-11b2-be3a-c79230dca297},37,-1,1
-+365,nsIWebServiceComplexTypeWrapper,{b16b15bc-bfad-43cf-b374-2e4651acbc3c},1,-1,0
-+366,nsIDOMEvent,{a66b7b80-ff46-bd97-0080-5f8ae38add32},17,-1,1
-+367,nsICacheVisitor,{f8c08c4b-d778-49d1-a59b-866fdc500d95},37,-1,1
-+368,nsIMIMEInfo,{4174ca8f-5a33-44fd-8735-ffb95baca30a},49,-1,1
-+369,nsIDOMHTMLBRElement,{a6cf90a5-15b3-11d2-932e-00805f8add32},0,-1,1
-+370,nsIInputIterator,{85585e12-1dd2-11b2-a930-f6929058269a},9,-1,1
-+371,nsIDOMHTMLMetaElement,{a6cf908a-15b3-11d2-932e-00805f8add32},0,-1,1
-+372,nsIHTMLInlineTableEditor,{eda2e65c-a758-451f-9b05-77cb8de74ed2},4,-1,1
-+373,nsIResumableEntityID,{c9df38d4-1dd1-11b2-81ae-c9e767256d1b},2,-1,1
-+374,nsIPref,{a22ad7b0-ca86-11d1-a9a4-00805f8a7ac4},26,-1,1
-+375,nsIHTTPHeaderListener,{8b246748-1dd2-11b2-9512-9dc84a95fc2f},20,-1,1
-+376,nsICookieAcceptDialog,{3f2f0d2c-bdea-4b5a-afc6-fcf18f66b97e},77,-1,1
-+377,nsIAutoCompleteSearch,{de8db85f-c1de-4d87-94ba-7844890f91fe},29,-1,1
-+378,nsIProxyObjectManager,{eea90d43-b059-11d2-915e-c12b696c9333},97,-1,1
-+379,nsISecretDecoderRingConfig,{01d8c0f0-0ccc-11d4-9fdd-000064657374},2,-1,1
-+380,nsIDOMCSSUnknownRule,{a6cf90d0-15b3-11d2-932e-00805f8add32},3,-1,1
-+381,nsIXPTLoader,{368a15d9-17a9-4c2b-ac3d-a35b3a22b876},47,-1,1
-+382,nsISupportsPrimitive,{d0d4b136-1dd1-11b2-9371-f0727ef827c0},9,-1,1
-+383,nsIASN1Tree,{c727b2f2-1dd1-11b2-95df-f63c15b4cd35},98,-1,1
-+384,nsIWSDLLoadListener,{0458dac6-65de-11d5-9b42-00104bdf5339},1,-1,1
-+385,nsIComponentManagerObsolete,{8458a740-d5dc-11d2-92fb-00e09805570f},24,-1,1
-+386,nsIDownloadManager,{9be66cc0-1dd1-11b2-8617-e3a3ed26e3b0},45,-1,1
-+387,nsIJSXMLHttpRequest,{9deabc90-28d5-41d3-a660-474f2254f4ba},50,-1,1
-+388,nsISOAPMessageBinding,{c3c4614c-301a-44af-ad70-936f9fd1ba5c},1,-1,1
-+389,nsISOAPEncoding,{9ae49600-1dd1-11b2-877f-e62f620c5e92},1,-1,1
-+390,nsIScriptGlobalObjectOwner,{413e8400-a87f-11d3-afc6-00a024ffc08c},83,-1,1
-+391,nsIProfileChangeStatus,{2f977d43-5485-11d4-87e2-0010a4e75ef2},43,-1,1
-+392,nsISocketTransportService,{05331390-6884-11d3-9382-00104ba0fd40},2,-1,1
-+393,nsIProfile,{02b0625a-e7f3-11d2-9f5a-006008a6efe9},43,-1,1
-+394,nsIJSContextStack,{c67d8270-3189-11d3-9885-006008962422},11,-1,0
-+395,nsIJARProtocolHandler,{92c3b42c-98c4-11d3-8cd9-0060b0fc14a3},89,-1,1
-+396,nsIWebScriptsAccessService,{57e2860b-4266-4a85-bfde-ae39d945b014},1,-1,1
-+397,nsIWindowMediator,{0659cb81-faad-11d2-8e19-b206620a657c},23,-1,1
-+398,nsIXPIListener,{eea90d40-b059-11d2-915e-c12b696c9333},60,-1,0
-+399,nsIGenericInterfaceInfoSet,{8cc674ee-52ba-45fa-b897-bb88d35eaa91},1,-1,0
-+400,nsIAutoCompletePopup,{65f6cd46-22ec-4329-bb3b-bcd1103f2204},29,-1,1
-+401,nsIFullScreen,{9854976e-1dd1-11b2-8350-e6d35099fbce},18,-1,1
-+402,nsIExtensionManager,{c3515b0f-99f4-453b-805e-1fdf5724d6d9},62,-1,1
-+403,nsIDOMNSCSS2Properties,{d9651867-7414-41a7-9b4b-af852dc11fcc},3,-1,1
-+404,nsIDOMPkcs11,{9fd42950-25e7-11d4-8a7d-006008c844c3},10,-1,1
-+405,nsIRequest,{ef6bfbd2-fd46-48d8-96b7-9f8f0fd387fe},2,-1,1
-+406,nsIDOMCSSPageRule,{a6cf90bd-15b3-11d2-932e-00805f8add32},3,-1,1
-+407,nsIWebBrowserPrint,{9a7ca4b0-fbba-11d4-a869-00105a183419},19,-1,1
-+408,nsIDOMNameList,{e9ceba95-b62b-11d7-af68-000a95687b38},14,-1,1
-+409,nsIGlobalHistory2,{c4d143b7-22d7-4760-b9a0-ac942016f189},6,-1,1
-+410,nsIComponentLoaderManager,{fce83d37-a3c0-4e09-ad9f-6842a984dbdf},24,-1,0
-+411,nsIXPCComponents_Constructor,{88655640-e028-11d3-8f5d-0010a4e73d9a},11,-1,1
-+412,nsIBrowserHistory,{c43079c3-3d8d-4b7c-af14-0e30ab46865f},100,-1,1
-+413,nsISearchableInputStream,{8c39ef62-f7c9-11d4-98f5-001083010e9b},12,-1,1
-+414,nsIWindowDataSource,{3722a5b9-5323-4ed0-bb1a-8299f27a4e89},111,-1,1
-+415,nsIXMLHttpRequest,{7b3b3c62-9d53-4abc-bc89-c33ce78f439f},50,-1,1
-+416,nsIExternalHelperAppService,{663cc0aa-42ea-11d4-98d0-001083010e9b},63,-1,1
-+417,nsICharsetConverterManager,{f5323a76-c8f7-4c65-8d0c-1250e969c7d5},54,-1,1
-+418,nsIStreamTransportService,{3e0f7a3b-65fd-4e10-92f3-56a8f4622f55},2,-1,1
-+419,nsITrueTypeFontCatalogEntry,{11f3efad-316e-4982-b9cf-9c304b0d5237},8,-1,0
-+420,nsIFontPackageService,{6712fdd2-f978-11d4-a144-005004832142},41,-1,1
-+421,nsIStringInputStream,{450cd2d4-f0fd-424d-b365-b1251f80fd53},12,-1,1
-+422,nsIPhonetic,{bc6ea726-ab56-46b6-a21a-aa7b76d6818f},86,-1,1
-+423,nsISaveAsCharset,{33b87f70-7a9c-11d3-915c-006008a6edf6},64,-1,1
-+424,nsIInterfaceInfoSuperManager,{0ee22850-bc6a-11d5-9134-0010a4e73d9a},47,-1,0
-+425,nsIThread,{6be5e380-6886-11d3-9382-00104ba0fd40},31,-1,1
-+426,nsIDOMCSSValue,{009f7ea5-9e80-41be-b008-db62f10823f2},3,-1,1
-+427,nsISHContainer,{65281ba2-988a-11d3-bdc7-0050040a9b44},36,-1,1
-+428,nsICryptoFIPSInfo,{99e81922-7318-4431-b3aa-78b3cb4119bb},2,-1,1
-+429,nsIMenuBoxObject,{f5099746-5049-4e81-a03e-945d5110fee2},38,-1,1
-+430,nsIWSDLPort,{0458dac1-65de-11d5-9b42-00104bdf5339},1,-1,1
-+431,nsICookiePromptService,{72f8bb14-2810-4f38-8d0d-290c5401f54e},77,-1,1
-+432,nsIDOMLSException,{1cc8e4b3-1dbb-4adc-a913-1527bf67748c},32,-1,1
-+433,nsIX509CertDB,{da48b3c0-1284-11d5-ac67-000064657374},5,-1,1
-+434,nsIDOMHTMLFieldSetElement,{a6cf9097-15b3-11d2-932e-00805f8add32},0,-1,1
-+435,nsIStreamLoader,{31d37360-8e5a-11d3-93ad-00104ba0fd40},2,-1,1
-+436,nsIDOMWindowCollection,{a6cf906f-15b3-11d2-932e-00805f8add32},10,-1,1
-+437,nsIInputStream,{fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a},12,-1,1
-+438,nsIPermission,{28f16d80-157b-11d5-a542-0010a401eb10},77,-1,1
-+439,nsIBidirectionalEnumerator,{75f158a0-cadd-11d2-8cca-0060b0fc14a3},9,-1,0
-+440,nsIAsyncStreamListener,{1b012ade-91bf-11d3-8cd9-0060b0fc14a3},2,-1,1
-+441,nsIBrowserDOMWindow,{48987797-dd33-46d4-a860-8d420810669c},10,-1,1
-+442,nsIWindowWatcher,{002286a8-494b-43b3-8ddd-49e3fc50622b},39,-1,1
-+443,nsIDOMRange,{a6cf90ce-15b3-11d2-932e-00805f8add32},52,-1,1
-+444,nsISHistory,{7294fe9b-14d8-11d5-9882-00c04fa02f40},36,-1,1
-+445,nsIXRemoteClient,{0bafc924-1dd2-11b2-8345-b59762ae0df7},18,-1,1
-+446,nsIAccessible,{b26fbe47-9a5f-42a1-822b-082461ae4d6d},7,-1,1
-+447,nsIDOMXULLabeledControlElement,{a457ea70-1dd1-11b2-9089-8fd894122084},15,-1,1
-+448,nsIDOMHTMLOptionsCollection,{bce0213c-f70f-488f-b93f-688acca55d63},0,-1,1
-+449,nsIDOMNSEvent,{e565d518-4510-407f-a3d9-3b4107549c6d},17,-1,1
-+450,nsIBufferedInputStream,{616f5b48-da09-11d3-8cda-0060b0fc14a3},2,-1,1
-+451,nsICertTree,{4ea60761-31d6-491d-9e34-4b53a26c416c},5,-1,1
-+452,nsIComponentRegistrar,{2417cbfe-65ad-48a6-b4b6-eb84db174392},24,-1,1
-+453,nsIFileChannel,{68a26506-f947-11d3-8cda-0060b0fc14a3},95,-1,1
-+454,nsIPluginHost,{264c0640-1c31-11d2-a82e-0040959a28c9},20,-1,0
-+455,nsIBoxLayoutManager,{dc06b890-15a1-45a9-a1a3-f144b42eea29},38,-1,1
-+456,nsIModule,{7392d032-5371-11d3-994e-00805fd26fee},24,-1,1
-+457,nsIPlugin,{df773070-0199-11d2-815b-006008119d7a},20,-1,0
-+458,nsIPrefService,{decb9cc7-c08f-4ea5-be91-a8fc637ce2d2},26,-1,1
-+459,nsIXPInstallManagerUI,{087f52a4-8fd8-40ab-ae52-c3e161810141},45,-1,1
-+460,nsISocketProvider,{4c29772e-cf73-414a-98d9-661761a4511a},71,-1,0
-+461,nsIWindowlessPluginInstancePeer,{57b4e2f0-019b-11d2-815b-006008119d7a},20,-1,0
-+462,nsIDOMDocumentEvent,{46b91d66-28e2-11d4-ab1e-0010830123b4},17,-1,1
-+463,nsIScriptableConstant,{0f6c5b09-88b0-43ca-b55c-578f24f3d810},1,-1,1
-+464,nsIDOMHTMLStyleElement,{a6cf908d-15b3-11d2-932e-00805f8add32},0,-1,1
-+465,nsIProxiedProtocolHandler,{0a24fed4-1dd2-11b2-a75c-9f8b9a8f9ba7},2,-1,1
-+466,nsIDOMMimeTypeArray,{f6134683-f28b-11d2-8360-c90899049c3c},10,-1,1
-+467,nsIDNSListener,{36413eba-3a2a-444d-b88e-df9b6d306b73},75,-1,1
-+468,nsIWSDLPart,{0458dac4-65de-11d5-9b42-00104bdf5339},1,-1,1
-+469,inIDeepTreeWalker,{91fca0e9-99d6-406b-9d78-4c96f11e9ee4},28,-1,1
-+470,nsIDocShellTreeItem,{b52ae780-a966-11d3-afc7-00a024ffc08c},6,-1,1
-+471,nsIPrincipal,{0575ea96-4561-4dc6-a818-3c4c97c2430d},22,-1,0
-+472,nsIDOMDocumentView,{1acdb2ba-1dd2-11b2-95bc-9542495d2569},110,-1,1
-+473,nsICMSMessageErrors,{f2aec680-60a0-49f0-afe5-6cf1d3f15e0d},5,-1,1
-+474,inISearchObserver,{46226d9b-e398-4106-8d9b-225d4d0589f5},28,-1,1
-+475,nsIPasswordManager,{173562f0-2173-11d5-a54c-0010a401eb10},2,-1,1
-+476,nsISupportsID,{d18290a0-4a1c-11d3-9890-006008962422},9,-1,1
-+477,nsIRollupListener,{23c2ba03-6c76-11d3-96ed-0060b0fb9956},18,-1,0
-+478,nsIResProtocolHandler,{067ca872-e947-4bd6-8946-a479cb6ba5dd},108,-1,1
-+479,nsIServerSocketListener,{836d98ec-fee2-4bde-b609-abd5e966eabd},2,-1,1
-+480,mozIJSSubScriptLoader,{8792d77e-1dd2-11b2-ac7f-9bc9be4f2916},11,-1,1
-+481,nsIAccessNode,{46820f9b-3088-4046-ab0f-56fdacdc7a82},7,-1,1
-+482,nsIDocumentStateListener,{050cdc00-3b8e-11d3-9ce4-a458f454fcbc},4,-1,1
-+483,nsIDOMNSRange,{a6cf90f2-15b3-11d2-932e-00805f8add32},52,-1,1
-+484,nsIFontCatalogEntry,{70406f93-5b53-49a0-b5a7-ebf533bfe59b},8,-1,0
-+485,nsITooltipTextProvider,{b128a1e6-44f3-4331-8fbe-5af360ff21ee},19,-1,0
-+486,nsIXPCComponents_Classes,{978ff520-d26c-11d2-9842-006008962422},11,-1,1
-+487,nsIFastLoadService,{759e475e-0c23-4dbf-b1b8-78c9369e3072},12,-1,1
-+488,nsIDOMDOMImplementationLS,{e2c8b03c-a49a-4923-81b0-ba9a86da0e21},32,-1,1
-+489,nsISchemaLoadListener,{3c14a033-6f4e-11d5-9b46-000064657374},1,-1,1
-+490,nsIAutoConfig,{80db54ae-13f2-11d5-be44-00108335a220},103,-1,0
-+491,nsIWindowCreator2,{f673ec81-a4b0-11d6-964b-eb5a2bf216fc},96,-1,1
-+492,nsIBaseWindow,{046bc8a0-8015-11d3-af70-00a024ffc08c},18,-1,1
-+493,nsIFastLoadFileControl,{8a1e2c63-af50-4147-af7e-26289dc180dd},12,-1,1
-+494,nsIAccessibleHyperText,{8f18d922-1dd2-11b2-82ea-829b78a44413},34,-1,1
-+495,nsIJVMAuthTools,{82274a32-a196-42ee-8e3b-fcb73e339518},65,-1,0
-+496,nsISOAPMessage,{3970815e-1dd2-11b2-a475-db4dac6826f1},1,-1,1
-+497,nsIContextMenuInfo,{2f977d56-5485-11d4-87e2-0010a4e75ef2},19,-1,0
-+498,nsIHttpProtocolHandler,{122c91c0-2485-40ba-89c9-b895934921bc},40,-1,1
-+499,nsIThreadJSContextStack,{a1339ae0-05c1-11d4-8f92-0010a4e73d9a},11,-1,0
-+500,nsILocaleService,{48ab1fa0-4550-11d3-91cd-00105aa3f7dc},41,-1,1
-+501,nsIDOMBarProp,{9eb2c150-1d56-11d3-8221-0060083a0bcf},10,-1,1
-+502,nsIPluginInstanceOwner,{f2b9bcb5-95e8-4e15-a439-74b8b45d7846},20,-1,0
-+503,nsIHttpHeaderVisitor,{0cf40717-d7c1-4a94-8c1e-d6c9734101bb},40,-1,1
-+504,imgILoad,{e6273acc-1dd1-11b2-a08b-824ad1b1628d},35,-1,1
-+505,nsIPrintSettingsService,{841387c8-72e6-484b-9296-bf6eea80d58a},8,-1,1
-+506,nsIRelativeFilePref,{2f977d4e-5485-11d4-87e2-0010a4e75ef2},26,-1,1
-+507,nsIObjectInputStream,{6c248606-4eae-46fa-9df0-ba58502368eb},12,-1,1
-+508,nsISchemaAnyParticle,{3c14a02b-6f4e-11d5-9b46-000064657374},1,-1,1
-+509,nsIDirIndex,{23bbabd0-1dd2-11b2-86b7-aad68ae7d7e0},51,-1,1
-+510,nsIPasswordManagerInternal,{dc2ff152-85cb-474e-b4c2-86a3d48cf4d0},2,-1,1
-+511,inIFileSearch,{efa53257-526d-4350-9088-343a510346b8},28,-1,1
-+512,nsIFormFillController,{872f07f3-ed11-47c6-b7cf-246db53379fb},84,-1,1
-+513,nsIDOMXULMenuListElement,{3d49950e-04f9-4e35-a9a0-ffd51356a674},15,-1,1
-+514,nsIDictionary,{1dd0cb45-aea3-4a52-8b29-01429a542863},69,-1,1
-+515,nsIDOMHTMLObjectElement,{a6cf90ac-15b3-11d2-932e-00805f8add32},0,-1,1
-+516,nsIViewSourceChannel,{8b77d6e2-2ae9-11d5-be57-000064657374},114,-1,0
-+517,nsIDownload,{b0aae798-78aa-4769-9f0e-9aef4cf9474d},27,-1,1
-+518,nsIDOMJSPluginArray,{ee753352-1dd1-11b2-b18d-b0b7320a28c3},10,-1,1
-+519,nsIURL,{d6116970-8034-11d3-9399-00104ba0fd40},2,-1,1
-+520,nsIMultiplexInputStream,{a076fd12-1dd1-11b2-b19a-d53b5dffaade},12,-1,1
-+521,nsIClipboardCommands,{b8100c90-73be-11d2-92a5-00105a1b0d64},61,-1,1
-+522,nsIWebServiceProxyCreationListener,{a711250b-47da-4f16-a1fd-593de16375a1},1,-1,1
-+523,nsIDOMKeyEvent,{028e0e6e-8b01-11d3-aae7-0010838a3123},17,-1,1
-+524,nsIInternetSearchService,{6bd1d803-1c67-11d3-9820-ed1b357eb3c4},66,-1,1
-+525,jsdIDebuggerService,{01be7f9a-1dd2-11b2-9d55-aaf919b27c73},16,-1,1
-+526,nsIDocShellTreeNode,{c094f810-a8ab-11d3-afc6-00a024ffc08c},6,-1,1
-+527,nsIFind,{75125d55-37ee-4575-b9b5-f33bfa68c2a1},68,-1,1
-+528,nsISchemaListType,{3c14a025-6f4e-11d5-9b46-000064657374},1,-1,1
-+529,nsIFastLoadWriteControl,{2ad6e9e6-1379-4e45-a899-a54b27ff915c},12,-1,1
-+530,nsICookieConsent,{f5a34f50-1f39-11d6-a627-0010a401eb10},46,-1,1
-+531,nsIPrintStatusFeedback,{19855dff-3248-4902-b196-93ee4c477880},13,-1,1
-+532,nsIPluginTagInfo2,{6a49c9a0-019b-11d2-815b-006008119d7a},20,-1,0
-+533,nsIProfileInternal,{2f977d42-5485-11d4-87e2-0010a4e75ef2},43,-1,1
-+534,nsIMenuRollup,{05c48880-0fcf-11d4-bb6f-d9f289fe803c},18,-1,0
-+535,nsIDOMJSNavigator,{4b4f8316-1dd2-11b2-b265-9a857376d159},10,-1,1
-+536,nsIScriptableDateFormat,{0c89efb0-1aae-11d3-9141-006008a6edf6},41,-1,1
-+537,nsIDOMDOMImplementation,{a6cf9074-15b3-11d2-932e-00805f8add32},14,-1,1
-+538,nsIDOM3EventTarget,{3e9c01a7-de97-4c3b-8294-b4bd9d7056d1},17,-1,1
-+539,nsIJVMConfig,{3e333e20-b190-42d8-b993-d5fa435e46c4},65,-1,1
-+540,nsIDOMXPathNSResolver,{75506f83-b504-11d5-a7f2-ca108ab8b6fc},56,-1,1
-+541,nsIFTPChannel,{3476df52-1dd2-11b2-b928-925d89b33bc0},106,-1,1
-+542,nsIDOMCSSValueList,{8f09fa84-39b9-4dca-9b2f-db0eeb186286},3,-1,1
-+543,nsIDOMHTMLFontElement,{a6cf90a7-15b3-11d2-932e-00805f8add32},0,-1,1
-+544,nsISchemaAttributeComponent,{3c14a02d-6f4e-11d5-9b46-000064657374},1,-1,1
-+545,nsIJSConsoleService,{1b86a0a6-1dd2-11b2-a85c-e3f42b4dcceb},116,-1,1
-+546,nsILocaleDefinition,{7c094410-4558-11d3-91cd-00105aa3f7dc},41,-1,1
-+547,nsIPropertyBag,{bfcd37b0-a49f-11d5-910d-0010a4e73d9a},9,-1,1
-+548,nsISOAPServiceRegistry,{9790d6bc-1dd1-11b2-afe0-bcb310c078bf},1,-1,1
-+549,nsISOAPResponse,{99ec6691-535f-11d4-9a58-000064657374},1,-1,1
-+550,nsIFormSigningDialog,{4fe04d6d-4b66-4023-a0bc-b43ce68b3e15},5,-1,1
-+551,nsIProtocolHandler,{15fd6940-8ea7-11d3-93ad-00104ba0fd40},2,-1,1
-+552,nsITypeAheadFind,{1a834a64-3b06-4b75-b05b-96ca4e35a2a1},93,-1,1
-+553,nsISSLStatusProvider,{8de811f0-1dd2-11b2-8bf1-e9aa324984b2},82,-1,1
-+554,nsIProxyAutoConfig,{26fae72a-1dd2-11b2-9dd9-cb3e0c2c79ba},2,-1,1
-+555,nsIAsyncInputStream,{15a15329-00de-44e8-ab06-0d0b0d43dc5b},12,-1,1
-+556,nsIAccessibleValue,{f4abbc2f-0f28-47dc-a9e9-f7a1719ab2be},34,-1,1
-+557,nsPIAccessibleDocument,{f0809603-74e8-4284-8366-b293a5d0b758},7,-1,1
-+558,nsISupportsArray,{791eafa0-b9e6-11d1-8031-006008159b5a},9,-1,1
-+559,nsPIWindowWatcher,{d535806e-afaf-47d1-8d89-783ad088c62a},39,-1,0
-+560,nsIToolkitProfile,{87cea5c2-b9ed-44f9-8984-e75bc9f7134a},70,-1,1
-+561,nsIDOMMediaList,{9b0c2ed7-111c-4824-adf9-ef0da6dad371},74,-1,1
-+562,nsIProxy,{0492d011-cd2f-11d2-b013-006097bfc036},2,-1,1
-+563,nsIWebBrowserPersist,{814ba433-a816-4785-9f95-ad3ba0a43dab},42,-1,1
-+564,nsIFormHistory,{fa5a871d-29f5-489e-aaa4-c266def52b79},84,-1,1
-+565,nsIDirIndexParser,{38e3066c-1dd2-11b2-9b59-8be515c1ee3f},51,-1,1
-+566,nsIProgrammingLanguage,{ea604e90-40ba-11d5-90bb-0010a4e73d9a},33,-1,1
-+567,nsIXULTemplateBuilder,{9da147a7-5854-49e3-a397-22ecdd93e96d},53,-1,1
-+568,nsIXPointerSchemeContext,{781f4aa1-ebb3-4667-b1c2-2b35e94c4281},78,-1,0
-+569,nsISemanticUnitScanner,{9f620be4-e535-11d6-b254-00039310a47a},117,-1,1
-+570,nsIDOMNSUIEvent,{a6cf90c4-15b3-11d2-932e-00805f8add32},17,-1,1
-+571,nsIDOMHTMLParagraphElement,{a6cf90a1-15b3-11d2-932e-00805f8add32},0,-1,1
-+572,nsIDOMNSHTMLElement,{da83b2ec-8264-4410-8496-ada3acd2ae42},0,-1,1
-+573,nsISupportsPRInt64,{e3cb0ff0-4a1c-11d3-9890-006008962422},9,-1,1
-+574,nsIEnumerator,{ad385286-cbc4-11d2-8cca-0060b0fc14a3},9,-1,1
-+575,nsIFile,{c8c0a080-0868-11d3-915f-d9d889d48e3c},12,-1,1
-+576,nsIDOMNSHTMLTextAreaElement,{ca066b44-9ddf-11d3-bccc-0060b0fc76bd},0,-1,1
-+577,nsIPromptService,{1630c61a-325e-49ca-8759-a31b16c47aa5},39,-1,1
-+578,nsICMSDecoder,{65244a06-a342-11d5-ba47-00108303b117},5,-1,0
-+579,nsIHash,{a31a3028-ae28-11d5-ba4b-00108303b117},5,-1,0
-+580,nsIVersionChecker,{22d35700-5765-42e1-914b-a0da7c911a8c},48,-1,1
-+581,nsIDOMNodeList,{a6cf907d-15b3-11d2-932e-00805f8add32},14,-1,1
-+582,nsIInputStreamChannel,{560a64ce-6d66-44db-b38e-864469c52d03},2,-1,1
-+583,nsISOAPEncoder,{fc33ffd6-1dd1-11b2-8750-fa62430a38b4},1,-1,1
-+584,nsIEditorBoxObject,{14b3b669-3414-4548-aa03-edf257d889c8},38,-1,1
-+585,nsIPrintSession,{2f977d52-5485-11d4-87e2-0010a4e75ef2},8,-1,0
-+586,nsIDOMHTMLTableRowElement,{a6cf90b6-15b3-11d2-932e-00805f8add32},0,-1,1
-+587,nsIAccessibleProvider,{3f0e3eb0-1dd2-11b2-9605-be5b8e76cf4b},7,-1,1
-+588,nsIDOMHTMLButtonElement,{a6cf9095-15b3-11d2-932e-00805f8add32},0,-1,1
-+589,nsITransfer,{d80095a7-e81c-464c-a13f-ecb84feb969f},27,-1,1
-+590,nsISSLSocketProvider,{856a93d0-5415-11d3-bbc8-0000861d1237},71,-1,0
-+591,nsIDOMHTMLTableColElement,{a6cf90b4-15b3-11d2-932e-00805f8add32},0,-1,1
-+592,nsIScriptEventManager,{b6427ace-dc77-495b-ab21-43baeb52bc27},13,-1,0
-+593,nsIDOMCSSRuleList,{a6cf90c0-15b3-11d2-932e-00805f8add32},3,-1,1
-+594,nsICookieManager2,{3e73ff5f-154e-494f-b640-3c654ba2cc2b},46,-1,1
-+595,nsIControllerContext,{47b82b60-a36f-4167-8072-6f421151ed50},44,-1,1
-+596,nsIDirIndexListener,{fae4e9a8-1dd1-11b2-b53c-8f3aa1bbf8f5},51,-1,1
-+597,nsIDOMHTMLIsIndexElement,{a6cf908c-15b3-11d2-932e-00805f8add32},0,-1,1
-+598,nsIExpatSink,{1deea160-c661-11d5-84cc-0010a4e0c706},94,-1,1
-+599,nsIWebBrowserSetup,{f15398a0-8018-11d3-af70-00a024ffc08c},19,-1,1
-+600,nsISchemaBuiltinType,{3c14a024-6f4e-11d5-9b46-000064657374},1,-1,1
-+601,nsPICertNotification,{42cd7162-ea4a-4088-9888-63ea5095869e},60,-1,0
-+602,nsIBidirectionalIterator,{948defaa-1dd1-11b2-89f6-8ce81f5ebda9},9,-1,1
-+603,nsIEditorObserver,{a6cf9125-15b3-11d2-932e-00805f8add32},4,-1,1
-+604,nsIScriptableMethodInfo,{9228afa2-187c-4feb-9228-5108e640ca33},1,-1,1
-+605,nsIIOService,{bddeda3f-9020-4d12-8c70-984ee9f7935e},2,-1,1
-+606,nsIDOMHTMLFormElement,{a6cf908f-15b3-11d2-932e-00805f8add32},0,-1,1
-+607,nsITooltipListener,{44b78386-1dd2-11b2-9ad2-e4eee2ca1916},19,-1,0
-+608,nsIEvaluateStringProxy,{67411da0-7c2e-11d3-8c67-00609792278c},109,-1,0
-+609,nsIDOMNSHTMLAnchorElement,{a6cf911c-15b3-11d2-932e-00805f8add32},0,-1,1
-+610,nsIHttpAuthenticator,{0f331436-8bc8-4c68-a124-d0253a19d06f},40,-1,1
-+611,nsIDOMNSHTMLImageElement,{a6cf90c7-15b3-11d2-932e-00805f8add32},0,-1,1
-+612,nsISMimeCert,{66710f97-a4dd-49f1-a906-fe0ebc5924c0},5,-1,1
-+613,nsIAtom,{3d1b15b0-93b4-11d1-895b-006008911b81},9,-1,1
-+614,nsISOAPResponseListener,{99ec6692-535f-11d4-9a58-000064657374},1,-1,1
-+615,nsICMSSecureMessage,{14b4394a-1dd2-11b2-b4fd-ba4a194fe97e},5,-1,1
-+616,nsIStringBundleService,{d85a17c0-aa7c-11d2-9b8c-00805f8a16d9},81,-1,1
-+617,nsIProcess,{9da0b650-d07e-4617-a18a-250035572ac8},31,-1,1
-+618,nsIAuthModule,{991eff7c-a8ba-441a-b71b-753bd8e6d6be},2,-1,0
-+619,nsIStringBundleOverride,{965eb278-5678-456b-82a7-20a0c86a803c},81,-1,1
-+620,nsIDOMDOMException,{a6cf910a-15b3-11d2-932e-00805f8add32},14,-1,1
-+621,nsIScriptableUnicodeConverter,{d395ef67-a613-47b9-b5e3-dc7ce1bdb71a},54,-1,1
-+622,nsIFastLoadFileIO,{715577db-d9c5-464a-a32e-0a40c29b22d4},12,-1,1
-+623,nsISOAPPartBinding,{0458dac9-65de-11d5-9b42-00104bdf5339},1,-1,1
-+624,nsIComponentManager,{a88e5a60-205a-4bb1-94e1-2628daf51eae},24,-1,1
-+625,nsIGConfService,{01ac7b2e-c07c-465f-b35c-542eaef420a9},55,-1,1
-+626,nsIProfileStartup,{048e5ca1-0eb7-4bb1-a9a2-a36f7d4e0e3c},70,-1,1
-+627,nsIControllerCommandGroup,{9f82c404-1c7b-11d5-a73c-eca43ca836fc},58,-1,1
-+628,nsIDOMLocation,{a6cf906d-15b3-11d2-932e-00805f8add32},10,-1,1
-+629,nsITXTToHTMLConv,{933355f6-1dd2-11b2-a9b0-d335b9e35983},51,-1,1
-+630,nsIRDFBlob,{237f85a2-1dd2-11b2-94af-8122582fc45e},21,-1,1
-+631,nsIDOMHTMLHeadElement,{a6cf9087-15b3-11d2-932e-00805f8add32},0,-1,1
-+632,nsIXPCComponents_Exception,{5bf039c0-e028-11d3-8f5d-0010a4e73d9a},11,-1,1
-+633,nsIASN1PrintableItem,{114e1142-1dd2-11b2-ac26-b6db19d9184a},5,-1,1
-+634,nsIDOMNSHTMLButtonElement,{c914d7a4-63b3-4d40-943f-91a3c7ab0d4d},0,-1,1
-+635,nsIDOMHTMLMapElement,{a6cf90af-15b3-11d2-932e-00805f8add32},0,-1,1
-+636,nsIDOMHTMLLinkElement,{a6cf9088-15b3-11d2-932e-00805f8add32},0,-1,1
-+637,nsIXULSortService,{bfd05261-834c-11d2-8eac-00805f29f371},53,-1,1
-+638,nsIDOMNSHTMLOptionCollection,{1181207b-2337-41a7-8ddf-fbe96461256f},0,-1,1
-+639,nsIXULTreeBuilder,{06b31b15-ebf5-4e74-a0e2-6bc0a18a3969},53,-1,1
-+640,nsIModifyableXPointerResult,{2dc3be2e-642d-4d7e-b3c5-f3dac51afbee},78,-1,0
-+641,nsIDOMXULImageElement,{f73f4d77-a6fb-4ab5-b41e-15045a0cc6ff},15,-1,1
-+642,nsIXPointerEvaluator,{addd0fe5-8555-45b7-b763-97d5898ce268},78,-1,0
-+643,nsIFileURL,{d26b2e2e-1dd1-11b2-88f3-8545a7ba7949},2,-1,1
-+644,nsIFindService,{5060b801-340e-11d5-be5b-b3e063ec6a3c},73,-1,1
-+645,nsIClipboardHelper,{44073a98-1dd2-11b2-8600-d0ae854dbe93},18,-1,1
-+646,nsIWebProgressListener,{570f39d1-efd0-11d3-b093-00a024ffc08c},27,-1,1
-+647,nsIReadConfig,{ba5bc4c6-1dd1-11b2-bb89-b844c6ec0339},103,-1,0
-+648,nsIDragService,{8b5314bb-db01-11d2-96ce-0060b0fb9956},18,-1,1
-+649,nsIOCSPResponder,{96b2f5ae-4334-11d5-ba27-00108303b117},5,-1,1
-+650,nsIExtensionItemUpdater,{c0b7517f-0b3a-41a2-bde8-ba3ac8a5af47},62,-1,1
-+651,nsILocale,{21035ee0-4556-11d3-91cd-00105aa3f7dc},41,-1,1
-+652,nsIUpdateItem,{37648f86-0f77-4007-929e-673a75d5438f},48,-1,1
-+653,nsICiter,{a6cf9102-15b3-11d2-932e-00805f8add32},4,-1,1
-+654,nsISchemaRestrictionType,{3c14a027-6f4e-11d5-9b46-000064657374},1,-1,1
-+655,nsIXSLTException,{e06dfaea-92d5-47f7-a800-c5f5404d8771},76,-1,1
-+656,nsIXULBrowserWindow,{46b4015c-0121-11d4-9877-00c04fa0d27a},91,-1,1
-+657,nsIDialogParamBlock,{f76c0901-437a-11d3-b7a0-e35db351b4bc},39,-1,1
-+658,nsIFileProtocolHandler,{987fb083-d7ff-46dc-9ee3-ab6e52501d53},95,-1,1
-+659,nsIDOM3Node,{29fb2a18-1dd2-11b2-8dd9-a6fd5d5ad12f},14,-1,1
-+660,nsIDOMHTMLUListElement,{a6cf9099-15b3-11d2-932e-00805f8add32},0,-1,1
-+661,nsIUnicodeNormalizer,{b43a461f-1bcf-4329-820b-66e48c979e14},64,-1,1
-+662,nsIXULChromeRegistry,{f4c2e8a8-ff7b-472a-a6b7-ef0444f2a60e},13,-1,1
-+663,nsIXPointerResult,{d3992637-f474-4b65-83ed-323fe69c60d2},78,-1,1
-+664,nsIDOMCRMFObject,{16da46c0-208d-11d4-8a7c-006008c844c3},10,-1,1
-+665,nsISerializable,{91cca981-c26d-44a8-bebe-d9ed4891503a},9,-1,1
-+666,nsIDOMHTMLTitleElement,{a6cf9089-15b3-11d2-932e-00805f8add32},0,-1,1
-+667,nsISupportsChar,{e2b05e40-4a1c-11d3-9890-006008962422},9,-1,1
-+668,nsIContextMenuListener2,{7fb719b3-d804-4964-9596-77cf924ee314},19,-1,0
-+669,nsIDOMWindowUtils,{7e1ec6ff-2e67-4b26-aa39-a3eb2a3b8a4e},10,-1,1
-+670,nsIDOMXULPopupElement,{c32390a8-2bd8-4d1b-bf9f-1b1d0a944d19},15,-1,1
-+671,nsISchemaComplexType,{3c14a028-6f4e-11d5-9b46-000064657374},1,-1,1
-+672,nsIDOMLinkStyle,{24d89a65-f598-481e-a297-23cc02599bbd},74,-1,1
-+673,nsIOSChromeItem,{ddd6790a-1dd1-11b2-a804-b522643903b9},18,-1,1
-+674,nsIFileView,{60b320d2-1dd2-11b2-bd73-dc3575f78ddd},90,-1,1
-+675,nsIConsoleService,{a647f184-1dd1-11b2-a9d1-8537b201161b},33,-1,1
-+676,nsIDocShellTreeOwner,{80f30e10-a7cf-11d3-afc5-00a024ffc08c},6,-1,1
-+677,nsIContextMenuListener,{3478b6b0-3875-11d4-94ef-0020183bf181},19,-1,0
-+678,nsIExceptionManager,{efc9d00b-231c-4feb-852c-ac017266a415},33,-1,1
-+679,nsITimerInternal,{6dd8f185-ceb8-4878-8e38-2d13edc2d079},31,-1,1
-+680,nsISOAPTransportListener,{99ec6696-535f-11d4-9a58-000064657374},1,-1,1
-+681,nsIDOMComment,{a6cf9073-15b3-11d2-932e-00805f8add32},14,-1,1
-+682,nsIRegistry,{5d41a440-8e37-11d2-8059-00600811a9c3},25,-1,1
-+683,nsIHelperAppLauncherDialog,{d7ebddf0-4c84-11d4-807a-00600811a9c3},105,-1,1
-+684,jsdIProperty,{b8816e56-1dd1-11b2-81dc-8ba99a833d9e},16,-1,1
-+685,nsPIEditorTransaction,{4f18ada2-0ddc-11d5-9d3a-0060b0f8baff},4,-1,1
-+686,nsIScriptablePlugin,{f1a12bba-1dd1-11b2-a95f-cdc118605e92},20,-1,0
-+687,nsIRDFInferDataSource,{2b04860f-4017-40f6-8a57-784a1e35077a},21,-1,1
-+688,imgIDecoder,{9eebf43a-1dd1-11b2-953e-f1782f4cbad3},35,-1,1
-+689,nsISchemaAnyAttribute,{3c14a030-6f4e-11d5-9b46-000064657374},1,-1,1
-+690,nsIZipReaderCache,{52c45d86-0cc3-11d4-986e-00c04fa0cf4a},72,-1,1
-+691,nsIProperty,{6dcf9030-a49f-11d5-910d-0010a4e73d9a},9,-1,1
-+692,nsIDOMStyleSheetList,{a6cf9081-15b3-11d2-932e-00805f8add32},74,-1,1
-+693,nsIDNSRecord,{31c9c52e-1100-457d-abac-d2729e43f506},75,-1,1
-+694,nsIDOMCSSCharsetRule,{19fe78cc-65ff-4b1d-a5d7-9ea89692cec6},3,-1,1
-+695,nsISOAPPortBinding,{0458dac7-65de-11d5-9b42-00104bdf5339},1,-1,1
-+696,nsIContentPolicy,{3bb1a3c8-3073-41e0-9a26-a7671955fb65},13,-1,1
-+697,nsIDOMNSDocumentStyle,{4ecdf254-a21e-47b0-8d72-55da8208299f},74,-1,1
-+698,nsIObjectOutputStream,{92c898ac-5fde-4b99-87b3-5d486422094b},12,-1,1
-+699,nsIDOMDOMStringList,{893f2075-b62b-11d7-af68-000a95687b38},14,-1,1
-+700,nsIDOMHTMLLabelElement,{a6cf9096-15b3-11d2-932e-00805f8add32},0,-1,1
-+701,nsITextServicesFilter,{5bec321f-59ac-413a-a4ad-8a8d7c50a0d0},115,-1,1
-+702,nsIResumableChannel,{87cccd68-1dd2-11b2-8b66-cbf10a1b6438},2,-1,1
-+703,nsIScriptLoaderObserver,{501209d3-7edf-437d-9948-3c6d1c08ef7f},13,-1,1
-+704,nsIHttpChannelInternal,{7552588e-d018-48a2-b67c-432414d0b64c},40,-1,1
-+705,nsICollationFactory,{04971e14-d6b3-4ada-8cbb-c3a13842b349},41,-1,1
-+706,nsIPrefetchService,{933cb52a-2864-4a40-8678-a2d0851b0ef4},113,-1,1
-+707,nsPIAccessible,{52f1be88-84f7-4f7f-b31c-062afe7df15d},7,-1,1
-+708,nsIDocShellTreeItemTmp,{9af94896-03fd-4646-bfc0-7b589cfe9dd5},6,-1,1
-+709,nsIRequestObserverProxy,{3c9b532e-db84-4ecf-aa6a-4d38a9c4c5f0},2,-1,1
-+710,nsICacheMetaDataVisitor,{22f9a49c-3cf8-4c23-8006-54efb11ac562},37,-1,1
-+711,nsIListBoxObject,{fde7c970-0b4e-49f4-b1eb-974ae6c96336},38,-1,1
-+712,nsIEventQueue,{176afb41-00a4-11d3-9f2a-00400553eef0},31,-1,1
-+713,nsIDOM3Document,{2e0e9ea1-72ab-4d9e-bdeb-ca64e1abeba4},14,-1,1
-+714,nsIByteRangeRequest,{39befdb9-fa76-469b-85dc-a617b81f26eb},2,-1,1
-+715,nsIArray,{114744d9-c369-456e-b55a-52fe52880d2d},9,-1,1
-+716,nsIDOMUserDataHandler,{5470deff-03c9-41b7-a824-e3225266b343},14,-1,1
-+717,nsIKeygenThread,{195763b8-1dd2-11b2-a843-eb44e44aaa37},5,-1,1
-+718,nsIJRILiveConnectPluginInstancePeer,{25b63f40-f773-11d1-815b-006008119d7a},20,-1,0
-+719,nsIXPCWrappedJSObjectGetter,{254bb2e0-6439-11d4-8fe0-0010a4e73d9a},11,-1,1
-+720,nsIPKCS11Slot,{c2d4f296-ee60-11d4-998b-00b0d02354a0},5,-1,1
-+721,nsIMutableArray,{2cd0b2f8-d4dd-48b8-87ba-b0200501f079},9,-1,1
-+722,nsIWebServiceCallContext,{87d87900-f102-4a15-b345-7b77a49d2df2},1,-1,1
-+723,nsIPluginInputStream,{af160530-542a-11d2-8164-006008119d7a},20,-1,0
-+724,nsIDOMHTMLDListElement,{a6cf909b-15b3-11d2-932e-00805f8add32},0,-1,1
-+725,nsICommandManager,{080d2001-f91e-11d4-a73c-f9242928207c},44,-1,1
-+726,nsIXPCException,{b2a34010-3983-11d3-9888-006008962422},11,-1,1
-+727,nsIDOMXULLabelElement,{f68136d6-1dd1-11b2-a184-a55a337e8507},15,-1,1
-+728,nsIRDFResource,{fb9686a7-719a-49dc-9107-10dea5739341},21,-1,1
-+729,nsIXPTLoaderSink,{6e48c500-8682-4730-add6-7db693b9e7ba},47,-1,1
-+730,nsIDOMCSSRule,{a6cf90c1-15b3-11d2-932e-00805f8add32},3,-1,1
-+731,nsIEditorDocShell,{3bdb8f01-f141-11d4-a73c-fba4aba8a3fc},6,-1,1
-+732,nsIDocumentCharsetInfo,{2d40b291-01e1-11d4-9d0e-0050040007b2},80,-1,1
-+733,nsISyncLoadDOMService,{96a13c30-695a-492c-918b-04ae3edb4e4c},13,-1,1
-+734,nsIConsoleListener,{eaaf61d6-1dd1-11b2-bc6e-8fc96480f20d},33,-1,1
-+735,nsIUnicharStreamLoader,{8a3eca16-167e-443d-9485-7e84ed822e95},2,-1,1
-+736,nsIWebPageDescriptor,{6f30b676-3710-4c2c-80b1-0395fb26516e},6,-1,1
-+737,nsIMIMEService,{6c424c90-2fe7-11d3-a164-0050041caf44},49,-1,1
-+738,nsIDOMWindow2,{65455132-b96a-40ec-adea-52fa22b1028c},10,-1,1
-+739,nsISidebar,{577cb745-8caf-11d3-aaef-00805f8a4905},112,-1,1
-+740,nsIPipe,{f4211abc-61b3-11d4-9877-00c04fa0cf4a},12,-1,1
-+741,imgIContainer,{5e8405a4-1dd2-11b2-8385-bc8e3446cad3},35,-1,1
-+742,nsIDOMUIEvent,{a6cf90c3-15b3-11d2-932e-00805f8add32},17,-1,1
-+743,nsIJVMPluginInstance,{a0c057d0-01c1-11d2-815b-006008119d7a},65,-1,1
-+744,nsICipherInfoService,{766d47cb-6d8c-4e71-b6b7-336917629a69},5,-1,1
-+745,nsICollection,{83b6019c-cbc4-11d2-8cca-0060b0fc14a3},9,-1,1
-+746,nsISchema,{3c14a021-6f4e-11d5-9b46-000064657374},1,-1,1
-+747,nsIOutputIterator,{7330650e-1dd2-11b2-a0c2-9ff86ee97bed},9,-1,1
-+748,nsICookieStorage,{c8c05100-cfdb-11d2-bab8-b088e084e5bc},20,-1,0
-+749,nsITimerManager,{8fce8c6a-1dd2-11b2-8352-8cdd2b965efc},31,-1,1
-+750,nsIWSDLMessage,{0458dac3-65de-11d5-9b42-00104bdf5339},1,-1,1
-+751,nsIDOMStyleSheet,{a6cf9080-15b3-11d2-932e-00805f8add32},74,-1,1
-+752,nsIDOMHTMLParamElement,{a6cf90ad-15b3-11d2-932e-00805f8add32},0,-1,1
-+753,jsdIScript,{a38f65ca-1dd1-11b2-95d5-ff2947e9c920},16,-1,1
-+754,nsIClassInfo,{986c11d0-f340-11d4-9075-0010a4e73d9a},24,-1,1
-+755,nsISOCKSSocketInfo,{8f755c44-1dd2-11b2-a613-91117453fa95},71,-1,0
-+756,nsIEventQueueService,{a6cf90dc-15b3-11d2-932e-00805f8add32},31,-1,1
-+757,nsIDirectoryIterator,{d8c0a083-0868-11d3-915f-d9d889d48e3c},25,-1,1
-+758,nsISecurityCheckedComponent,{0dad9e8c-a12d-4dcb-9a6f-7d09839356e1},22,-1,1
-+759,nsIDocShell,{69e5de00-7b8b-11d3-af61-00a024ffc08c},6,-1,1
-+760,nsIXRemoteService,{510c0946-1dd2-11b2-b210-f5031abff3f0},102,-1,1
-+761,nsIDOMViewCSS,{0b9341f3-95d4-4fa4-adcd-e119e0db2889},3,-1,1
-+762,nsIEnvironment,{101d5941-d820-4e85-a266-9a3469940807},31,-1,1
-+763,nsIJVMManager,{a1e5ed50-aa4a-11d1-85b2-00805f0e4dfe},65,-1,1
-+764,nsIScriptSecurityManagerObsolete,{58df5780-8006-11d2-bd91-00805f8ae3f4},22,-1,1
-+765,nsIDOMHTMLHtmlElement,{a6cf9086-15b3-11d2-932e-00805f8add32},0,-1,1
-+766,nsIObserver,{db242e01-e4d9-11d2-9dde-000064657374},9,-1,1
-+767,nsIAuthPromptWrapper,{6228d644-17fe-11d4-8cee-0060b0fc14a3},39,-1,1
-+768,nsIRDFXMLSerializer,{8ae1fbf8-1dd2-11b2-bd21-d728069cca92},21,-1,1
-+769,nsICMSEncoder,{a15789aa-8903-462b-81e9-4aa2cff4d5cb},5,-1,0
-+770,nsIBinaryInputStream,{7b456cb0-8772-11d3-90cf-0040056a906e},12,-1,1
-+771,nsIProfileStartupListener,{6962ca8f-0b8b-11d4-9875-00c04fa0d28b},43,-1,1
-+772,nsIFontPackageHandler,{6712fdd1-f978-11d4-a144-005004832142},41,-1,1
-+773,nsISchemaCollection,{427c5511-941b-48c0-9abc-8ec9ea5d964b},1,-1,1
-+774,nsIProxyCreateInstance,{948c2080-0398-11d3-915e-0000863011c4},97,-1,1
-+775,nsISecurityEventSink,{a71aee68-dd38-4736-bd79-035fea1a1ec6},2,-1,1
-+776,nsICommandHandler,{34a4fcf0-66fc-11d4-9528-0020183bf181},19,-1,1
-+777,nsIDOMEntity,{a6cf9079-15b3-11d2-932e-00805f8add32},14,-1,1
-+778,nsICollation,{b0132cc0-3786-4557-9874-910d7def5f93},41,-1,1
-+779,nsISupportsCString,{d65ff270-4a1c-11d3-9890-006008962422},9,-1,1
-+780,nsIDebug,{3bf0c3d7-3bd9-4cf2-a971-33572c503e1e},33,-1,1
-+781,IDispatch,{00020400-0000-0000-c000-000000000046},11,-1,1
-+782,nsIExceptionProvider,{0577744c-c1d2-47f2-8bcc-ce7a9e5a88fc},33,-1,1
-+783,nsIDOMParser,{4f45513e-55e5-411c-a844-e899057026c1},50,-1,1
-+784,nsIDOMTreeWalker,{400af3ca-1dd2-11b2-a50a-887ecca2e63a},57,-1,1
-+785,nsIClipboardDragDropHookList,{876a2015-6b66-11d7-8f18-0003938a9d96},18,-1,1
-+786,nsIWindowCreator,{30465632-a777-44cc-90f9-8145475ef999},96,-1,0
-+787,nsITreeView,{58a53734-1837-4f30-9bfd-ee58f63ca049},30,-1,1
-+788,nsIDOMDocumentXBL,{c7c0ae9b-a0ba-4f4e-9f2c-c18deb62ee8b},87,-1,1
-+789,nsICmdLineHandler,{ae12670a-1dd1-11b2-80cd-82ec93559deb},23,-1,1
-+790,nsIObserverService,{d07f5192-e3d1-11d2-8acd-00105a1b8860},9,-1,1
-+791,nsIAutoCompleteInput,{e312267f-8f57-43e8-a904-ff9b5d3f5aef},29,-1,1
-+792,nsIDOMHTMLFrameSetElement,{a6cf90b8-15b3-11d2-932e-00805f8add32},0,-1,1
-+793,nsIOnReadystatechangeHandler,{6459b7ce-6b57-4934-a0af-0133ba6f9085},50,-1,1
-+794,nsIFactory,{00000001-0000-0000-c000-000000000046},24,-1,1
-+795,nsIDragDropHandler,{4f418f58-f834-4736-a755-e0395bedca9d},13,-1,1
-+796,nsIXmlRpcClientListener,{27e60cd8-6d63-4d87-b7d1-82c09e0c7363},69,-1,1
-+797,nsIFIXptrEvaluator,{50d28211-8fb8-4323-b93d-08a6e80e559e},78,-1,0
-+798,nsISupportsPRTime,{e2563630-4a1c-11d3-9890-006008962422},9,-1,1
-+799,nsIWebBrowserFindInFrames,{e0f5d182-34bc-11d5-be5b-b760676c6ebc},68,-1,1
-+800,nsIJRILiveConnectPlugin,{c94058e0-f772-11d1-815b-006008119d7a},20,-1,0
-+801,inISearchProcess,{d5fa765b-2448-4686-b7c1-5ff13acb0fc9},28,-1,1
-+802,nsICacheService,{0ebec4c7-742f-4f27-8e7b-7c8a0cc76348},37,-1,1
-+803,nsISecurityPref,{94afd973-8045-4c6c-89e6-75bdced4209e},26,-1,0
-+804,nsIDOMHTMLLegendElement,{a6cf9098-15b3-11d2-932e-00805f8add32},0,-1,1
-+805,nsIDocShellHistory,{89caa9f0-8b1c-47fb-b0d3-f0aef0bff749},6,-1,1
-+806,nsICacheSession,{b4b419ad-28b7-4d25-9988-20fa98505a19},37,-1,1
-+807,nsIXPCSecurityManager,{31431440-f1ce-11d2-985a-006008962422},11,-1,0
-+808,nsIDOMHTMLEmbedElement,{123f90ab-15b3-11d2-456e-00805f8add32},0,-1,1
-+809,nsIDOMHTMLAnchorElement,{a6cf90aa-15b3-11d2-932e-00805f8add32},0,-1,1
-+810,nsIProfileMigrator,{24ce8b9d-b7ff-4279-aef4-26e158f03e34},70,-1,1
-+811,nsIRDFPropagatableDataSource,{5a9b4770-9fcb-4307-a12e-4b6708e78b97},21,-1,1
-+812,nsITreeBoxObject,{44481385-b1da-480a-9026-1f0232c4ee59},30,-1,1
-+813,nsIDOMChromeWindow,{934f7c7f-76cc-4246-a926-4e2b1b545f67},10,-1,1
-+814,nsISupports,{00000000-0000-0000-c000-000000000046},33,-1,1
-+815,nsIHttpEventSink,{9475a6af-6352-4251-90f9-d65b1cd2ea15},40,-1,1
-+816,nsISchemaElement,{3c14a02c-6f4e-11d5-9b46-000064657374},1,-1,1
-+817,nsIComponentLoader,{c073cfc0-567c-11d3-aec1-0000f8e25c06},24,-1,0
-+818,nsIDNSRequest,{3e538aea-d84b-4bf4-bae1-55f9969fe50e},75,-1,1
-+819,nsIPluginStreamListener,{df055770-5448-11d2-8164-006008119d7a},20,-1,0
-+820,nsIRDFXMLSinkObserver,{eb1a5d30-ab33-11d2-8ec6-00805f29f370},21,-1,1
-+821,nsIDownloadProgressListener,{09cddbea-1dd2-11b2-aa15-c41ffea19d79},45,-1,1
-+822,nsIPluginStreamInfo,{ed7d4ca0-b005-11d2-adaa-00805f6dec49},20,-1,0
-+823,nsIDOMHTMLQuoteElement,{a6cf90a3-15b3-11d2-932e-00805f8add32},0,-1,1
-+824,nsIDOMMimeType,{f6134682-f28b-11d2-8360-c90899049c3c},10,-1,1
-+825,nsIRequestObserver,{fd91e2e0-1481-11d3-9333-00104ba0fd40},2,-1,1
-+826,nsIXPCConstructor,{c814ca20-e0dc-11d3-8f5f-0010a4e73d9a},11,-1,1
-+827,nsIWebBrowserChromeFocus,{d2206418-1dd1-11b2-8e55-acddcd2bcfb8},19,-1,1
-+828,nsIScriptableInputStream,{a2a32f90-9b90-11d3-a189-0050041caf44},12,-1,1
-+829,nsIDOMLSInput,{165e7f61-5048-4c2c-b4bf-6b44bb617ee4},32,-1,1
-+830,nsIControllerCommandTable,{d1a47834-6ad4-11d7-bfad-000393636592},44,-1,1
-+831,nsIAutoCompleteResult,{eb43e1dc-2060-4d8e-aebf-3efec4e21cf8},29,-1,1
-+832,nsIAsyncOutputStream,{10dc9c94-8aff-49c6-8af9-d7fdb7339dae},12,-1,1
-+833,nsIDirectoryServiceProvider2,{2f977d4b-5485-11d4-87e2-0010a4e75ef2},12,-1,1
-+834,nsIAccessibleSelectable,{34d268d6-1dd2-11b2-9d63-83a5e0ada290},7,-1,1
-+835,nsIUserCertPicker,{06d018e0-d41b-4629-a4fc-daaa6029888e},5,-1,1
-+836,nsIDOMHTMLHeadingElement,{a6cf90a2-15b3-11d2-932e-00805f8add32},0,-1,1
-+837,nsIDOMText,{a6cf9082-15b3-11d2-932e-00805f8add32},14,-1,1
-+838,nsIAccessibleDocument,{8781fc88-355f-4439-881f-6504a0a1ceb6},7,-1,1
-+839,nsIDOMNSHTMLDocument,{a6cf90c5-15b3-11d2-932e-00805f8add32},0,-1,1
-+840,nsIStreamListener,{1a637020-1482-11d3-9333-00104ba0fd40},2,-1,1
-+841,nsIOutputStreamCallback,{40dbcdff-9053-42c5-a57c-3ec910d0f148},12,-1,1
-+842,jsdIScriptEnumerator,{4c2f706e-1dd2-11b2-9ebc-85a06e948830},16,-1,1
-+843,nsIClipboardImage,{db21eb6c-aebb-4d16-94ec-bcd8bbf513ae},18,-1,1
-+844,nsIBoxObject,{caabf76f-9d35-401f-beac-3955817c645c},38,-1,1
-+845,nsICloseAllWindows,{2f977d49-5485-11d4-87e2-0010a4e75ef2},23,-1,1
-+846,nsIScreenManager,{662e7b78-1dd2-11b2-a3d3-fc1e5f5fb9d4},8,-1,1
-+847,nsIDOMHTMLInputElement,{a6cf9093-15b3-11d2-932e-00805f8add32},0,-1,1
-+848,nsIJSCID,{e3a24a60-d651-11d2-9843-006008962422},11,-1,1
-+849,nsIHttpChannel,{9277fe09-f0cc-4cd9-bbce-581dd94b0260},40,-1,1
-+850,nsIDOMXULDescriptionElement,{c7b0b43c-1dd1-11b2-9e1c-ce5f6a660630},15,-1,1
-+851,nsIPluginInstance,{ebe00f40-0199-11d2-815b-006008119d7a},20,-1,0
-+852,nsIXULOverlayProvider,{1d5b5b94-dc47-4050-93b7-ac092e383cad},58,-1,1
-+853,nsIDOM3DocumentEvent,{090ecc19-b7cb-4f47-ae47-ed68d4926249},17,-1,1
-+854,nsIClientAuthDialogs,{fa4c7520-1433-11d5-ba24-00108303b117},5,-1,1
-+855,nsISelection,{b2c7ed59-8634-4352-9e37-5484c8b6e4e1},13,-1,1
-+856,nsIRDFInt,{e13a24e3-c77a-11d2-80be-006097b76b8e},21,-1,1
-+857,nsIXPointerSchemeProcessor,{093d3559-b56b-44d0-8764-c25815715080},78,-1,0
-+858,nsIProgressDialog,{1915c4f1-ee57-4684-b46a-0d9f695403b4},107,-1,1
-+859,nsIRDFDelegateFactory,{a1b89470-a124-11d3-be59-0020a6361667},21,-1,1
-+860,nsILoadGroup,{3de0a31c-feaf-400f-9f1e-4ef71f8b20cc},2,-1,1
-+861,nsICommandParams,{83f892cf-7ed3-490e-967a-62640f3158e1},44,-1,1
-+862,nsIProperties,{78650582-4e93-4b60-8e85-26ebd3eb14ca},9,-1,1
-+863,nsIScriptableDataType,{312e3b94-dc98-4ccc-b2fb-e3406f905cc6},1,-1,1
-+864,nsICommandHandlerInit,{731c6c50-67d6-11d4-9529-0020183bf181},19,-1,1
-+865,nsIDOMDocument,{a6cf9075-15b3-11d2-932e-00805f8add32},14,-1,1
-+866,nsIPluginTagInfo,{5f1ec1d0-019b-11d2-815b-006008119d7a},20,-1,0
-+867,nsIDOMProcessingInstruction,{a6cf907f-15b3-11d2-932e-00805f8add32},14,-1,1
-+868,nsICertSelect,{3cac403c-edb3-11d4-998b-00b0d02354a0},5,-1,1
-+869,nsIRDFLiteral,{e0c493d2-9542-11d2-8eb8-00805f29f370},21,-1,1
-+870,nsIPrintSettings,{83427530-f790-11d4-a869-00105a183419},8,-1,1
-+871,nsIDOMXPathEvaluator,{75506f8a-b504-11d5-a7f2-ca108ab8b6fc},56,-1,1
-+872,nsIRefreshURI,{69efc430-2efe-11d2-9e5d-006008bf092e},61,-1,1
-+873,nsISecretDecoderRing,{0ec80360-075c-11d4-9fd4-00c04f1b83d8},2,-1,1
-+874,nsIEntropyCollector,{6f883680-ab9d-11d4-9978-00b0d02354a0},83,-1,0
-+875,nsIPrintOptions,{cae87e20-479e-11d4-a856-00105a183419},8,-1,1
-+876,nsISchemaAttribute,{3c14a02e-6f4e-11d5-9b46-000064657374},1,-1,1
-+877,nsIBrowserBoxObject,{f2504c26-7cf5-426a-86a7-e50998ac57c1},38,-1,1
-+878,nsIPrintingPromptService,{75d1553d-63bf-4b5d-a8f7-e4e4cac21ba4},19,-1,1
-+879,nsISOAPOperationBinding,{0458dac8-65de-11d5-9b42-00104bdf5339},1,-1,1
-+880,nsIDOMMutationEvent,{8e440d86-886a-4e76-9e59-c13b939c9a4b},17,-1,1
-+881,nsITransactionManager,{58e330c2-7b48-11d2-98b9-00805f297d89},59,-1,1
-+882,nsPIPluginInstancePeer,{4a708562-8a37-400b-8c08-20037d1adad3},20,-1,0
-+883,nsIAccessibleTable,{0a7e98a9-ca7d-42f0-bfe1-2cfc35256038},34,-1,1
-+884,nsISecurityWarningDialogs,{1c399d06-1dd2-11b2-bc58-c87cbcacdb78},82,-1,1
-+885,nsISelectionImageService,{f6f68e3c-f078-4235-bf71-53d180c37d26},104,-1,0
-+886,nsIDOMNSHTMLFormElement,{a6cf90c6-15b3-11d2-932e-00805f8add32},0,-1,1
-+887,nsIDOMHTMLDirectoryElement,{a6cf909c-15b3-11d2-932e-00805f8add32},0,-1,1
-+888,nsIHistoryEntry,{a41661d4-1417-11d5-9882-00c04fa02f40},36,-1,1
-+889,nsIProgressEventSink,{dd47ee00-18c2-11d3-9337-00104ba0fd40},2,-1,1
-+890,nsIDataChannel,{7e835f60-5fea-11d3-a177-0050041caf44},119,-1,1
-+891,nsIDOMXULControlElement,{007b8358-1dd2-11b2-8924-d209efc3f124},15,-1,1
-+892,nsIPluginInstancePeer2,{e7d48c00-e1f1-11d2-8360-fbc8abc4ae7c},20,-1,0
-+893,nsIContentViewerFile,{6317f32c-9bc7-11d3-bccc-0060b0fc76bd},6,-1,1
-+894,nsITreeContentView,{972ae9ff-c7b3-4b60-a51e-a20a9de36947},30,-1,1
-+895,nsIScreen,{f728830e-1dd1-11b2-9598-fb9f414f2465},8,-1,1
-+896,nsIDocCharset,{9c18bb4e-1dd1-11b2-bf91-9cc82c275823},80,-1,1
-+897,nsISOAPPropertyBagMutator,{f34cb3c8-1dd1-11b2-8a18-a93a99d92c08},1,-1,1
-+898,nsIIDNService,{7b67747e-a8c4-4832-80c7-39ebb0c11f94},75,-1,1
-+899,nsIDOMEventListener,{df31c120-ded6-11d1-bd85-00805f8ae3f4},17,-1,1
-+900,nsIDOMHTMLTableCaptionElement,{a6cf90b3-15b3-11d2-932e-00805f8add32},0,-1,1
-+901,nsIIFrameBoxObject,{dd9ab9be-fed3-4bff-a72d-5390d52dd887},38,-1,1
-+902,nsIPopupWindowManager,{2e14fec9-e8e9-44cc-8c86-c8673c2383cc},23,-1,1
-+903,nsISupportsInterfacePointer,{995ea724-1dd1-11b2-9211-c21bdd3e7ed0},9,-1,1
-+904,nsINativeComponentLoader,{10d1a2a2-d816-458d-a4c3-0805ff0f7b31},24,-1,0
-+905,nsICmdLineService,{e34783f4-ac08-11d2-8d19-00805fc2500c},23,-1,1
-+906,nsIZipReader,{6ff6a966-9632-11d3-8cd9-0060b0fc14a3},72,-1,1
-+907,nsICookiePermission,{91f1c3ec-73a0-4bf0-bdc5-348a1f181b0e},46,-1,1
-+908,nsIDOMNSHTMLFormControlList,{a6cf911a-15b3-11d2-932e-00805f8add32},0,-1,1
-+909,nsIXPCComponents_ClassesByID,{336a9590-4d19-11d3-9893-006008962422},11,-1,1
-+910,nsIDOMNSHistory,{5fb96f46-1dd2-11b2-a5dc-998ca8636ea9},10,-1,1
-+911,nsISessionRoaming,{ab62465c-494c-446e-b671-930bb98a7bc4},43,-1,1
-+912,nsIDragSession,{cba22c53-fcce-11d2-96d4-0060b0fb9956},18,-1,1
-+913,nsIFreeType2,{c6e09354-1bb1-4ec2-aaa3-a26d0aafe36d},8,-1,0
-+914,gfxIFormats,{96d086e6-1dd1-11b2-b6b2-b77b59390247},8,-1,1
-+915,nsISupportsPRBool,{ddc3b490-4a1c-11d3-9890-006008962422},9,-1,1
-+916,nsIDOMNodeFilter,{e4723748-1dd1-11b2-8ee6-866a532a6237},57,-1,1
-+917,nsIDOMLSOutput,{757e9971-8890-478d-a53a-07f9f6f6e0d3},32,-1,1
-+918,nsISelectionDisplay,{0ddf9e1c-1dd2-11b2-a183-908a08aa75ae},13,-1,1
-+919,nsIJSID,{c86ae131-d101-11d2-9841-006008962422},11,-1,1
-+920,nsIGnomeVFSMimeApp,{99ae024f-e869-4973-958b-54768a84295a},55,-1,1
-+921,jsdINestCallback,{88bea60f-9b5d-4b39-b08b-1c3a278782c6},16,-1,1
-+922,nsIHTMLObjectResizeListener,{27b00295-349c-429f-ad0c-87b859e77130},4,-1,1
-+923,nsIDocShellTreeOwnerTmp,{739feaca-800c-4086-943c-d5c460d233cb},6,-1,1
-+924,nsIPersistentProperties,{1a180f60-93b2-11d2-9b8b-00805f8a16d9},9,-1,1
-+925,nsIAccessibleRetrieval,{663ca4a8-d219-4000-925d-d8f66406b626},7,-1,1
-+926,nsITransferable,{8b5314bc-db01-11d2-96ce-0060b0fb9956},18,-1,1
-+927,nsIStreamConverter,{46484b30-3bd2-11d3-a16c-0050041caf44},51,-1,1
-+928,nsIURIRefObject,{2226927e-1dd2-11b2-b57f-faab47288563},4,-1,1
-+929,nsIDOMNSHTMLOptionElement,{e2dfc89c-7ae0-4651-8aee-7f5edc2aa626},0,-1,1
-+930,imgIDecoderObserver,{350163d2-1dd2-11b2-9e69-89959ecec1f3},35,-1,1
-+931,nsIPrinterEnumerator,{a6cf9128-15b3-11d2-932e-00805f8add32},8,-1,1
-+932,nsIDOMDocumentType,{a6cf9077-15b3-11d2-932e-00805f8add32},14,-1,1
-+933,nsIFTPEventSink,{455d4234-0330-43d2-bbfb-99afbecbfeb0},106,-1,1
-+934,nsIPermissionManager,{4f6b5e00-0c36-11d5-a535-0010a401eb10},2,-1,1
-+935,nsIXPCComponents,{a6035b0c-3e28-42ad-95b9-e60d33cb075d},11,-1,1
-+936,nsIJSRuntimeService,{dcfbb49c-1dd1-11b2-9f39-935aef484817},11,-1,0
-+937,nsIDOMHTMLBaseElement,{a6cf908b-15b3-11d2-932e-00805f8add32},0,-1,1
-+938,nsIFileInputStream,{e3d56a20-c7ec-11d3-8cda-0060b0fc14a3},2,-1,1
-+939,nsIDOMHTMLMenuElement,{a6cf909d-15b3-11d2-932e-00805f8add32},0,-1,1
-+940,nsIDOMHTMLDivElement,{a6cf90a0-15b3-11d2-932e-00805f8add32},0,-1,1
-+941,nsIXSLTProcessor,{4a91aeb3-4100-43ee-a21e-9866268757c5},76,-1,1
-+942,nsIRegistryValue,{5316c380-b2f8-11d2-a374-0080c6f80e4b},25,-1,1
-+943,nsIDOMEventTarget,{1c773b30-d1cf-11d2-bd95-00805f8ae3f4},17,-1,1
-+944,nsIPrefBranchInternal,{74567534-eb94-4b1c-8f45-389643bfc555},26,-1,1
-+945,nsIStringBundle,{d85a17c2-aa7c-11d2-9b8c-00805f8a16d9},81,-1,1
-+946,nsIDOMNavigator,{a6cf906e-15b3-11d2-932e-00805f8add32},10,-1,1
-+947,nsIGenericInterfaceInfo,{8344a200-18ed-4538-8d44-e50b5156b564},1,-1,0
-+948,nsILanguageAtom,{a6cf911e-15b3-11d2-932e-00805f8add32},41,-1,1
-+949,nsILanguageAtomService,{a6cf911f-15b3-11d2-932e-00805f8add32},41,-1,1
-+950,nsPIXPIProxy,{6f9d2890-167d-11d5-8daf-000064657374},60,-1,1
-+951,nsITreeSelection,{f8a13364-184e-4da3-badf-5c04837537f8},30,-1,1
-+952,jsdIEphemeral,{46f1e23e-1dd2-11b2-9ceb-8285f2e95e69},16,-1,1
-+953,nsIUnicharStreamListener,{4a7e9b62-fef8-400d-9865-d6820f630b4c},2,-1,1
-+954,nsIServerSocket,{a5b64be0-d563-46bb-ae95-132e46fcd42f},2,-1,1
-+955,nsIDOMXULDocument,{17ddd8c0-c5f8-11d2-a6ae-00104bde6048},15,-1,1
-+956,nsIEditorSpellCheck,{87ce8b81-1cf2-11d3-9ce4-c60a16061e7c},4,-1,1
-+957,nsIDOMHTMLScriptElement,{a6cf90b1-15b3-11d2-932e-00805f8add32},0,-1,1
-+958,nsIEntityConverter,{d14c7111-55e0-11d3-91d9-00105aa3f7dc},64,-1,1
-+959,nsISimpleEnumerator,{d1899240-f9d2-11d2-bdd6-000064657374},9,-1,1
-+960,nsIEmbeddingSiteWindow2,{e932bf55-0a64-4beb-923a-1f32d3661044},19,-1,1
-+961,nsIDOMHTMLBodyElement,{a6cf908e-15b3-11d2-932e-00805f8add32},0,-1,1
-+962,nsIAccessibleEditableText,{91f0a56c-11be-47c7-8d02-7c15e00c05f5},34,-1,1
-+963,nsIPrintingPrompt,{44e314ca-75b1-4f3d-9553-9b3507912108},19,-1,1
-+964,nsIDOMHTMLOptionElement,{a6cf9092-15b3-11d2-932e-00805f8add32},0,-1,1
-+965,nsISupportsPRInt32,{e36c5250-4a1c-11d3-9890-006008962422},9,-1,1
-+966,nsIMultiPartChannel,{62d77f66-8ad0-4a7f-91a1-bb048b136490},2,-1,1
-+967,nsIEventHandler,{a447ddf0-1a99-11d2-815f-006008119d7a},20,-1,0
-+968,nsIAccessibleCaret,{9124c666-6133-4be6-b3ed-dd0ec35f1e64},7,-1,1
-+969,nsIDOMXULCommandDispatcher,{f3c50361-14fe-11d3-bf87-00105a1b0627},15,-1,1
-+970,nsISchemaSimpleType,{3c14a023-6f4e-11d5-9b46-000064657374},1,-1,1
-+971,nsIDOMRangeException,{0f807301-39d2-11d6-a7f2-8f504ff870dc},52,-1,1
-+972,nsIScriptSecurityManager,{18158378-b632-436a-9ced-c52ded350bde},22,-1,1
-+973,nsIWeakReference,{9188bc85-f92e-11d2-81ef-0060083a0bcf},33,-1,1
-+974,nsIAccessibleHyperLink,{a492c7d6-1dd1-11b2-9bc0-80614884799a},34,-1,1
-+975,nsIWebProgress,{570f39d0-efd0-11d3-b093-00a024ffc08c},27,-1,1
-+976,nsIForwardIterator,{8da01646-1dd2-11b2-98a7-c7009045be7e},9,-1,1
-+977,nsIDOMHTMLAppletElement,{a6cf90ae-15b3-11d2-932e-00805f8add32},0,-1,1
-+978,nsIAppShell,{a0757c31-eeac-11d1-9ec1-00aa002fb821},18,-1,0
-+979,nsIDOMLSResourceResolver,{9e61c7c8-8698-4477-9971-0923513919bd},32,-1,1
-+980,nsIDOMLSSerializerFilter,{b9b6ec85-f69f-4a5a-a96a-8a7a8f07e2b4},32,-1,1
-+981,nsIRDFContainerUtils,{d4214e91-fb94-11d2-bdd8-00104bde6048},21,-1,1
-+982,nsIWebBrowserChrome,{ba434c60-9d52-11d3-afb0-00a024ffc08c},19,-1,1
-+983,nsIDOMXPathResult,{75506f84-b504-11d5-a7f2-ca108ab8b6fc},56,-1,1
-+984,nsIWebBrowserFind,{2f977d44-5485-11d4-87e2-0010a4e75ef2},68,-1,1
-+985,nsIDOMXULMultiSelectControlElement,{7f435623-ba16-4c44-b4b0-0990946d3d7c},15,-1,1
-+986,jsdIErrorHook,{b7dd3c1c-1dd1-11b2-83eb-8a857d199e0f},16,-1,1
-+987,nsIDOMRGBColor,{6aff3102-320d-4986-9790-12316bb87cf9},3,-1,1
-+988,nsICipherInfo,{028e2b2a-1f0b-43a4-a1a7-365d2d7f35d0},5,-1,1
-+989,nsIDOMNamedNodeMap,{a6cf907b-15b3-11d2-932e-00805f8add32},14,-1,1
-+990,nsIDOMHTMLBaseFontElement,{a6cf90a6-15b3-11d2-932e-00805f8add32},0,-1,1
-+991,nsIDOMXULCheckboxElement,{5afaba88-1dd2-11b2-9249-dd65a129d0e4},15,-1,1
-+992,nsIURIChecker,{4660c1a1-be2d-4c78-9baf-c22984176c28},2,-1,1
-+993,nsIDOMNSHTMLAreaElement,{a6cf911b-15b3-11d2-932e-00805f8add32},0,-1,1
-+994,nsIControllers,{a5ed3a01-7cc7-11d3-bf87-00105a1b0627},58,-1,1
-+995,nsIDOMHTMLImageElement,{a6cf90ab-15b3-11d2-932e-00805f8add32},0,-1,1
-+996,nsIX509CertDB2,{dedec2ca-f941-4638-a9c0-32e02ff83d5b},5,-1,1
-+997,nsIDOMHTMLTextAreaElement,{a6cf9094-15b3-11d2-932e-00805f8add32},0,-1,1
-+998,nsISound,{b148eed1-236d-11d3-b35c-00a0cc3c1cde},18,-1,1
-+999,nsISchemaAttributeGroup,{3c14a02f-6f4e-11d5-9b46-000064657374},1,-1,1
-+1000,nsISSLSocketControl,{8b3e8488-1dd2-11b2-b547-956290be347c},71,-1,0
-+1001,nsIAutoCompleteMdbResult,{f7e7b341-2d5c-4d04-9f51-496cb2ce178c},29,-1,0
-+1002,nsISchemaModelGroup,{3c14a02a-6f4e-11d5-9b46-000064657374},1,-1,1
-+1003,nsIEmbeddingSiteWindow,{3e5432cd-9568-4bd1-8cbe-d50aba110743},19,-1,1
-+1004,nsIXULTreeBuilderObserver,{f6ed69be-1dd1-11b2-adfc-9db02ac57d88},53,-1,1
-+1005,nsIDOMEventGroup,{33347bee-6620-4841-8152-36091ae80c7e},17,-1,1
-+1006,nsIDocShellLoadInfo,{4f813a88-7aca-4607-9896-d97270cdf15e},6,-1,1
-+1007,jsdIFilterEnumerator,{54382875-ed12-4f90-9a63-1f0498d0a3f2},16,-1,1
-+1008,nsIXPConnectWrappedNative,{215dbe02-94a7-11d2-ba58-00805f8a5dd7},11,-1,0
-+1009,nsIDNSService,{2d6bbf2f-cf97-48f0-af29-642b86d0e59e},75,-1,1
-+1010,nsIScriptableInterfaceInfo,{f902d5ba-2ef6-444e-8a17-52cb70715c10},1,-1,1
-+1011,nsIPK11Token,{51191434-1dd2-11b2-a17c-e49c4e99a4e3},5,-1,1
-+1012,nsIControllerCommand,{0eae9a46-1dd2-11b2-aca0-9176f05fe9db},44,-1,1
-+1013,nsIDOMCSSStyleRule,{a6cf90bf-15b3-11d2-932e-00805f8add32},3,-1,1
-+1014,nsIXPConnect,{efae37b0-946d-11d2-ba58-00805f8a5dd7},11,-1,0
-+1015,nsISOAPParameter,{99ec6690-535f-11d4-9a58-000064657374},1,-1,1
-+1016,nsIDOMHTMLOListElement,{a6cf909a-15b3-11d2-932e-00805f8add32},0,-1,1
-+1017,nsITimerCallback,{a796816d-7d47-4348-9ab8-c7aeb3216a7d},31,-1,1
-+1018,nsISocketProviderService,{8f8a23d0-5472-11d3-bbc8-0000861d1237},71,-1,0
-+1019,nsIWebServiceSOAPCallContext,{1ef83ece-b645-4b55-a501-df42c3333b47},1,-1,1
-+1020,nsIAuthPrompt,{2f977d45-5485-11d4-87e2-0010a4e75ef2},2,-1,1
-+1021,nsIAtomService,{e5d0d92b-ea45-4622-ab48-302baf2094ee},9,-1,1
-+1022,nsIHTTPIndex,{6f2bdbd0-58c3-11d3-be36-00104bde6048},99,-1,1
-+1023,nsIDOMDocumentRange,{7b9badc6-c9bc-447a-8670-dbd195aed24b},52,-1,1
-+1024,nsICMSMessage,{a4557478-ae16-11d5-ba4b-00108303b117},5,-1,0
-+1025,nsIDOMNodeIterator,{354b5f02-1dd2-11b2-b053-b8c2997022a0},57,-1,1
-+1026,nsIEncodedChannel,{30d7ec3a-f376-4652-9276-3092ec57abb6},2,-1,1
-+1027,nsIToolkitProfileService,{9b434f48-438c-4f85-89de-b7f321a45341},70,-1,1
-+1028,jsdIContextEnumerator,{912e342a-1dd2-11b2-b09f-cf3af38c15f0},16,-1,1
-+1029,nsIRDFContainer,{d4214e90-fb94-11d2-bdd8-00104bde6048},21,-1,1
-+1030,nsIDOMDocumentFragment,{a6cf9076-15b3-11d2-932e-00805f8add32},14,-1,1
-+1031,nsIDOMEntityReference,{a6cf907a-15b3-11d2-932e-00805f8add32},14,-1,1
-+1032,nsIDOMCrypto,{33276f5d-3499-4ab9-acea-d85a9fceeccd},10,-1,1
-+1033,nsIDOMHTMLElement,{a6cf9085-15b3-11d2-932e-00805f8add32},0,-1,1
-+1034,nsIRDFXMLParser,{1831dd2e-1dd2-11b2-bdb3-86b7b50b70b5},21,-1,1
-+1035,mozITXTToHTMLConv,{77c0e42a-1dd2-11b2-8ebf-edc6606f2f4b},51,-1,1
-+1036,nsITextScroll,{067b28a0-877f-11d3-af7e-00a024ffc08c},6,-1,1
-+1037,nsIAutoCompleteBaseResult,{e6396544-921d-4776-aa62-8bf2dc1ae058},29,-1,0
-+1038,nsIXPCComponents_Results,{2fc229a0-5860-11d3-9899-006008962422},11,-1,1
-+1039,nsIRDFDate,{e13a24e1-c77a-11d2-80be-006097b76b8e},21,-1,1
-+1040,nsIContentViewerEdit,{42d5215c-9bc7-11d3-bccc-0060b0fc76bd},6,-1,1
-+1041,nsIEditorStyleSheets,{4805e682-49b9-11d3-9ce4-ed60bd6cb5bc},4,-1,1
-+1042,nsIAboutModule,{692303c0-2f83-11d3-8cd0-0060b0fc14a3},101,-1,1
-+1043,nsIChromeRegistry,{68389281-f6d0-4533-841d-344a2018140c},13,-1,1
-+1044,nsISHTransaction,{2edf705f-d252-4971-9f09-71dd0f760dc6},36,-1,1
-+1045,nsIDOMScreen,{77947960-b4af-11d2-bd93-00805f8ae3f4},10,-1,1
-+1046,nsISafeOutputStream,{5f914307-5c34-4e1f-8e32-ec749d25b27a},2,-1,1
-+1047,nsIStreamListenerProxy,{e400e688-6b54-4a84-8c4e-56b40281981a},2,-1,1
-+1048,nsISchemaLoader,{3c14a032-6f4e-11d5-9b46-000064657374},1,-1,1
-+1049,nsIXPCComponents_ID,{7994a6e0-e028-11d3-8f5d-0010a4e73d9a},11,-1,1
-+1050,nsPIAccessNode,{b3507946-4a44-4e40-b66c-f23e320997c5},7,-1,1
-+1051,nsIUploadChannel,{ddf633d8-e9a4-439d-ad88-de636fd9bb75},2,-1,1
-+1052,nsIXPCFunctionThisTranslator,{039ef260-2a0d-11d5-90a7-0010a4e73d9a},11,-1,1
-+1053,nsIController,{d5b61b82-1da4-11d3-bf87-00105a1b0627},58,-1,1
-+1054,nsIBadCertListener,{86960956-edb0-11d4-998b-00b0d02354a0},5,-1,1
-diff -Nur firefox.orig/components.ini firefox/components.ini
---- firefox.orig/components.ini 1970-01-01 01:00:00.000000000 +0100
-+++ firefox/components.ini 2005-05-13 22:34:53.000000000 +0200
-@@ -0,0 +1,2 @@
-+[Extra Files]
-+Count=0
-diff -Nur firefox.orig/defaults.ini firefox/defaults.ini
---- firefox.orig/defaults.ini 1970-01-01 01:00:00.000000000 +0100
-+++ firefox/defaults.ini 2005-05-13 22:34:53.000000000 +0200
-@@ -0,0 +1,2 @@
-+[Extra Files]
-+Count=0
-diff -Nur
firefox.orig/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
----
firefox.orig/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
1970-01-01 01:00:00.000000000 +0100
-+++ firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
2005-05-13 22:34:51.000000000 +0200
-@@ -0,0 +1,34 @@
-+<?xml version="1.0"?>
-+
-+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-+ xmlns:em="http://www.mozilla.org/2004/em-rdf#";>
-+
-+ <Description about="urn:mozilla:install-manifest">
-+ <em:id>{972ce4c6-7e08-4474-a285-3208198ce6fd}</em:id>
-+ <em:version>2.0</em:version>
-+
-+ <!-- Target Application this theme can install into,
-+ with minimum and maximum supported versions. -->
-+ <em:targetApplication>
-+ <Description>
-+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-+ <em:minVersion>1.0</em:minVersion>
-+ <em:maxVersion>1.0</em:maxVersion>
-+ </Description>
-+ </em:targetApplication>
-+
-+ <!-- Front End MetaData -->
-+ <em:name>Firefox (default)</em:name>
-+ <em:description>The default theme</em:description>
-+
-+ <em:locked>true</em:locked>
-+
-+ <!-- Front End Integration Hooks (used by Theme Manager)-->
-+ <!-- XXXben - preprocess this file to use different info for mac
version -->
-+ <em:creator>Gerich and Horlander</em:creator>
-+ <em:contributor>Mozilla Contributors</em:contributor>
-+
-+ <em:internalName>classic/1.0</em:internalName>
-+ </Description>
-+
-+</RDF>
-diff -Nur firefox.orig/extensions/Extensions.rdf
firefox/extensions/Extensions.rdf
---- firefox.orig/extensions/Extensions.rdf 1970-01-01 01:00:00.000000000
+0100
-+++ firefox/extensions/Extensions.rdf 2005-05-13 22:34:51.000000000 +0200
-@@ -0,0 +1,24 @@
-+<?xml version="1.0"?>
-+<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#";
-+ xmlns:NC="http://home.netscape.com/NC-rdf#";
-+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
-+ <RDF:Description RDF:about="rdf:#$VMmjm3"
-+ em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-+ em:minVersion="1.0"
-+ em:maxVersion="1.0" />
-+ <RDF:Description
RDF:about="urn:mozilla:theme:{972ce4c6-7e08-4474-a285-3208198ce6fd}"
-+ em:version="2.0"
-+ em:name="Firefox (default)"
-+ em:description="The default theme"
-+ em:creator="Gerich and Horlander"
-+ em:internalName="classic/1.0"
-+ em:locked="true"
-+ em:contributor="Mozilla Contributors">
-+ <em:targetApplication RDF:resource="rdf:#$VMmjm3"/>
-+ </RDF:Description>
-+ <RDF:Seq RDF:about="urn:mozilla:theme:root">
-+ <RDF:li
RDF:resource="urn:mozilla:theme:{972ce4c6-7e08-4474-a285-3208198ce6fd}"/>
-+ </RDF:Seq>
-+ <RDF:Seq RDF:about="urn:mozilla:extension:root">
-+ </RDF:Seq>
-+</RDF:RDF>
-diff -Nur firefox.orig/extensions/installed-extensions-processed.txt
firefox/extensions/installed-extensions-processed.txt
---- firefox.orig/extensions/installed-extensions-processed.txt 1970-01-01
01:00:00.000000000 +0100
-+++ firefox/extensions/installed-extensions-processed.txt 2005-05-13
22:34:51.000000000 +0200
-@@ -0,0 +1 @@
-+theme,{972ce4c6-7e08-4474-a285-3208198ce6fd}
diff --git a/http/firefox/firefox-nopangoxft.patch
b/http/firefox/firefox-nopangoxft.patch
deleted file mode 100644
index 608e803..0000000
--- a/http/firefox/firefox-nopangoxft.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft 2005-08-18
22:41:26.000000000 -0400
-+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000
-0400
-@@ -40,7 +40,7 @@
- #define PANGO_ENABLE_ENGINE
-
- #include "mozilla-decoder.h"
--#include <pango/pangoxft.h>
-+#include <pango/pangocairo.h>
- #include <pango/pangofc-fontmap.h>
- #include <pango/pangofc-font.h>
- #include <gdk/gdkx.h>
-@@ -208,7 +208,7 @@
- }
- }
-
--
pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+
pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
- mozilla_find_decoder,
- NULL,
- NULL);
diff --git a/http/firefox/init-files b/http/firefox/init-files
deleted file mode 100644
index 04aaee5..0000000
--- a/http/firefox/init-files
+++ /dev/null
@@ -1,12 +0,0 @@
-chrome/chrome.rdf
-chrome/overlayinfo/browser/content/overlays.rdf
-chrome/overlayinfo/communicator/content/overlays.rdf
-chrome/overlayinfo/inspector/content/overlays.rdf
-chrome/overlayinfo/messenger/content/overlays.rdf
-chrome/overlayinfo/navigator/content/overlays.rdf
-components/xpti.dat
-components.ini
-defaults.ini
-extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-extensions/Extensions.rdf
-extensions/installed-extensions-processed.txt
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
new file mode 100644
index 0000000..6f72db0
--- /dev/null
+++ b/http/firefox/mozconfig
@@ -0,0 +1,24 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=browser
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --with-pthreads
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg=/usr/lib/
+ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --with-system-png=/usr/lib
+ac_add_options --enable-application=browser
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --disable-freetype2
+ac_add_options --enable-pango
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
+
diff --git a/http/firefox/mozilla-firefox-1.5-mork.patch
b/http/firefox/mozilla-firefox-1.5-mork.patch
deleted file mode 100644
index 449461e..0000000
--- a/http/firefox/mozilla-firefox-1.5-mork.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u -8 -p -r1.8 morkSink.cpp
---- db/mork/src/morkSink.cpp 17 Apr 2004 21:49:24 -0000 1.8
-+++ db/mork/src/morkSink.cpp 8 Dec 2005 19:45:59 -0000
-@@ -110,25 +110,20 @@ morkSpool::SpillPutc(morkEnv* ev, int c)
- {
- mork_size size = coil->mBlob_Size;
- mork_fill fill = (mork_fill) (at - body); // current content size
- if ( fill <= size ) // less content than medium size?
- {
- coil->mBuf_Fill = fill;
- if ( at >= end ) // need to grow the coil?
- {
-- if ( size > 2048 ) // grow slower over 2K?
-- size += 512;
-+ if ( size > 65536 )
-+ size += 65536;
- else
-- {
-- mork_size growth = ( size * 4 ) / 3; // grow by 33%
-- if ( growth < 64 ) // grow faster under (64 * 3)?
-- growth = 64;
-- size += growth;
-- }
-+ size *= 2;
- if ( coil->GrowCoil(ev, size) ) // made coil bigger?
- {
- body = (mork_u1*) coil->mBuf_Body;
- if ( body ) // have a coil body?
- {
- mSink_At = at = body + fill;
- mSink_End = end = body + coil->mBlob_Size;
- }
diff --git a/http/firefox/security_manager_makefile.diff
b/http/firefox/security_manager_makefile.diff
deleted file mode 100644
index ba06ebb..0000000
--- a/http/firefox/security_manager_makefile.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -purN firefox-1.0.4/security/manager/Makefile.in
firefox/security/manager/Makefile.in
---- firefox-1.0.4/security/manager/Makefile.in 2005-03-28 19:56:36.000000000
-0500
-+++ firefox/security/manager/Makefile.in 2005-05-16 16:43:42.000000000
-0400
-@@ -30,35 +30,6 @@ include $(DEPTH)/config/autoconf.mk
- MODULE = psm
-
- PACKAGE_FILE = psm.pkg
--PACKAGE_VARS += \
-- NSS3_LIB \
-- SMIME3_LIB \
-- SSL3_LIB \
-- SOFTOKEN3_LIB \
-- SOFTOKEN3_CHK \
-- LOADABLE_ROOT_MODULE \
-- HAVE_FREEBL_MODULES \
-- $(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
--ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
--ifeq (,$(filter i86pc ia64,$(OS_TEST)))
--ifndef HAVE_64BIT_OS
--HAVE_FREEBL_MODULES = 1
--FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
--FREEBL_PURE32_CHK = libfreebl_pure32_3.chk
--FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
--FREEBL_HYBRID_CHK = libfreebl_hybrid_3.chk
--endif
--endif
--endif
-
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-@@ -127,19 +98,7 @@ SUBMAKEFILES = boot/Makefile ssl/Makefil
- include $(topsrcdir)/config/rules.mk
-
- # Attempt to properly handle NSS' refusal to implement a dependency system
--export:: .nss.cleaned
--
--.nss.cleaned: .nss.checkout
-- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
clean
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS) clean
--endif
-- touch $@
--
--.nss.checkout:
-- touch $(srcdir)/$@
-+export::
-
- dependclean export packages chrome::
- $(MAKE) -C boot $@
-@@ -150,48 +109,6 @@ endif
-
- libs::
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--ifeq ($(OS_ARCH),WINNT)
-- cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX)
$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
-- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX)
$(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--endif
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
-- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
-- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_MODULES
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
--endif
- $(MAKE) -C boot $@
- $(MAKE) -C ssl $@
- ifdef MOZ_XUL
-@@ -199,20 +116,6 @@ ifdef MOZ_XUL
- endif
-
- install::
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE)
$(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK)
$(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB)
$(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK)
$(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE)
$(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK)
$(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE)
$(DESTDIR)$(mozappdir)
--endif
- $(MAKE) -C boot $@
- $(MAKE) -C ssl $@
- ifdef MOZ_XUL
-@@ -226,11 +129,6 @@ ifdef MOZ_XUL
- $(MAKE) -C pki $@
- endif
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
clean
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS) clean
--endif
-
- echo-requires-recursive::
- $(MAKE) -C boot $@
diff --git a/http/firefox/x-lib.patch b/http/firefox/x-lib.patch
new file mode 100644
index 0000000..059eb7e
--- /dev/null
+++ b/http/firefox/x-lib.patch
@@ -0,0 +1,11 @@
+--- layout/build/Makefile.in.orig 2007-01-20 00:02:50.000000000 +0400
++++ layout/build/Makefile.in 2007-01-20 00:04:17.000000000 +0400
+@@ -225,7 +225,7 @@
+ endif
+
+ ifdef MOZ_ENABLE_GTK2
+-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
++EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) -L/usr/X11R6/lib -lXrender -lX11 \
+ $(NULL)
+ endif
+




Archive powered by MHonArc 2.6.24.

Top of Page