From: Jory Pratt Date: Sat, 22 Oct 2005 14:17:35 +0000 (+0000) Subject: typeaheadfind patch moved to mirrors X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c005d16bee80225d8994130d785e4a7e4ca937f6;p=gentoo.git typeaheadfind patch moved to mirrors Package-Manager: portage-2.0.53_rc6 --- diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index 579702758905..f5b775da24d0 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.98 2005/10/17 16:18:28 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.99 2005/10/22 14:17:35 anarchy Exp $ + + 23 Oct 2005; -files/1.5/embed-typeaheadfind.patch, + mozilla-firefox-1.5_beta2-r1.ebuild: + moved typeaheadfind patch to mirror 17 Oct 2005; Aron Griffis mozilla-firefox-1.0.7-r2.ebuild: diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index a480ae4a784a..6fc9f21e4e7b 100644 --- a/www-client/mozilla-firefox/Manifest +++ b/www-client/mozilla-firefox/Manifest @@ -1,53 +1,52 @@ -MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 -MD5 d8c6c3085e4fc8d06ef878579dddf116 mozilla-firefox-1.0.6-r6.ebuild 11233 -MD5 e1dc698c1dfbaa091348c4e3790fe524 ChangeLog 34421 -MD5 8a30120dc035d60c58db0a9dc8c3b91b mozilla-firefox-1.0.6-r7.ebuild 9771 -MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154 -MD5 27212c3bfc3d15dc4bb42454380c533b mozilla-firefox-1.0.6-r5.ebuild 9631 -MD5 e9f0096a17477f08fed0b37fa9d71b55 mozilla-firefox-1.5_beta2-r1.ebuild 9245 -MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564 -MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734 -MD5 7f073b544e7967d3453ab8579292ef3e mozilla-firefox-1.0.6-r4.ebuild 9543 -MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318 -MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r5 447 -MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818 -MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538 -MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620 -MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r3 231 +MD5 958e43f74f7cfbc9cf281d436f456e16 ChangeLog 34572 +MD5 7847d262e628dcac303586fe02f2e8c4 files/1.5/firefox-cairo-canvas.patch 446 +MD5 91661761f2f232b08b74f5adc4f1eff0 files/1.5/firefox-nopangoxft.patch 839 +MD5 362f9e0b0f25b964f7120b68fb629ee0 files/1.5/firefox-visibility.patch 689 +MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/1.5/mozilla-1.3-alpha-stubs.patch 4646 +MD5 ff2980bf169954f9b255029e4312b6f8 files/1.5/mozilla-firefox-1.1a2-ia64.patch 2864 +MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/1.5/mozilla-hppa.patch 7863 +MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32 +MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382 MD5 6da2b9dec8c7fbe104122a424727fb39 files/digest-mozilla-firefox-1.0.6-r3 451 -MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 -MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818 -MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 -MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101 +MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r4 447 +MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r5 447 MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r6 447 -MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 -MD5 787437939618daf271673626f6414b15 files/mozilla-firefox-1.0.6-GLSA105396.patch 4049 -MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r2 231 MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r7 447 -MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 -MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r4 447 -MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 -MD5 9afab9469fd1d8af3d674a07ab0a0128 files/gentoo-default-prefs.js 281 +MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r2 231 +MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r3 231 +MD5 7ead313a9ac601851c2ebabb2e8bdec2 files/digest-mozilla-firefox-1.5_beta2-r1 215 MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548 -MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752 -MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382 -MD5 645b0b54e9e6a263423c6344e187071e files/digest-mozilla-firefox-1.5_beta2-r1 146 +MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 +MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538 +MD5 9afab9469fd1d8af3d674a07ab0a0128 files/gentoo-default-prefs.js 281 MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520 -MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131 -MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020 MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308 -MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406 +MD5 f49aab1950ec54d7e8b2a51909dc6a5e files/icon/deerpark-icon.png 2963 +MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 +MD5 a0bcbedb1d99931658cb5e781442aed8 files/icon/mozillafirefox.desktop 169 +MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 +MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620 +MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465 MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412 -MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32 +MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752 +MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818 +MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020 +MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 +MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406 +MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818 +MD5 787437939618daf271673626f6414b15 files/mozilla-firefox-1.0.6-GLSA105396.patch 4049 +MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131 +MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716 -MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465 -MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/1.5/mozilla-1.3-alpha-stubs.patch 4646 -MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/1.5/mozilla-hppa.patch 7863 -MD5 ff2980bf169954f9b255029e4312b6f8 files/1.5/mozilla-firefox-1.1a2-ia64.patch 2864 -MD5 cb90e9f6097b975187892682ed286544 files/1.5/embed-typeaheadfind.patch 41361 -MD5 7847d262e628dcac303586fe02f2e8c4 files/1.5/firefox-cairo-canvas.patch 446 -MD5 91661761f2f232b08b74f5adc4f1eff0 files/1.5/firefox-nopangoxft.patch 839 -MD5 362f9e0b0f25b964f7120b68fb629ee0 files/1.5/firefox-visibility.patch 689 -MD5 a0bcbedb1d99931658cb5e781442aed8 files/icon/mozillafirefox.desktop 169 -MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 -MD5 f49aab1950ec54d7e8b2a51909dc6a5e files/icon/deerpark-icon.png 2963 +MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101 +MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 +MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 +MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318 +MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154 +MD5 7f073b544e7967d3453ab8579292ef3e mozilla-firefox-1.0.6-r4.ebuild 9543 +MD5 27212c3bfc3d15dc4bb42454380c533b mozilla-firefox-1.0.6-r5.ebuild 9631 +MD5 d8c6c3085e4fc8d06ef878579dddf116 mozilla-firefox-1.0.6-r6.ebuild 11233 +MD5 8a30120dc035d60c58db0a9dc8c3b91b mozilla-firefox-1.0.6-r7.ebuild 9771 +MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564 +MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734 +MD5 85e5525bf433144d760ebf87f8eb5769 mozilla-firefox-1.5_beta2-r1.ebuild 9283 diff --git a/www-client/mozilla-firefox/files/1.5/embed-typeaheadfind.patch b/www-client/mozilla-firefox/files/1.5/embed-typeaheadfind.patch deleted file mode 100644 index d29780c0284b..000000000000 --- a/www-client/mozilla-firefox/files/1.5/embed-typeaheadfind.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@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@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 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 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 startingContainer = presContext->GetContainer(); - nsCOMPtr 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 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 chromeEventHandler; - GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler)); -@@ -2332,7 +2332,7 @@ - - - void --nsTypeAheadFind::AttachWindowListeners(nsIDOMWindow *aDOMWin) -+nsTypeAheadFindSea::AttachWindowListeners(nsIDOMWindow *aDOMWin) - { - nsCOMPtr chromeEventHandler; - GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler)); -@@ -2385,7 +2385,7 @@ - - - void --nsTypeAheadFind::GetChromeEventHandler(nsIDOMWindow *aDOMWin, -+nsTypeAheadFindSea::GetChromeEventHandler(nsIDOMWindow *aDOMWin, - nsIDOMEventTarget **aChromeTarget) - { - nsCOMPtr 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 typeAhead = -- do_GetService(NS_TYPEAHEADFIND_CONTRACTID); -+ nsCOMPtr typeAhead = -+ do_GetService(NS_TYPEAHEADFINDSEA_CONTRACTID); - NS_ENSURE_TRUE(typeAhead, NS_ERROR_FAILURE); - - return typeAhead->StartNewFind(startContentWin, isLinkSearch); -@@ -3013,7 +3013,7 @@ - } - - already_AddRefed --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 mFocusedWindow; - nsCOMPtr mFocusedWeakShell; - -- // Windows where typeaheadfind doesn't auto start as the user types -+ // Windows where typeaheadfindsea doesn't auto start as the user types - nsCOMPtr 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 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/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5_beta2-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5_beta2-r1 index b6191c90cf1a..f2b45436e20b 100644 --- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5_beta2-r1 +++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5_beta2-r1 @@ -1,2 +1,3 @@ +MD5 e0442e619add9045d0d04e97c274bc85 embed-typeaheadfind.patch 41038 MD5 08eb51cbab8050ebfd3d53e6592fc0f0 firefox-1.5b2-source.tar.bz2 34329054 MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625 diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5_beta2-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5_beta2-r1.ebuild index abb7df58257a..32f647b8e56d 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-1.5_beta2-r1.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-1.5_beta2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5_beta2-r1.ebuild,v 1.1 2005/10/13 19:21:46 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5_beta2-r1.ebuild,v 1.2 2005/10/22 14:17:35 anarchy Exp $ unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 MOZ_FREETYPE2="no" # Need to disable for newer .. remove here and in mozconfig @@ -16,7 +16,8 @@ FV=${MY_P/beta/b} DESCRIPTION="Firefox Web Browser" HOMEPAGE="http://www.mozilla.org/projects/firefox/" SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FV}/source/firefox-${FV}-source.tar.bz2 - mirror://gentoo/mozilla-jslibmath-alpha.patch" + mirror://gentoo/mozilla-jslibmath-alpha.patch + mirror://gentoo/embed-typeaheadfind.patch" KEYWORDS="-*" SLOT="0" @@ -87,7 +88,7 @@ src_unpack() { # patch to fix typeahead find for browsers which embed Firefox # http://bugzilla.gnome.org/show_bug.cgi?id=157435 - epatch ${FILESDIR}/1.5/embed-typeaheadfind.patch + epatch ${DISTDIR}/embed-typeaheadfind.patch # Fix scripts that call for /usr/local/bin/perl #51916 ebegin "Patching smime to call perl from /usr/bin"