зеркало из https://github.com/mozilla/gecko-dev.git
bug 344243 - first part: rename old typeaheadfind component to suitetypeaheadfind to be able to use it in parallel to toolkit, r=bsmedberg on the actual renaming, r=Neil on the installer package files, r=mento on the Camino project file change, sr=Neil
This commit is contained in:
Родитель
99be04e2ee
Коммит
e428d1be1d
|
@ -13950,16 +13950,16 @@
|
|||
A7D88E680465D94000A80196 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = "compiled.mach-o.bundle";
|
||||
name = libtypeaheadfind.dylib;
|
||||
path = ../extensions/typeaheadfind/src/libtypeaheadfind.dylib;
|
||||
name = libsuitetypeaheadfind.dylib;
|
||||
path = ../extensions/typeaheadfind/src/libsuitetypeaheadfind.dylib;
|
||||
refType = 2;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
A7D88E6A0465D9F800A80196 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = file;
|
||||
name = typeaheadfind.xpt;
|
||||
path = ../extensions/typeaheadfind/public/_xpidlgen/typeaheadfind.xpt;
|
||||
name = suitetypeaheadfind.xpt;
|
||||
path = ../extensions/typeaheadfind/public/_xpidlgen/suitetypeaheadfind.xpt;
|
||||
refType = 2;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
|
@ -13974,8 +13974,8 @@
|
|||
A7FD31C90466004E00A80196 = {
|
||||
isa = PBXFileReference;
|
||||
lastKnownFileType = archive.ar;
|
||||
name = libtypeaheadfind.a;
|
||||
path = ../extensions/typeaheadfind/src/libtypeaheadfind.a;
|
||||
name = libsuitetypeaheadfind.a;
|
||||
path = ../extensions/typeaheadfind/src/libsuitetypeaheadfind.a;
|
||||
refType = 2;
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
|
|
|
@ -140,8 +140,8 @@ components\shistory.xpt
|
|||
|
||||
; optional typeaheadfind
|
||||
; (docs at http://www.mozilla.org/projects/ui/accessibility/typeaheadfind.html)
|
||||
;components\typeaheadfind.dll
|
||||
;components\typeaheadfind.xpt
|
||||
;components\suitetypeaheadfind.dll
|
||||
;components\suitetypeaheadfind.xpt
|
||||
|
||||
; rdf
|
||||
components\rdf.dll
|
||||
|
|
|
@ -177,8 +177,8 @@ components/shistory.xpt
|
|||
|
||||
; optional typeaheadfind
|
||||
; (docs at http://www.mozilla.org/projects/ui/accessibility/typeaheadfind.html)
|
||||
;components/typeaheadfind.shlb
|
||||
;components/typeaheadfind.xpt
|
||||
;components/suitetypeaheadfind.shlb
|
||||
;components/suitetypeaheadfind.xpt
|
||||
|
||||
; required l10n libraries
|
||||
|
||||
|
|
|
@ -123,8 +123,8 @@ components/shistory.xpt
|
|||
|
||||
; optional typeaheadfind
|
||||
; (docs at http://www.mozilla.org/projects/ui/accessibility/typeaheadfind.html)
|
||||
;components/libtypeaheadfind.so
|
||||
;components/typeaheadfind.xpt
|
||||
;components/libsuitetypeaheadfind.so
|
||||
;components/suitetypeaheadfind.xpt
|
||||
|
||||
; rdf
|
||||
components/librdf.so
|
||||
|
|
|
@ -124,8 +124,8 @@ components/shistory.xpt
|
|||
|
||||
; optional typeaheadfind
|
||||
; (docs at http://www.mozilla.org/projects/ui/accessibility/typeaheadfind.html)
|
||||
;components/libtypeaheadfind.so
|
||||
;components/typeaheadfind.xpt
|
||||
;components/libsuitetypeaheadfind.so
|
||||
;components/suitetypeaheadfind.xpt
|
||||
|
||||
; rdf
|
||||
components/librdf.so
|
||||
|
|
|
@ -149,8 +149,8 @@ components\shistory.xpt
|
|||
|
||||
; optional typeaheadfind
|
||||
; (docs at http://www.mozilla.org/projects/ui/accessibility/typeaheadfind.html)
|
||||
;components\typeaheadfind.dll
|
||||
;components\typeaheadfind.xpt
|
||||
;components\suitetypeaheadfind.dll
|
||||
;components\suitetypeaheadfind.xpt
|
||||
|
||||
; rdf
|
||||
components\rdf.dll
|
||||
|
|
|
@ -41,7 +41,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = typeaheadfind
|
||||
MODULE = suitetypeaheadfind
|
||||
DIRS = public src resources
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -41,8 +41,8 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE=typeaheadfind
|
||||
XPIDL_MODULE=typeaheadfind
|
||||
MODULE=suitetypeaheadfind
|
||||
XPIDL_MODULE=suitetypeaheadfind
|
||||
GRE_MODULE = 1
|
||||
|
||||
XPIDLSRCS= ./nsITypeAheadFind.idl \
|
||||
|
|
|
@ -46,13 +46,13 @@
|
|||
#define NS_TYPEAHEADFIND_CID \
|
||||
{0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4}}
|
||||
|
||||
#define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/typeaheadfind;1"
|
||||
#define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/suitetypeaheadfind;1"
|
||||
%}
|
||||
|
||||
interface nsIDOMEvent;
|
||||
|
||||
[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
|
||||
interface nsITypeAheadFind : nsISupports
|
||||
interface nsISuiteTypeAheadFind : nsISupports
|
||||
{
|
||||
/** Is type ahead find mode currently on? */
|
||||
readonly attribute boolean isActive;
|
||||
|
|
|
@ -41,8 +41,8 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = typeaheadfind
|
||||
LIBRARY_NAME = typeaheadfind
|
||||
MODULE = suitetypeaheadfind
|
||||
LIBRARY_NAME = suitetypeaheadfind
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
SHORT_LIBNAME = typahead
|
||||
endif
|
||||
|
@ -77,7 +77,7 @@ REQUIRES = appcomps \
|
|||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsTypeAheadFind
|
||||
MODULE_NAME = nsSuiteTypeAheadFind
|
||||
|
||||
CPPSRCS = \
|
||||
nsTypeAheadFind.cpp \
|
||||
|
|
|
@ -110,7 +110,7 @@
|
|||
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsTypeAheadFind)
|
||||
NS_INTERFACE_MAP_ENTRY(nsITypeAheadFind)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISuiteTypeAheadFind)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
|
||||
NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIScrollPositionListener)
|
||||
|
@ -1705,7 +1705,7 @@ nsTypeAheadFind::NotifySelectionChanged(nsIDOMDocument *aDoc,
|
|||
}
|
||||
|
||||
|
||||
// ---------------- nsITypeAheadFind --------------------
|
||||
// ---------------- nsISuiteTypeAheadFind --------------------
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsTypeAheadFind::FindNext(PRBool aFindBackwards, nsISupportsInterfacePointer *aCallerWindowSupports)
|
||||
|
@ -2916,7 +2916,7 @@ nsTypeAheadController::DoCommand(const char *aCommand)
|
|||
EnsureContentWindow(domWinInternal, getter_AddRefs(startContentWin));
|
||||
NS_ENSURE_TRUE(startContentWin, NS_ERROR_FAILURE);
|
||||
|
||||
nsCOMPtr<nsITypeAheadFind> typeAhead =
|
||||
nsCOMPtr<nsISuiteTypeAheadFind> typeAhead =
|
||||
do_GetService(NS_TYPEAHEADFIND_CONTRACTID);
|
||||
NS_ENSURE_TRUE(typeAhead, NS_ERROR_FAILURE);
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ enum {
|
|||
|
||||
const int kMaxBadCharsBeforeCancel = 3;
|
||||
|
||||
class nsTypeAheadFind : public nsITypeAheadFind,
|
||||
class nsTypeAheadFind : public nsISuiteTypeAheadFind,
|
||||
public nsIDOMKeyListener,
|
||||
public nsIDOMTextListener,
|
||||
public nsIDOMCompositionListener,
|
||||
|
@ -97,7 +97,7 @@ public:
|
|||
NS_DEFINE_STATIC_CID_ACCESSOR(NS_TYPEAHEADFIND_CID);
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSITYPEAHEADFIND
|
||||
NS_DECL_NSISUITETYPEAHEADFIND
|
||||
NS_DECL_NSIOBSERVER
|
||||
NS_DECL_NSIDOMEVENTLISTENER
|
||||
NS_DECL_NSISELECTIONLISTENER
|
||||
|
|
|
@ -862,10 +862,10 @@ function BrowserHandleBackspace()
|
|||
// in typeaheadfind if that's active, or it might mean back in history
|
||||
|
||||
var typeAhead = null;
|
||||
const TYPE_AHEAD_FIND_CONTRACTID = "@mozilla.org/typeaheadfind;1";
|
||||
const TYPE_AHEAD_FIND_CONTRACTID = "@mozilla.org/suitetypeaheadfind;1";
|
||||
if (TYPE_AHEAD_FIND_CONTRACTID in Components.classes) {
|
||||
typeAhead = Components.classes[TYPE_AHEAD_FIND_CONTRACTID]
|
||||
.getService(Components.interfaces.nsITypeAheadFind);
|
||||
.getService(Components.interfaces.nsISuiteTypeAheadFind);
|
||||
}
|
||||
|
||||
if (!typeAhead || !typeAhead.backOneChar()) {
|
||||
|
|
|
@ -126,6 +126,7 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "txmgr.xpt");
|
||||
deleteThisFile("Components", "txtsvc.xpt");
|
||||
deleteThisFile("Components", "typeaheadfind.xpt");
|
||||
deleteThisFile("Components", "suitetypeaheadfind.xpt");
|
||||
deleteThisFile("Components", "uconv.xpt");
|
||||
deleteThisFile("Components", "unicharutil.xpt");
|
||||
deleteThisFile("Components", "uriloader.xpt");
|
||||
|
|
|
@ -267,7 +267,7 @@ bin/components/progressDlg.xpt
|
|||
bin/components/nsDownloadProgressListener.js
|
||||
;bin/AccessibleMarshal.dll
|
||||
;bin/components/nsSetDefaultBrowser.js
|
||||
bin/components/typeaheadfind.xpt
|
||||
bin/components/suitetypeaheadfind.xpt
|
||||
bin/components/typahead.dll
|
||||
bin/components/nsCloseAllWindows.js
|
||||
bin/components/htmlparser.xpt
|
||||
|
|
|
@ -189,7 +189,7 @@ bin/components/progressDlg.xpt
|
|||
bin/components/nsDownloadProgressListener.js
|
||||
bin/components/filepicker.xpt
|
||||
bin/components/mozldap.xpt
|
||||
bin/components/typeaheadfind.xpt
|
||||
bin/components/suitetypeaheadfind.xpt
|
||||
bin/components/nsCloseAllWindows.js
|
||||
bin/components/extensions.xpt
|
||||
bin/components/nsExtensionManager.js
|
||||
|
|
|
@ -274,8 +274,8 @@ bin/components/nsDownloadProgressListener.js
|
|||
bin/components/libfileview.so
|
||||
bin/components/filepicker.xpt
|
||||
bin/components/libuniversalchardet.so
|
||||
bin/components/typeaheadfind.xpt
|
||||
bin/components/libtypeaheadfind.so
|
||||
bin/components/suitetypeaheadfind.xpt
|
||||
bin/components/libsuitetypeaheadfind.so
|
||||
bin/components/nsCloseAllWindows.js
|
||||
bin/components/extensions.xpt
|
||||
bin/components/libsystem-pref.so
|
||||
|
|
|
@ -154,8 +154,8 @@ bin\components\progressDlg.xpt
|
|||
bin\components\dom_xpath.xpt
|
||||
bin\AccessibleMarshal.dll
|
||||
bin\components\nsSetDefaultBrowser.js
|
||||
bin\components\typeaheadfind.xpt
|
||||
bin\components\typeaheadfind.dll
|
||||
bin\components\suitetypeaheadfind.xpt
|
||||
bin\components\suitetypeaheadfind.dll
|
||||
bin\components\nsAxSecurityPolicy.js
|
||||
bin\components\nsCloseAllWindows.js
|
||||
bin\components\extensions.xpt
|
||||
|
|
|
@ -436,6 +436,7 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "transformiix.dll");
|
||||
deleteThisFile("Components", "psm.xpt");
|
||||
deleteThisFile("Components", "typeaheadfind.xpt");
|
||||
deleteThisFile("Components", "suitetypeaheadfind.xpt");
|
||||
deleteThisFile("Components", "xmlextras_interfaceinfo.xpt");
|
||||
deleteThisFile("Components", "xmlsoap.xpt");
|
||||
deleteThisFile("Components", "xmlschema.xpt");
|
||||
|
|
Загрузка…
Ссылка в новой задаче