diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-11-03 20:37:15 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-11-03 20:37:15 +0800 |
| commit | 1c87d0af88f833fff85b468ef57a7cb660805fb7 (patch) | |
| tree | d15be9bdc630e4f3a43e104f0d891554ff9ce126 /embed/mozilla/EphyFind.cpp | |
| parent | 5304b565cd6192c80bae5473d3ac2364dc0de7bb (diff) | |
| download | gsoc2013-epiphany-1c87d0af88f833fff85b468ef57a7cb660805fb7.tar gsoc2013-epiphany-1c87d0af88f833fff85b468ef57a7cb660805fb7.tar.gz gsoc2013-epiphany-1c87d0af88f833fff85b468ef57a7cb660805fb7.tar.bz2 gsoc2013-epiphany-1c87d0af88f833fff85b468ef57a7cb660805fb7.tar.lz gsoc2013-epiphany-1c87d0af88f833fff85b468ef57a7cb660805fb7.tar.xz gsoc2013-epiphany-1c87d0af88f833fff85b468ef57a7cb660805fb7.tar.zst gsoc2013-epiphany-1c87d0af88f833fff85b468ef57a7cb660805fb7.zip | |
More detailed result code from find backend.
2005-11-03 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-embed-find.c:
* embed/ephy-embed-find.h:
* embed/mozilla/EphyFind.cpp:
* embed/mozilla/EphyFind.h:
* embed/mozilla/mozilla-embed-find.cpp:
More detailed result code from find backend.
* src/ephy-find-toolbar.c: (set_status), (clear_status),
(entry_changed_cb), (ephy_find_toolbar_init),
(ephy_find_toolbar_find_next), (ephy_find_toolbar_find_previous),
(ephy_find_toolbar_open):
Add status text to the find toolbar.
Reverse Next/Previous button order.
Diffstat (limited to 'embed/mozilla/EphyFind.cpp')
| -rw-r--r-- | embed/mozilla/EphyFind.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/embed/mozilla/EphyFind.cpp b/embed/mozilla/EphyFind.cpp index 5221be417..c6b9b7c9b 100644 --- a/embed/mozilla/EphyFind.cpp +++ b/embed/mozilla/EphyFind.cpp @@ -147,11 +147,11 @@ EphyFind::SetFindProperties (const char *aSearchString, #endif /* TYPEAHEADFIND */ } -PRBool +EphyEmbedFindResult EphyFind::Find (const char *aSearchString, PRBool aLinksOnly) { - if (!mFinder) return PR_FALSE; + if (!mFinder) return EPHY_EMBED_FIND_NOTFOUND; nsEmbedString uSearchString; NS_CStringToUTF16 (nsEmbedCString (aSearchString ? aSearchString : ""), @@ -162,7 +162,7 @@ EphyFind::Find (const char *aSearchString, PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND; rv = mFinder->Find (uSearchString, aLinksOnly, &found); - return NS_SUCCEEDED (rv) && found != nsITypeAheadFind::FIND_NOTFOUND; + return (EphyEmbedFindResult) found; #else mFinder->SetSearchString (uSearchString.get ()); mFinder->SetFindBackwards (PR_FALSE); @@ -171,14 +171,15 @@ EphyFind::Find (const char *aSearchString, PRBool didFind = PR_FALSE; rv = mFinder->FindNext (&didFind); - return NS_SUCCEEDED (rv) && didFind; + return NS_SUCCEEDED (rv) && didFind ? EPHY_EMBED_FIND_FOUND : + EPHY_EMBED_FIND_NOTFOUND; #endif /* HAVE_TYPEAHEADFIND */ } -PRBool +EphyEmbedFindResult EphyFind::FindAgain (PRBool aForward) { - if (!mFinder) return PR_FALSE; + if (!mFinder) return EPHY_EMBED_FIND_NOTFOUND; #ifdef HAVE_TYPEAHEADFIND nsresult rv; @@ -189,15 +190,16 @@ EphyFind::FindAgain (PRBool aForward) rv = mFinder->FindPrevious (&found); } - return NS_SUCCEEDED (rv) && found != nsITypeAheadFind::FIND_NOTFOUND; + return (EphyEmbedFindResult) found; #else mFinder->SetFindBackwards (!aForward); nsresult rv; PRBool didFind = PR_FALSE; rv = mFinder->FindNext (&didFind); - - return NS_SUCCEEDED (rv) && didFind; + + return NS_SUCCEEDED (rv) && didFind ? EPHY_EMBED_FIND_FOUND : + EPHY_EMBED_FIND_NOTFOUND; #endif /* HAVE_TYPEAHEADFIND */ } |