aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-12-02 05:29:20 +0800
committerChristian Persch <chpe@src.gnome.org>2006-12-02 05:29:20 +0800
commit4521b7af2f9f9b9019486cb0ed9cdade37b6fd50 (patch)
treec7dd23cb8c8a85c1b43878fd97ccee8bbd92a916 /embed/mozilla
parentfb2c1c3d03f4333971eb1048bd3992ba20f45577 (diff)
downloadgsoc2013-epiphany-4521b7af2f9f9b9019486cb0ed9cdade37b6fd50.tar.gz
gsoc2013-epiphany-4521b7af2f9f9b9019486cb0ed9cdade37b6fd50.tar.zst
gsoc2013-epiphany-4521b7af2f9f9b9019486cb0ed9cdade37b6fd50.zip
Another mozilla API change.
2006-12-01 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed-find.c: (ephy_embed_find_find_again): * embed/ephy-embed-find.h: * embed/mozilla/EphyFind.cpp: * embed/mozilla/EphyFind.h: * embed/mozilla/mozilla-embed-find.cpp: * src/ephy-find-toolbar.c: (ephy_find_toolbar_find_next), (ephy_find_toolbar_find_previous): Another mozilla API change. * m4/gecko.m4: Add -lxpcomglue_s to EXTRA_LIBS on trunk.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/EphyFind.cpp5
-rw-r--r--embed/mozilla/EphyFind.h3
-rw-r--r--embed/mozilla/mozilla-embed-find.cpp5
3 files changed, 8 insertions, 5 deletions
diff --git a/embed/mozilla/EphyFind.cpp b/embed/mozilla/EphyFind.cpp
index ff94e7c9a..222647506 100644
--- a/embed/mozilla/EphyFind.cpp
+++ b/embed/mozilla/EphyFind.cpp
@@ -198,7 +198,8 @@ EphyFind::Find (const char *aSearchString,
}
EphyEmbedFindResult
-EphyFind::FindAgain (PRBool aForward)
+EphyFind::FindAgain (PRBool aForward,
+ PRBool aLinksOnly)
{
if (!mFinder) return EPHY_EMBED_FIND_NOTFOUND;
@@ -207,7 +208,7 @@ EphyFind::FindAgain (PRBool aForward)
nsresult rv;
PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND;
#ifdef HAVE_GECKO_1_9
- rv = mFinder->FindAgain (!aForward, mHasFocus, &found);
+ rv = mFinder->FindAgain (!aForward, aLinksOnly, mHasFocus, &found);
#else
if (aForward) {
rv = mFinder->FindNext (&found);
diff --git a/embed/mozilla/EphyFind.h b/embed/mozilla/EphyFind.h
index 189eeb91d..dbbb18483 100644
--- a/embed/mozilla/EphyFind.h
+++ b/embed/mozilla/EphyFind.h
@@ -44,7 +44,8 @@ class EphyFind
void SetSelectionAttention (PRBool aAttention);
EphyEmbedFindResult Find (const char *aSearchString,
PRBool aLinksOnly);
- EphyEmbedFindResult FindAgain (PRBool aForward);
+ EphyEmbedFindResult FindAgain (PRBool aForward,
+ PRBool aLinksOnly);
PRBool ActivateLink (GdkModifierType aMask);
private:
diff --git a/embed/mozilla/mozilla-embed-find.cpp b/embed/mozilla/mozilla-embed-find.cpp
index fb4691a51..2b471db33 100644
--- a/embed/mozilla/mozilla-embed-find.cpp
+++ b/embed/mozilla/mozilla-embed-find.cpp
@@ -73,12 +73,13 @@ impl_find (EphyEmbedFind *efind,
static EphyEmbedFindResult
impl_find_again (EphyEmbedFind *efind,
- gboolean forward)
+ gboolean forward,
+ gboolean links_only)
{
MozillaEmbedFind *find = MOZILLA_EMBED_FIND (efind);
MozillaEmbedFindPrivate *priv = find->priv;
- return priv->find->FindAgain (forward);
+ return priv->find->FindAgain (forward, links_only);
}
static void