diff options
Diffstat (limited to 'embed')
-rw-r--r-- | embed/ephy-embed-find.c | 6 | ||||
-rw-r--r-- | embed/ephy-embed-find.h | 6 | ||||
-rw-r--r-- | embed/mozilla/EphyFind.cpp | 5 | ||||
-rw-r--r-- | embed/mozilla/EphyFind.h | 3 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed-find.cpp | 5 |
5 files changed, 16 insertions, 9 deletions
diff --git a/embed/ephy-embed-find.c b/embed/ephy-embed-find.c index bfbaa643c..b93680853 100644 --- a/embed/ephy-embed-find.c +++ b/embed/ephy-embed-find.c @@ -67,15 +67,17 @@ ephy_embed_find_find (EphyEmbedFind *find, * ephy_embed_find_find_again: * @embed: an #EphyEmbedFind * @forward %TRUE to search forwards in the document + * @links_only: whether to only search the text in links * * Return value: whether a match was found **/ EphyEmbedFindResult ephy_embed_find_find_again (EphyEmbedFind *find, - gboolean forward) + gboolean forward, + gboolean links_only) { EphyEmbedFindIface *iface = EPHY_EMBED_FIND_GET_IFACE (find); - return iface->find_again (find, forward); + return iface->find_again (find, forward, links_only); } void diff --git a/embed/ephy-embed-find.h b/embed/ephy-embed-find.h index 6944f3f98..ac6b462ab 100644 --- a/embed/ephy-embed-find.h +++ b/embed/ephy-embed-find.h @@ -61,7 +61,8 @@ struct _EphyEmbedFindIface const char *search_string, gboolean links_only); EphyEmbedFindResult (* find_again) (EphyEmbedFind *find, - gboolean forward); + gboolean forward, + gboolean links_only); void (* set_selection) (EphyEmbedFind *find, gboolean attention); gboolean (* activate_link) (EphyEmbedFind *find, @@ -82,7 +83,8 @@ EphyEmbedFindResult ephy_embed_find_find (EphyEmbedFind *find, gboolean links_only); EphyEmbedFindResult ephy_embed_find_find_again (EphyEmbedFind *find, - gboolean forward); + gboolean forward, + gboolean links_only); void ephy_embed_find_set_selection (EphyEmbedFind *find, gboolean attention); 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 |