Compare commits
3 Commits
tags/help
...
alecf_urlb
| Author | SHA1 | Date | |
|---|---|---|---|
|
9197dfdfad | ||
|
|
86fe1c23aa | ||
|
|
9feddb717d |
@@ -1,117 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
##
|
||||
## Usage:
|
||||
##
|
||||
## $ mozilla
|
||||
##
|
||||
## This script is meant to run a mozilla program from the mozilla
|
||||
## rpm installation.
|
||||
##
|
||||
## The script will setup all the environment voodoo needed to make
|
||||
## mozilla work.
|
||||
|
||||
##
|
||||
## Standard shell script disclaimer blurb thing:
|
||||
##
|
||||
## This script is a hcak. Its brute force. Its horrible.
|
||||
## It doesnt use Artificial Intelligence. It doesnt use Virtual Reality.
|
||||
## Its not perl. Its not python. It probably wont work unchanged on
|
||||
## the "other" thousands of unices. But it worksforme.
|
||||
##
|
||||
## If you have an improvement, patch, idea, whatever, on how to make this
|
||||
## script better, post it here:
|
||||
##
|
||||
## news://news.mozilla.org/netscape.public.mozilla.patches
|
||||
## news://news.mozilla.org/netscape.public.mozilla.unix
|
||||
##
|
||||
##
|
||||
|
||||
##
|
||||
## Potential improvements:
|
||||
##
|
||||
## + Run ldd on the program and report missing dlls
|
||||
## + All the "other" unices/packages
|
||||
##
|
||||
|
||||
cmdname=`basename $0`
|
||||
|
||||
##
|
||||
## location of the apprunner binary.
|
||||
##
|
||||
MOZ_APPRUNNER_NAME="/usr/lib/mozilla/bin/apprunner"
|
||||
|
||||
##
|
||||
## Variables
|
||||
##
|
||||
MOZ_DIST_BIN=""
|
||||
MOZ_PROGRAM=""
|
||||
|
||||
##
|
||||
## Functions
|
||||
##
|
||||
moz_bail()
|
||||
{
|
||||
message=$1
|
||||
|
||||
echo
|
||||
echo "$cmdname: $message"
|
||||
echo
|
||||
|
||||
exit 1
|
||||
}
|
||||
|
||||
moz_test_binary()
|
||||
{
|
||||
binary=$1
|
||||
|
||||
if [ -f "$binary" ]
|
||||
then
|
||||
if [ -x "$binary" ]
|
||||
then
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
moz_test_binary $MOZ_APPRUNNER_NAME
|
||||
|
||||
if [ $? -eq 1 ]
|
||||
then
|
||||
MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
|
||||
fi
|
||||
|
||||
##
|
||||
## Make sure the program is executable
|
||||
##
|
||||
if [ ! -x $MOZ_PROGRAM ]
|
||||
then
|
||||
moz_bail "Cannot execute $MOZ_PROGRAM."
|
||||
fi
|
||||
|
||||
##
|
||||
## Set MOZILLA_FIVE_HOME
|
||||
##
|
||||
MOZILLA_FIVE_HOME="/usr/lib/mozilla"
|
||||
|
||||
export MOZILLA_FIVE_HOME
|
||||
|
||||
exec ./$MOZ_PROGRAM ${1+"$@"}
|
||||
@@ -1,111 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
##
|
||||
## Usage:
|
||||
##
|
||||
## $ mozilla
|
||||
##
|
||||
## This script is meant to run a mozilla program from the mozilla
|
||||
## rpm installation.
|
||||
##
|
||||
## The script will setup all the environment voodoo needed to make
|
||||
## mozilla work.
|
||||
|
||||
##
|
||||
## Standard shell script disclaimer blurb thing:
|
||||
##
|
||||
## This script is a hcak. Its brute force. Its horrible.
|
||||
## It doesnt use Artificial Intelligence. It doesnt use Virtual Reality.
|
||||
## Its not perl. Its not python. It probably wont work unchanged on
|
||||
## the "other" thousands of unices. But it worksforme.
|
||||
##
|
||||
## If you have an improvement, patch, idea, whatever, on how to make this
|
||||
## script better, post it here:
|
||||
##
|
||||
## news://news.mozilla.org/netscape.public.mozilla.patches
|
||||
## news://news.mozilla.org/netscape.public.mozilla.unix
|
||||
##
|
||||
##
|
||||
|
||||
##
|
||||
## Potential improvements:
|
||||
##
|
||||
## + Run ldd on the program and report missing dlls
|
||||
## + All the "other" unices/packages
|
||||
##
|
||||
|
||||
cmdname=`basename $0`
|
||||
|
||||
##
|
||||
## location of the viewer binary.
|
||||
##
|
||||
MOZ_VIEWER_NAME="/usr/lib/mozilla/bin/viewer"
|
||||
|
||||
##
|
||||
## Variables
|
||||
##
|
||||
MOZ_PROGRAM=""
|
||||
|
||||
##
|
||||
## Functions
|
||||
##
|
||||
moz_bail()
|
||||
{
|
||||
message=$1
|
||||
|
||||
echo
|
||||
echo "$cmdname: $message"
|
||||
echo
|
||||
|
||||
exit 1
|
||||
}
|
||||
|
||||
moz_test_binary()
|
||||
{
|
||||
binary=$1
|
||||
|
||||
if [ -f "$binary" ]
|
||||
then
|
||||
if [ -x "$binary" ]
|
||||
then
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
|
||||
MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
|
||||
|
||||
moz_test_binary $MOZ_PROGRAM
|
||||
|
||||
if [ $? -eq 0 ]
|
||||
then
|
||||
moz_bail "Cannot execute $MOZ_PROGRAM."
|
||||
fi
|
||||
|
||||
##
|
||||
## Set MOZILLA_FIVE_HOME
|
||||
##
|
||||
MOZILLA_FIVE_HOME="/usr/lib/mozilla"
|
||||
|
||||
export MOZILLA_FIVE_HOME
|
||||
|
||||
exec $MOZ_PROGRAM ${1+"$@"}
|
||||
@@ -1,98 +0,0 @@
|
||||
%define ver @MOZ_RPM_VERSION@
|
||||
%define rel @MOZ_RPM_RELEASE@
|
||||
%define prefix @MOZ_RPM_PREFIX@
|
||||
%define tmp @MOZ_RPM_TMP@
|
||||
|
||||
Summary: Mozilla / ButtMonkey / Gecko / Whatever
|
||||
Name: mozilla
|
||||
Version: %ver
|
||||
Release: %rel
|
||||
Copyright: NPL
|
||||
Group: Mozilla
|
||||
Source: mozilla-%{ver}-%{rel}.tar.gz
|
||||
BuildRoot: %{tmp}/%{name}-root
|
||||
Packager: Ramiro Estrugo <ramiro@netscape.com>
|
||||
URL: http://www.mozilla.org/
|
||||
Provides: mozilla
|
||||
Requires: glib >= 1.2.1 gtk+ >= 1.2.1 nspr-pthreads >= 3.1
|
||||
|
||||
%description
|
||||
Mozilla
|
||||
|
||||
%package devel
|
||||
Summary: Mozilla development crap
|
||||
Group: Mozilla
|
||||
#Requires: mozilla nspr-devel
|
||||
|
||||
#Obsoletes: libnspr-devel
|
||||
#Conflicts: libnspr-userthreads-devel
|
||||
|
||||
%description devel
|
||||
Mozilla development libs and headers
|
||||
|
||||
%prep
|
||||
%setup -n mozilla
|
||||
|
||||
%build
|
||||
./configure \
|
||||
--with-pthreads \
|
||||
--enable-toolkit=gtk \
|
||||
--disable-build-nspr \
|
||||
@MOZ_RPM_SEAMONKEY_OPTIMIZE@
|
||||
|
||||
make
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
|
||||
mkdir -p $RPM_BUILD_ROOT%{prefix}/include/mozilla
|
||||
mkdir -p $RPM_BUILD_ROOT%{prefix}/lib
|
||||
mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/idl
|
||||
mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/components
|
||||
mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/res
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/bin
|
||||
|
||||
cp -rpv dist/bin/components/*.so $RPM_BUILD_ROOT%{prefix}/lib/mozilla/components
|
||||
cp -rpv dist/bin/res/* $RPM_BUILD_ROOT%{prefix}/lib/mozilla/res
|
||||
cp -rpv dist/bin/*.so $RPM_BUILD_ROOT%{prefix}/lib
|
||||
cp -rpv dist/include/* $RPM_BUILD_ROOT%{prefix}/include/mozilla
|
||||
cp -rpv dist/idl/* $RPM_BUILD_ROOT%{prefix}/lib/mozilla/idl
|
||||
cp -rpv dist/lib/*.a $RPM_BUILD_ROOT%{prefix}/lib
|
||||
cp -rpv dist/bin/apprunner $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
|
||||
cp -rpv dist/bin/viewer $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
|
||||
cp -rpv dist/bin/vreg $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
|
||||
|
||||
cp -rpv build/mozilla-viewer.sh $RPM_BUILD_ROOT/usr/bin/mozilla-viewer
|
||||
cp -rpv build/mozilla-apprunner.sh $RPM_BUILD_ROOT/usr/bin/mozilla-apprunner
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
|
||||
#if grep "/usr/mozilla/lib" /etc/ld.so.conf > /dev/null 2>&1
|
||||
#then
|
||||
# :
|
||||
#else
|
||||
# echo "/usr/mozilla/lib" >> /etc/ld.so.conf
|
||||
#fi
|
||||
#
|
||||
#/sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%attr(-, root, root)
|
||||
|
||||
%{prefix}/lib/mozilla/components/*
|
||||
%{prefix}/lib/*.so
|
||||
%{prefix}/lib/mozilla/bin/*
|
||||
%{prefix}/lib/mozilla/res/*
|
||||
%attr(755, root, root)/usr/bin/mozilla-viewer
|
||||
%attr(755, root, root)/usr/bin/mozilla-apprunner
|
||||
|
||||
%files devel
|
||||
%attr(-, root, root)
|
||||
|
||||
%{prefix}/lib/*.a
|
||||
%{prefix}/include/mozilla/*
|
||||
%{prefix}/lib/mozilla/idl/*
|
||||
@@ -1,76 +0,0 @@
|
||||
%define ver @MOZILLA_RPM_VERSION@
|
||||
%define rel @MOZILLA_RPM_RELEASE@
|
||||
%define prefix @MOZILLA_RPM_PREFIX@
|
||||
%define tmp @MOZILLA_RPM_TMP@
|
||||
|
||||
Summary: Netscape Portable Runtime (NSPR)
|
||||
Name: nspr-pthreads
|
||||
Version: %ver
|
||||
Release: %rel
|
||||
Copyright: NPL
|
||||
Group: Development/Libraries
|
||||
Source: nspr-pthreads-%{ver}-%{rel}.tar.gz
|
||||
BuildRoot: %{tmp}/%{name}-root
|
||||
Packager: Ramiro Estrugo <ramiro@netscape.com>
|
||||
URL: http://www.mozilla.org/docs/tplist/catCode/nsprdesc.htm
|
||||
Provides: nspr
|
||||
|
||||
%description
|
||||
Libraries that implement cross-platform runtime services from Netscape.
|
||||
|
||||
%package devel
|
||||
Summary: NSPR library header files for development
|
||||
Group: Development/Libraries
|
||||
Requires: nspr
|
||||
#Obsoletes: libnspr-devel
|
||||
#Conflicts: libnspr-userthreads-devel
|
||||
|
||||
%description devel
|
||||
Header files for the NSPR library from Netscape
|
||||
|
||||
%prep
|
||||
%setup -n nspr-pthreads
|
||||
|
||||
%build
|
||||
make \
|
||||
DIST=$RPM_BUILD_ROOT%{prefix} \
|
||||
NSDISTMODE=copy \
|
||||
USE_PTHREADS=1 \
|
||||
@MOZILLA_RPM_NSPR_OPTIMIZE@ \
|
||||
export
|
||||
|
||||
%install
|
||||
make \
|
||||
DIST=$RPM_BUILD_ROOT%{prefix} \
|
||||
NSDISTMODE=copy \
|
||||
USE_PTHREADS=1 \
|
||||
@MOZILLA_RPM_NSPR_OPTIMIZE@ \
|
||||
install
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
|
||||
#if grep "/usr/mozilla/lib" /etc/ld.so.conf > /dev/null 2>&1
|
||||
#then
|
||||
# :
|
||||
#else
|
||||
# echo "/usr/mozilla/lib" >> /etc/ld.so.conf
|
||||
#fi
|
||||
#
|
||||
#/sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%attr(-, root, root)
|
||||
|
||||
%{prefix}/lib/*.so
|
||||
|
||||
%files devel
|
||||
%attr(-, root, root)
|
||||
|
||||
%{prefix}/include/*
|
||||
%{prefix}/lib/*.a
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
navigator.dtd
|
||||
viewSource.dtd
|
||||
pageInfo.dtd
|
||||
navigator.properties
|
||||
askViewZoom.dtd
|
||||
@@ -1,26 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
|
||||
|
||||
<!-- list all the locale being supplied by this package -->
|
||||
<RDF:Seq about="urn:mozilla:locale:root">
|
||||
<RDF:li resource="urn:mozilla:locale:US"/>
|
||||
</RDF:Seq>
|
||||
|
||||
<!-- locale information -->
|
||||
<RDF:Description about="urn:mozilla:locale:US"
|
||||
chrome:author="mozilla.org"
|
||||
chrome:name="US"
|
||||
chrome:previewURL="http://www.mozilla.org/locales/US.gif">
|
||||
<chrome:packages>
|
||||
<RDF:Seq about="urn:mozilla:locale:US:packages">
|
||||
<RDF:li resource="urn:mozilla:locale:US:navigator-region"/>
|
||||
</RDF:Seq>
|
||||
</chrome:packages>
|
||||
</RDF:Description>
|
||||
|
||||
<!-- Version Information. State that we work only with major version of this
|
||||
package. -->
|
||||
<RDF:Description about="urn:mozilla:locale:US:navigator-region"
|
||||
chrome:localeVersion="1.2"/>
|
||||
</RDF:RDF>
|
||||
@@ -1,23 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
|
||||
|
||||
<!-- list all the skins being supplied by this package -->
|
||||
<RDF:Seq about="urn:mozilla:locale:root">
|
||||
<RDF:li resource="urn:mozilla:locale:en-US"/>
|
||||
</RDF:Seq>
|
||||
|
||||
<!-- locale information -->
|
||||
<RDF:Description about="urn:mozilla:locale:en-US">
|
||||
<chrome:packages>
|
||||
<RDF:Seq about="urn:mozilla:locale:en-US:packages">
|
||||
<RDF:li resource="urn:mozilla:locale:en-US:navigator"/>
|
||||
</RDF:Seq>
|
||||
</chrome:packages>
|
||||
</RDF:Description>
|
||||
|
||||
<!-- Version Information. State that we work only with major version of this
|
||||
package. -->
|
||||
<RDF:Description about="urn:mozilla:locale:en-US:navigator"
|
||||
chrome:localeVersion="1.2"/>
|
||||
</RDF:RDF>
|
||||
@@ -1,79 +0,0 @@
|
||||
<!-- ***** 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 Christopher Hoess <choess@stwing.upenn.edu>'s code.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Christopher Hoess.
|
||||
- Portions created by the Initial Developer are Copyright (C) 2001
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
- Eric Hodel <drbrain@segment7.net>
|
||||
- Stuart Ballard <sballard@netreach.net>
|
||||
-
|
||||
- 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 LGPL or the GPL. 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 ***** -->
|
||||
|
||||
<!-- Link Toolbar Title -->
|
||||
<!ENTITY linkToolbar.label "Site Navigation Bar">
|
||||
<!ENTITY linkToolbar.accesskey "a">
|
||||
|
||||
<!-- Link Toolbar visibility options -->
|
||||
<!ENTITY linkToolbarAlways.label "Show Always">
|
||||
<!ENTITY linkToolbarAlways.accesskey "S">
|
||||
<!ENTITY linkToolbarAsNeeded.label "Show Only As Needed">
|
||||
<!ENTITY linkToolbarAsNeeded.accesskey "O">
|
||||
<!ENTITY linkToolbarNever.label "Hide Always">
|
||||
<!ENTITY linkToolbarNever.accesskey "H">
|
||||
|
||||
<!-- Toolbar buttons, menus, and menuitems -->
|
||||
<!ENTITY topButton.label "Top">
|
||||
<!ENTITY upButton.label "Up">
|
||||
<!ENTITY firstButton.label "First">
|
||||
<!ENTITY prevButton.label "Previous">
|
||||
<!ENTITY nextButton.label "Next">
|
||||
<!ENTITY lastButton.label "Last">
|
||||
|
||||
<!ENTITY documentButton.label "Document">
|
||||
|
||||
<!ENTITY tocButton.label "Table of Contents">
|
||||
<!ENTITY chapterButton.label "Chapters">
|
||||
<!ENTITY sectionButton.label "Sections">
|
||||
<!ENTITY subSectionButton.label "Subsections">
|
||||
<!ENTITY appendixButton.label "Appendices">
|
||||
<!ENTITY glossaryButton.label "Glossary">
|
||||
<!ENTITY indexButton.label "Index">
|
||||
|
||||
<!ENTITY moreButton.label "More">
|
||||
|
||||
<!ENTITY helpButton.label "Help">
|
||||
<!ENTITY searchButton.label "Search">
|
||||
|
||||
<!ENTITY authorButton.label "Authors">
|
||||
<!ENTITY copyrightButton.label "Copyright">
|
||||
|
||||
<!ENTITY bookmarkButton.label "Bookmarks">
|
||||
|
||||
<!ENTITY alternateButton.label "Other Versions">
|
||||
@@ -1,26 +0,0 @@
|
||||
<!ENTITY no-properties.label "No properties set.">
|
||||
|
||||
<!ENTITY caption.label "Element Properties">
|
||||
<!ENTITY image-sec.label "Image Properties">
|
||||
<!ENTITY image-url.label "Location:">
|
||||
<!ENTITY image-desc.label "Description:">
|
||||
<!ENTITY image-alt.label "Alternate text:">
|
||||
<!ENTITY image-width.label "Width:">
|
||||
<!ENTITY image-height.label "Height:">
|
||||
<!ENTITY image-filesize.label "Size of File:">
|
||||
<!ENTITY insdel-sec.label "Insert/Delete Properties">
|
||||
<!ENTITY insdel-cite.label "Info:">
|
||||
<!ENTITY insdel-date.label "Date:">
|
||||
<!ENTITY link-sec.label "Link Properties">
|
||||
<!ENTITY link-url.label "Address:">
|
||||
<!ENTITY link-target.label "Will open in:">
|
||||
<!ENTITY link-type.label "Target type:">
|
||||
<!ENTITY link-lang.label "Target language:">
|
||||
<!ENTITY link-rel.label "Relation:">
|
||||
<!ENTITY link-rev.label "Reversed relation:">
|
||||
<!ENTITY misc-sec.label "Miscellaneous Properties">
|
||||
<!ENTITY misc-lang.label "Text language:">
|
||||
<!ENTITY misc-title.label "Title:">
|
||||
<!ENTITY misc-tblsummary.label "Table summary:">
|
||||
<!ENTITY quote-sec.label "Quote Properties">
|
||||
<!ENTITY quote-cite.label "Info:">
|
||||
@@ -1,12 +0,0 @@
|
||||
sameWindowText=Same window
|
||||
newWindowText=New window
|
||||
parentFrameText=Parent frame
|
||||
sameFrameText=Same frame
|
||||
embeddedText=Embedded
|
||||
unableToShowProps=No properties available.
|
||||
altTextMissing=Missing
|
||||
altTextBlank=Blank
|
||||
imageSize=%S KB (%S bytes)
|
||||
imageSizeUnknown=Unknown (not cached)
|
||||
imageWidth=%Spx
|
||||
imageHeight=%Spx
|
||||
@@ -16,17 +16,16 @@
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
DEPTH = ../../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = mac unix win
|
||||
DIRS = public src
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
BIN
mozilla/xpfe/components/urlbarhistory/macbuild/urlbarhistory.mcp
Normal file
BIN
mozilla/xpfe/components/urlbarhistory/macbuild/urlbarhistory.mcp
Normal file
Binary file not shown.
Binary file not shown.
26
mozilla/xpfe/components/urlbarhistory/makefile.win
Normal file
26
mozilla/xpfe/components/urlbarhistory/makefile.win
Normal file
@@ -0,0 +1,26 @@
|
||||
#!nmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape 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/NPL/
|
||||
#
|
||||
# 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 Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
|
||||
DEPTH=..\..\..
|
||||
|
||||
DIRS=public src
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
@@ -0,0 +1 @@
|
||||
nsIUrlbarHistory.idl
|
||||
35
mozilla/xpfe/components/urlbarhistory/public/Makefile.in
Normal file
35
mozilla/xpfe/components/urlbarhistory/public/Makefile.in
Normal file
@@ -0,0 +1,35 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape 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/NPL/
|
||||
#
|
||||
# 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 Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = appcomps
|
||||
XPIDL_MODULE = urlbarhistory
|
||||
|
||||
XPIDLSRCS = nsIUrlbarHistory.idl \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
30
mozilla/xpfe/components/urlbarhistory/public/makefile.win
Normal file
30
mozilla/xpfe/components/urlbarhistory/public/makefile.win
Normal file
@@ -0,0 +1,30 @@
|
||||
#!nmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape 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/NPL/
|
||||
#
|
||||
# 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 Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
|
||||
DEPTH=..\..\..\..
|
||||
|
||||
MODULE=urlbarhistory
|
||||
|
||||
XPIDLSRCS = \
|
||||
.\nsIUrlbarHistory.idl \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
@@ -0,0 +1,52 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape 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/NPL/
|
||||
*
|
||||
* 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 Netscape are
|
||||
* Copyright (C) 1999 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s): Radha Kulkarni (radha@netscape.com)
|
||||
* Jason Eager (jce2@po.cwru.edu)
|
||||
*/
|
||||
|
||||
#include "nsISupports.idl"
|
||||
#include "nsIFactory.idl"
|
||||
|
||||
|
||||
%{C++
|
||||
#define NS_URLBARHISTORY_CID \
|
||||
{0x74254499, 0x171a, 0x11d4, {0x98, 0x70, 0x0, 0xc0, 0x4f, 0xa0, 0x2f, 0x40}}
|
||||
|
||||
|
||||
#define NS_URLBARHISTORY_CONTRACTID "@mozilla.org/browser/urlbarhistory;1"
|
||||
#define NS_URLBARAUTOCOMPLETE_CONTRACTID "@mozilla.org/autocompleteSession;1?type=urlbar"
|
||||
#define UBHISTORY_MAX_ENTRIES = 15;
|
||||
%}
|
||||
|
||||
[scriptable, uuid(74254499-171a-11d4-9870-00c04fa02f40)]
|
||||
interface nsIUrlbarHistory: nsISupports
|
||||
{
|
||||
/**
|
||||
* Get the size of the History list
|
||||
*/
|
||||
readonly attribute long count;
|
||||
|
||||
/**
|
||||
* clear the History contents
|
||||
*/
|
||||
void clearHistory();
|
||||
|
||||
|
||||
};
|
||||
40
mozilla/xpfe/components/urlbarhistory/src/Makefile.in
Normal file
40
mozilla/xpfe/components/urlbarhistory/src/Makefile.in
Normal file
@@ -0,0 +1,40 @@
|
||||
#
|
||||
# The contents of this file are subject to the Netscape 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/NPL/
|
||||
#
|
||||
# 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 Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = appcomps
|
||||
LIBRARY_NAME = urlbarhistory_s
|
||||
REQUIRES = xpcom string rdf pref js necko
|
||||
|
||||
CPPSRCS = nsUrlbarHistory.cpp
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
40
mozilla/xpfe/components/urlbarhistory/src/makefile.win
Normal file
40
mozilla/xpfe/components/urlbarhistory/src/makefile.win
Normal file
@@ -0,0 +1,40 @@
|
||||
#!nmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape 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/NPL/
|
||||
#
|
||||
# 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 Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=appcomps
|
||||
LIBRARY_NAME=urlbarhistory_s
|
||||
|
||||
CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsUrlbarHistory.obj \
|
||||
$(NULL)
|
||||
|
||||
LCFLAGS = \
|
||||
$(LCFLAGS) \
|
||||
$(DEFINES) \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
@@ -0,0 +1,46 @@
|
||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape 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/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is Mozilla Communicator client code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape Communications
|
||||
* Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s): Radha Kulkarni radha@netscape.com
|
||||
*/
|
||||
|
||||
#include "nsIModule.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "nsIComponentManager.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIUrlbarHistory.h"
|
||||
|
||||
#include "nsUrlbarHistory.h"
|
||||
|
||||
// Factory Constructors
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory)
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Module implementation for the history library
|
||||
|
||||
static nsModuleComponentInfo gUBHistoryModuleInfo[] =
|
||||
{
|
||||
{ "nsUrlbarHistory", NS_URLBARHISTORY_CID,
|
||||
NS_URLBARHISTORY_CONTRACTID, nsUrlbarHistoryConstructor },
|
||||
{ "nsUrlbarHistory", NS_URLBARHISTORY_CID,
|
||||
NS_URLBARAUTOCOMPLETE_CONTRACTID, nsUrlbarHistoryConstructor }
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE("Urlbar History Module", gUBHistoryModuleInfo)
|
||||
677
mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp
Normal file
677
mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp
Normal file
@@ -0,0 +1,677 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
*
|
||||
* 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 the Mozilla browser.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications, Inc. Portions created by Netscape are
|
||||
* Copyright (C) 1999, Mozilla. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Radha Kulkarni <radha@netscape.com>
|
||||
*
|
||||
*/
|
||||
|
||||
// Local Includes
|
||||
#include "nsUrlbarHistory.h"
|
||||
|
||||
// Helper Classes
|
||||
#include "nsXPIDLString.h"
|
||||
|
||||
// Interfaces Needed
|
||||
#include "nsString.h"
|
||||
#include "nsIAutoCompleteResults.h"
|
||||
#include "nsISimpleEnumerator.h"
|
||||
#include "nsIPref.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIRDFService.h"
|
||||
#include "nsIRDFContainer.h"
|
||||
#include "nsIRDFContainerUtils.h"
|
||||
#include "nsIURL.h"
|
||||
|
||||
|
||||
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
|
||||
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
|
||||
static NS_DEFINE_CID(kRDFCUtilsCID, NS_RDFCONTAINERUTILS_CID);
|
||||
static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
|
||||
|
||||
static char * ignoreArray[] = {
|
||||
"http://",
|
||||
"ftp://",
|
||||
"www.",
|
||||
"http://www.",
|
||||
"https://",
|
||||
"https://www.",
|
||||
"keyword:",
|
||||
"://",
|
||||
"//",
|
||||
"\\",
|
||||
":\\",
|
||||
"file:///",
|
||||
".com",
|
||||
".org",
|
||||
".net",
|
||||
".",
|
||||
"?",
|
||||
"&",
|
||||
"="
|
||||
};
|
||||
static nsIRDFResource * kNC_CHILD;
|
||||
static nsIRDFResource * kNC_URLBARHISTORY;
|
||||
static nsIRDFService * gRDFService;
|
||||
static nsIRDFContainerUtils * gRDFCUtils;
|
||||
|
||||
#define PREF_AUTOCOMPLETE_ENABLED "browser.urlbar.autocomplete.enabled"
|
||||
|
||||
|
||||
|
||||
//*****************************************************************************
|
||||
//*** nsUrlbarHistory: Object Management
|
||||
//*****************************************************************************
|
||||
|
||||
nsUrlbarHistory::nsUrlbarHistory()
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
PRInt32 cnt = sizeof(ignoreArray)/sizeof(char *);
|
||||
for(PRInt32 i=0; i< cnt; i++)
|
||||
mIgnoreArray.AppendString(NS_ConvertASCIItoUCS2(ignoreArray[i]));
|
||||
|
||||
nsresult res;
|
||||
|
||||
res = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService),
|
||||
(nsISupports **)&gRDFService);
|
||||
res = nsServiceManager::GetService(kRDFCUtilsCID, NS_GET_IID(nsIRDFContainerUtils),
|
||||
(nsISupports **)&gRDFCUtils);
|
||||
if (gRDFService) {
|
||||
//printf("$$$$ Got RDF SERVICE $$$$\n");
|
||||
res = gRDFService->GetDataSource("rdf:localstore", getter_AddRefs(mDataSource));
|
||||
|
||||
res = gRDFService->GetResource("http://home.netscape.com/NC-rdf#child", &kNC_CHILD);
|
||||
res = gRDFService->GetResource("nc:urlbar-history", &kNC_URLBARHISTORY);
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIPref> prefs = do_GetService(kPrefServiceCID, &res);
|
||||
if (NS_SUCCEEDED(res)) {
|
||||
prefs->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mEnabled);
|
||||
prefs->AddObserver(PREF_AUTOCOMPLETE_ENABLED, this);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
nsUrlbarHistory::~nsUrlbarHistory()
|
||||
{
|
||||
//Entries are now in RDF
|
||||
//ClearHistory();
|
||||
|
||||
mDataSource = nsnull;
|
||||
|
||||
NS_IF_RELEASE(gRDFService);
|
||||
NS_IF_RELEASE(gRDFCUtils);
|
||||
NS_IF_RELEASE(kNC_URLBARHISTORY);
|
||||
NS_IF_RELEASE(kNC_CHILD);
|
||||
|
||||
}
|
||||
|
||||
//*****************************************************************************
|
||||
// nsUrlbarHistory: nsISupports
|
||||
//*****************************************************************************
|
||||
|
||||
NS_IMPL_ADDREF(nsUrlbarHistory)
|
||||
NS_IMPL_RELEASE(nsUrlbarHistory)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsUrlbarHistory)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteSession)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIUrlbarHistory)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIObserver)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIUrlbarHistory)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
//*****************************************************************************
|
||||
// nsUrlbarHistory: nsISHistory
|
||||
//*****************************************************************************
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::ClearHistory()
|
||||
{
|
||||
/* Get the elements in the data source through the container
|
||||
*/
|
||||
nsCOMPtr<nsIRDFContainer> container;
|
||||
gRDFCUtils->MakeSeq(mDataSource,
|
||||
kNC_URLBARHISTORY,
|
||||
getter_AddRefs(container));
|
||||
|
||||
NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
|
||||
|
||||
/* Remove all the elements, back to front, to avoid O(n^2) updates
|
||||
* from RDF.
|
||||
*/
|
||||
PRInt32 count = 0;
|
||||
container->GetCount(&count);
|
||||
for (PRInt32 i = count; i >= 1; --i) {
|
||||
nsCOMPtr<nsIRDFNode> dummy;
|
||||
container->RemoveElementAt(i, PR_TRUE, getter_AddRefs(dummy));
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
container->GetCount(&count);
|
||||
NS_ASSERTION(count == 0, "count != 0 after clearing history");
|
||||
#endif
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
/* Get size of the history list */
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::GetCount(PRInt32 * aResult)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aResult);
|
||||
|
||||
nsCOMPtr<nsIRDFContainer> container;
|
||||
gRDFCUtils->MakeSeq(mDataSource,
|
||||
kNC_URLBARHISTORY,
|
||||
getter_AddRefs(container));
|
||||
|
||||
NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
|
||||
return container->GetCount(aResult);
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::OnStartLookup(const PRUnichar *uSearchString,
|
||||
nsIAutoCompleteResults *previousSearchResult,
|
||||
nsIAutoCompleteListener *listener)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
|
||||
if (!listener)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
if (!mEnabled) {// urlbar autocomplete is not enabled
|
||||
listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
|
||||
return NS_OK;
|
||||
}
|
||||
// printf("Autocomplete is enabled\n");
|
||||
|
||||
if (uSearchString[0] == 0)
|
||||
{
|
||||
listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// Check if it is one of the generic strings "http://, www., ftp:// etc..
|
||||
PRInt32 cnt = mIgnoreArray.Count();
|
||||
for(PRInt32 i=0; i<cnt; i++) {
|
||||
nsString * match = mIgnoreArray.StringAt(i);
|
||||
|
||||
if (match) {
|
||||
PRInt32 index = match->Find(uSearchString, PR_TRUE);
|
||||
if (index == 0) {
|
||||
listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
|
||||
return NS_OK;
|
||||
}
|
||||
} // match
|
||||
} //for
|
||||
|
||||
nsCOMPtr<nsIAutoCompleteResults> results;
|
||||
/* Don't call SearchPreviousResults. It is buggy
|
||||
if (NS_FAILED(SearchPreviousResults(uSearchString, previousSearchResult)))
|
||||
{
|
||||
results = do_CreateInstance(NS_AUTOCOMPLETERESULTS_CONTRACTID);
|
||||
NS_ENSURE_TRUE(results, NS_ERROR_FAILURE);
|
||||
rv = SearchCache(uSearchString, results);
|
||||
}
|
||||
else
|
||||
results = previousSearchResult;
|
||||
*/
|
||||
|
||||
results = do_CreateInstance(NS_AUTOCOMPLETERESULTS_CONTRACTID);
|
||||
NS_ENSURE_TRUE(results, NS_ERROR_FAILURE);
|
||||
rv = SearchCache(nsLiteralString(uSearchString), results);
|
||||
|
||||
AutoCompleteStatus status = nsIAutoCompleteStatus::failed;
|
||||
if (NS_FAILED(rv)) return NS_OK;
|
||||
|
||||
PRBool addedDefaultItem = PR_FALSE;
|
||||
|
||||
results->SetSearchString(uSearchString);
|
||||
results->SetDefaultItemIndex(-1);
|
||||
|
||||
nsCOMPtr<nsISupportsArray> array;
|
||||
rv = results->GetItems(getter_AddRefs(array));
|
||||
|
||||
if (NS_FAILED(rv)) return NS_OK;
|
||||
|
||||
PRUint32 nbrOfItems;
|
||||
rv = array->Count(&nbrOfItems);
|
||||
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
if (nbrOfItems > 1) {
|
||||
results->SetDefaultItemIndex(addedDefaultItem ? 1 : 0);
|
||||
status = nsIAutoCompleteStatus::matchFound;
|
||||
}
|
||||
else {
|
||||
if (nbrOfItems == 1) {
|
||||
results->SetDefaultItemIndex(0);
|
||||
status = nsIAutoCompleteStatus::matchFound;
|
||||
}
|
||||
else
|
||||
status = nsIAutoCompleteStatus::noMatch;
|
||||
}
|
||||
} // NS_SUCCEEDED(rv)
|
||||
|
||||
listener->OnAutoComplete(results, status);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
#if 0
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::SearchPreviousResults(const PRUnichar *searchStr,
|
||||
nsIAutoCompleteResults *previousSearchResult)
|
||||
{
|
||||
if (!previousSearchResult)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
nsXPIDLString prevSearchString;
|
||||
PRUint32 searchStrLen = nsCRT::strlen(searchStr);
|
||||
nsresult rv;
|
||||
|
||||
rv = previousSearchResult->GetSearchString(getter_Copies(prevSearchString));
|
||||
if (NS_FAILED(rv))
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
if (!(const PRUnichar*)prevSearchString)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
PRUint32 prevSearchStrLen = nsCRT::strlen(prevSearchString);
|
||||
if (searchStrLen < prevSearchStrLen || nsCRT::strncasecmp(searchStr, prevSearchString, prevSearchStrLen != 0))
|
||||
return NS_ERROR_ABORT;
|
||||
|
||||
nsCOMPtr<nsISupportsArray> array;
|
||||
rv = previousSearchResult->GetItems(getter_AddRefs(array));
|
||||
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
PRUint32 nbrOfItems;
|
||||
PRUint32 i;
|
||||
|
||||
rv = array->Count(&nbrOfItems);
|
||||
if (NS_FAILED(rv) || nbrOfItems <= 0)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsCOMPtr<nsISupports> item;
|
||||
nsCOMPtr<nsIAutoCompleteItem> resultItem;
|
||||
|
||||
// XXX I don't understand the purpose of this loop!
|
||||
for (i = 0; i < nbrOfItems; i ++) {
|
||||
rv = array->QueryElementAt(i, NS_GET_IID(nsIAutoCompleteItem),
|
||||
getter_AddRefs(resultItem));
|
||||
if (NS_FAILED(rv))
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsXPIDLString itemValue;
|
||||
resultItem->GetValue(getter_Copies(itemValue));
|
||||
|
||||
// nsCAutoString itemAutoStr;
|
||||
// itemAutoStr.AssignWithConversion(itemValue);
|
||||
// printf("SearchPreviousResults::Comparing %s with %s \n", searchAutoStr.ToNewCString(), itemAutoStr.get());
|
||||
if (!(const PRUnichar*)itemValue)
|
||||
continue;
|
||||
|
||||
if (nsCRT::strncasecmp(searchStr, itemValue, searchStrLen) == 0)
|
||||
continue;
|
||||
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::SearchCache(nsAReadableString& searchStr,
|
||||
nsIAutoCompleteResults* results)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
nsCOMPtr<nsISimpleEnumerator> entries;
|
||||
|
||||
//printf("******** In SearchCache *******\n");
|
||||
|
||||
PRInt32 protocolIndex=-1;
|
||||
nsAutoString searchProtocol, searchPath;
|
||||
PRInt32 searchPathIndex, searchStrLength;
|
||||
|
||||
// Get the length of the search string
|
||||
searchStrLength = searchStr.Length();
|
||||
// Check if there is any protocol present in the
|
||||
// search string.
|
||||
GetHostIndex(searchStr, &searchPathIndex);
|
||||
if (searchPathIndex > 0) {
|
||||
// There was a protocol in the search string. Strip off
|
||||
// the protocol from the rest of the url
|
||||
searchStr.Left(searchProtocol, searchPathIndex);
|
||||
searchStr.Mid(searchPath, searchPathIndex, searchStrLength);
|
||||
}
|
||||
else {
|
||||
// There was no protocol in the search string.
|
||||
searchPath = searchStr;
|
||||
}
|
||||
//printf("Search String is %s path = %s protocol = %s \n", searchStr.ToNewCString(), searchPath.ToNewCString(), searchProtocol.ToNewCString());
|
||||
|
||||
if (!gRDFCUtils || !kNC_URLBARHISTORY)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
|
||||
nsCOMPtr<nsIRDFContainer> container;
|
||||
/* Get the elements in the data source
|
||||
* through the container
|
||||
*/
|
||||
rv = gRDFCUtils->MakeSeq(mDataSource,
|
||||
kNC_URLBARHISTORY,
|
||||
getter_AddRefs(container));
|
||||
|
||||
NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
|
||||
|
||||
//Get the elements from the container
|
||||
container->GetElements(getter_AddRefs(entries));
|
||||
|
||||
NS_ENSURE_TRUE(entries, NS_ERROR_FAILURE);
|
||||
|
||||
PRBool moreElements = PR_FALSE;
|
||||
while (NS_SUCCEEDED(entries->HasMoreElements(&moreElements)) && moreElements) {
|
||||
nsCOMPtr<nsISupports> entry;
|
||||
nsCOMPtr<nsIRDFLiteral> literal;
|
||||
nsAutoString rdfProtocol, rdfPath;
|
||||
PRInt32 rdfPathIndex, index = -1;
|
||||
nsAutoString match;
|
||||
const PRUnichar * rdfValue = nsnull;
|
||||
|
||||
rv = entries->GetNext(getter_AddRefs(entry));
|
||||
if (entry) {
|
||||
literal = do_QueryInterface(entry);
|
||||
literal->GetValueConst(&rdfValue);
|
||||
}
|
||||
if (!rdfValue)
|
||||
continue;
|
||||
nsLiteralString valueStr(rdfValue);
|
||||
|
||||
// Get the index of the hostname in the rdf string
|
||||
GetHostIndex (valueStr, &rdfPathIndex);
|
||||
|
||||
if (rdfPathIndex > 0) {
|
||||
// RDf string has a protocol in it, Strip it off
|
||||
// from the rest of the url;
|
||||
valueStr.Left(rdfProtocol, rdfPathIndex);
|
||||
valueStr.Mid(rdfPath, rdfPathIndex, valueStr.Length());
|
||||
}
|
||||
else {
|
||||
// There was no protocol.
|
||||
rdfPath = valueStr;
|
||||
}
|
||||
//printf("RDFString is %s path = %s protocol = %s\n", valueStr.ToNewCString(), rdfPath.ToNewCString(), rdfProtocol.ToNewCString());
|
||||
// We have all the data we need. Let's do the comparison
|
||||
// We compare the path first and compare the protocol next
|
||||
index = rdfPath.Find(searchPath, PR_TRUE);
|
||||
if (index == 0) {
|
||||
// The paths match. Now let's compare protocols
|
||||
if (searchProtocol.Length() && rdfProtocol.Length()) {
|
||||
// Both the strings have a protocol part. Compare them.
|
||||
protocolIndex = rdfProtocol.Find(searchProtocol);
|
||||
if (protocolIndex == 0) {
|
||||
// Both protocols match. We found a result item
|
||||
match = valueStr;
|
||||
}
|
||||
}
|
||||
else if (searchProtocol.Length() && (rdfProtocol.Length() <= 0)) {
|
||||
/* The searchString has a protocol but the rdf string doesn't
|
||||
* Check if the searchprotocol is the default "http://". If so,
|
||||
* prepend the searchProtocol to the rdfPath and provide that as
|
||||
* the result. Otherwise we don't have a match
|
||||
*/
|
||||
// XXX I guess hard-coded "http://" is OK, since netlib considers
|
||||
// all urls to be char *
|
||||
if ((searchProtocol.Find("http://", PR_TRUE)) == 0) {
|
||||
match = searchProtocol + rdfPath;
|
||||
}
|
||||
}
|
||||
else if ((searchProtocol.Length() <=0) && rdfProtocol.Length() ||
|
||||
(searchProtocol.Length() <=0) && (rdfProtocol.Length() <= 0)) {
|
||||
/* Provide the rdfPath (no protocol, just the www.xyz.com/... part)
|
||||
* as the result for the following 2 cases.
|
||||
* a) searchString has no protocol but rdfString has protocol
|
||||
* b) Both searchString and rdfString don't have a protocol
|
||||
*/
|
||||
match = rdfPath;
|
||||
}
|
||||
} // (index == 0)
|
||||
|
||||
|
||||
|
||||
if (!match.IsEmpty()) {
|
||||
/* We have a result item.
|
||||
* First make sure that the value is not already
|
||||
* present in the results array. If we have
|
||||
* www.mozilla.org and http://www.mozilla.org as unique addresses
|
||||
* in the history and due to the algorithm we follow above to find a match,
|
||||
* when the user user types, http://www.m, we would have 2 matches, both being,
|
||||
* http://www.mozilla.org. So, before adding an entry as a result,
|
||||
* make sure it is not already present in the resultarray
|
||||
*/
|
||||
PRBool itemPresent = PR_FALSE;
|
||||
rv = CheckItemAvailability(match, results, &itemPresent);
|
||||
if (itemPresent) {
|
||||
continue;
|
||||
}
|
||||
//Create an AutoComplete Item
|
||||
nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
|
||||
NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);
|
||||
|
||||
newItem->SetValue(match.get());
|
||||
nsCOMPtr<nsISupportsArray> array;
|
||||
rv = results->GetItems(getter_AddRefs(array));
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
// printf("Appending element %s to the results array\n", item->ToNewCString());
|
||||
array->AppendElement((nsISupports*)newItem);
|
||||
}
|
||||
/* The result may be much more than what was asked for. For example
|
||||
* the user types http://www.moz and we had http://www.mozilla.org/sidebar
|
||||
* as an entry in the history. This will match our selection criteria above
|
||||
* above and will be provided as result. But the user may actually want to
|
||||
* go to http://www.mozilla.org. If we are such a situation, offer
|
||||
* http://www.mozilla.org (The first part of the result string http://www.mozilla.org/sidebar)
|
||||
* as a result option(probably the default result).
|
||||
*/
|
||||
rv = VerifyAndCreateEntry(searchStr, match, results);
|
||||
}
|
||||
|
||||
} // while
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::GetHostIndex(nsAReadableString& aPath, PRInt32 * aReturn)
|
||||
{
|
||||
if (!aReturn)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
PRInt32 slashIndex=-1;
|
||||
nsresult rv;
|
||||
|
||||
nsCOMPtr<nsIURL> pathURL=do_CreateInstance(kStandardURLCID, &rv);
|
||||
if (pathURL) {
|
||||
pathURL->SetSpec(NS_ConvertUCS2toUTF8(aPath).get());
|
||||
nsXPIDLCString host, preHost, filePath;
|
||||
|
||||
pathURL->GetHost(getter_Copies(host));
|
||||
pathURL->GetFilePath(getter_Copies(filePath));
|
||||
pathURL->GetPreHost(getter_Copies(preHost));
|
||||
|
||||
nsAutoString path(aPath);
|
||||
if ((const char*)preHost)
|
||||
slashIndex = path.Find(preHost, PR_TRUE);
|
||||
else if ((const char *)host)
|
||||
slashIndex = path.Find(host,PR_TRUE);
|
||||
else if ((const char *)filePath)
|
||||
slashIndex = path.Find(filePath, PR_TRUE);
|
||||
else
|
||||
slashIndex = 0;
|
||||
|
||||
//printf("$$$$ Scheme for uri = %s, preHost = %s, filepath = %s, Host = %s HostIndex = %d\n", pathScheme, preHost, filePath, pathHost, *aReturn);
|
||||
}
|
||||
|
||||
*aReturn = slashIndex;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::CheckItemAvailability(nsAReadableString& aItem,
|
||||
nsIAutoCompleteResults * aArray,
|
||||
PRBool * aResult)
|
||||
{
|
||||
if (!aArray)
|
||||
return PR_FALSE;
|
||||
|
||||
nsresult rv;
|
||||
*aResult = PR_FALSE;
|
||||
|
||||
nsCOMPtr<nsISupportsArray> array;
|
||||
rv = aArray->GetItems(getter_AddRefs(array));
|
||||
|
||||
// no item array, just return false;
|
||||
if (NS_FAILED(rv)) return NS_OK;
|
||||
|
||||
PRUint32 nbrOfItems=0;
|
||||
PRUint32 i;
|
||||
|
||||
rv = array->Count(&nbrOfItems);
|
||||
// If there is no item found in the array, return false
|
||||
if (nbrOfItems <= 0)
|
||||
return NS_OK;
|
||||
|
||||
nsCOMPtr <nsIAutoCompleteItem> resultItem;
|
||||
for (i = 0; i < nbrOfItems; i ++) {
|
||||
|
||||
rv = array->QueryElementAt(i, NS_GET_IID(nsIAutoCompleteItem),
|
||||
getter_AddRefs(resultItem));
|
||||
if (NS_FAILED(rv))
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsXPIDLString itemValue;
|
||||
resultItem->GetValue(getter_Copies(itemValue));
|
||||
// Using nsIURI to do comparisons didn't quite work out.
|
||||
// So use nsCRT methods
|
||||
if (aItem.Equals(itemValue))
|
||||
{
|
||||
//printf("In CheckItemAvailability. Item already found\n");
|
||||
*aResult = PR_TRUE;
|
||||
break;
|
||||
}
|
||||
} // for
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::VerifyAndCreateEntry(nsAReadableString& aSearchItem,
|
||||
nsString& aMatchStr,
|
||||
nsIAutoCompleteResults * aResultArray)
|
||||
{
|
||||
if (!aResultArray)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
PRInt32 searchStrLen = aSearchItem.Length();
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIURL> searchURL = do_CreateInstance(kStandardURLCID, &rv);
|
||||
if (searchURL) {
|
||||
searchURL->SetSpec(NS_ConvertUCS2toUTF8(aSearchItem).get());
|
||||
nsXPIDLCString filePath;
|
||||
searchURL->GetFilePath(getter_Copies(filePath));
|
||||
// Don't bother checking for hostname if the search string
|
||||
// already has a filepath;
|
||||
if (filePath && (nsCRT::strlen(filePath) > 1)) {
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIURL> matchURL = do_CreateInstance(kStandardURLCID, &rv);
|
||||
if (matchURL) {
|
||||
matchURL->SetSpec(NS_ConvertUCS2toUTF8(aMatchStr).get());
|
||||
nsXPIDLCString filePath;
|
||||
matchURL->GetFilePath(getter_Copies(filePath));
|
||||
// If the match string doesn't have a filepath
|
||||
// we need to do nothing here, return.
|
||||
if (!filePath || (filePath && (nsCRT::strlen(filePath) <=1)))
|
||||
return NS_OK;
|
||||
|
||||
// Find the position of the filepath in the result string
|
||||
PRInt32 slashIndex = aMatchStr.Find("/", PR_FALSE, searchStrLen);
|
||||
// Extract the host name
|
||||
nsAutoString hostName;
|
||||
aMatchStr.Left(hostName, slashIndex);
|
||||
//printf("#### Host Name is %s\n", hostName.ToNewCString());
|
||||
// Check if this host is already present in the result array
|
||||
// If not add it to the result array
|
||||
PRBool itemAvailable = PR_TRUE;
|
||||
CheckItemAvailability(hostName, aResultArray, &itemAvailable);
|
||||
if (!itemAvailable) {
|
||||
// Insert the host name to the result array at the top
|
||||
//Create an AutoComplete Item
|
||||
nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
|
||||
NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);
|
||||
newItem->SetValue(hostName.GetUnicode());
|
||||
nsCOMPtr<nsISupportsArray> array;
|
||||
rv = aResultArray->GetItems(getter_AddRefs(array));
|
||||
// Always insert the host entry at the top of the array
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
array->InsertElementAt(newItem, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::OnStopLookup()
|
||||
{
|
||||
printf("nsUrlbarHistory::OnStopLookup()\n");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::OnAutoComplete(const PRUnichar *searchString,
|
||||
nsIAutoCompleteResults *previousSearchResult,
|
||||
nsIAutoCompleteListener *listener)
|
||||
{
|
||||
#if 1
|
||||
printf("nsUrlbarHistory::OnAutoComplete(%s)\n", NS_ConvertUCS2toUTF8(searchString));
|
||||
#endif
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsUrlbarHistory::Observe(nsISupports *aSubject, const PRUnichar *aTopic,
|
||||
const PRUnichar *aSomeData)
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
if (nsCRT::strcmp(aTopic, NS_LITERAL_STRING("nsPref:changed").get())==0) {
|
||||
|
||||
nsCOMPtr<nsIPref> prefs=do_QueryInterface(aSubject, &rv);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
prefs->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mEnabled);
|
||||
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
68
mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.h
Normal file
68
mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.h
Normal file
@@ -0,0 +1,68 @@
|
||||
/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* 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 the Mozilla browser.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications, Inc. Portions created by Netscape are
|
||||
* Copyright (C) 1999, Mozilla. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Radha Kulkarni <radha@netscape.com>
|
||||
*/
|
||||
|
||||
#ifndef nsUrlbarHistory_h
|
||||
#define nsUrlbarHistory_h
|
||||
|
||||
// Helper Classes
|
||||
#include "nsCOMPtr.h"
|
||||
|
||||
//Interfaces Needed
|
||||
#include "nsIUrlbarHistory.h"
|
||||
#include "nsIAutoCompleteSession.h"
|
||||
#include "nsIObserver.h"
|
||||
#include "nsVoidArray.h"
|
||||
#include "nsIRDFService.h"
|
||||
#include "nsIRDFDataSource.h"
|
||||
#include "nsRDFCID.h"
|
||||
|
||||
class nsUrlbarHistory: public nsIUrlbarHistory,
|
||||
public nsIObserver,
|
||||
public nsIAutoCompleteSession
|
||||
{
|
||||
public:
|
||||
nsUrlbarHistory();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIURLBARHISTORY
|
||||
NS_DECL_NSIOBSERVER
|
||||
NS_DECL_NSIAUTOCOMPLETESESSION
|
||||
|
||||
protected:
|
||||
virtual ~nsUrlbarHistory();
|
||||
|
||||
#if 0
|
||||
NS_IMETHOD SearchPreviousResults(const PRUnichar *, nsIAutoCompleteResults *);
|
||||
#endif
|
||||
NS_IMETHOD SearchCache(nsAReadableString&, nsIAutoCompleteResults *);
|
||||
NS_IMETHOD GetHostIndex(nsAReadableString& aPath, PRInt32 * aReturn);
|
||||
NS_IMETHOD CheckItemAvailability(nsAReadableString& aItem, nsIAutoCompleteResults * aArray, PRBool * aResult);
|
||||
NS_IMETHOD VerifyAndCreateEntry(nsAReadableString& aItem, nsString& aMatchItem, nsIAutoCompleteResults * aArray);
|
||||
|
||||
private:
|
||||
nsStringArray mIgnoreArray;
|
||||
nsCOMPtr<nsIRDFDataSource> mDataSource;
|
||||
PRBool mEnabled;
|
||||
};
|
||||
|
||||
|
||||
#endif /* nsUrlbarHistory */
|
||||
Reference in New Issue
Block a user