summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@svn.gnome.org>2007-02-23 14:23:00 +0000
committerChristian Persch <chpe@src.gnome.org>2007-02-23 14:23:00 +0000
commit83a9ce26c411a82ae0556e3e093a89643e09a3d3 (patch)
tree42fbfbcdb5b16e472e50e5d029988d8645135145
parent5828dbd6d3cfc0060e41efda0e2f5484a4a9b9ce (diff)
downloadyelp-83a9ce26c411a82ae0556e3e093a89643e09a3d3.tar.gz
Fix for mozilla API change on trunk.
2007-02-23 Christian Persch <chpe@svn.gnome.org> * src/Yelper.cpp: * src/Yelper.h: Fix for mozilla API change on trunk. svn path=/trunk/; revision=2772
-rw-r--r--ChangeLog6
-rw-r--r--src/Yelper.cpp9
-rw-r--r--src/Yelper.h1
3 files changed, 6 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 29daa7c1..dca9f323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-23 Christian Persch <chpe@svn.gnome.org>
+
+ * src/Yelper.cpp:
+ * src/Yelper.h:
+ Fix for mozilla API change on trunk.
+
2006-12-01 Christian Persch <chpe@cvs.gnome.org>
* configure.in:
diff --git a/src/Yelper.cpp b/src/Yelper.cpp
index ef89f9d0..c05db149 100644
--- a/src/Yelper.cpp
+++ b/src/Yelper.cpp
@@ -67,7 +67,6 @@
Yelper::Yelper (GtkMozEmbed *aEmbed)
: mInitialised(PR_FALSE)
, mSelectionAttention(PR_FALSE)
-, mHasFocus(PR_FALSE)
, mEmbed(aEmbed)
{
debug_print (DB_DEBUG, "Yelper ctor [%p]\n", this);
@@ -167,16 +166,9 @@ Yelper::Find (const char *aSearchString)
nsresult rv;
PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND;
-#ifdef HAVE_GECKO_1_9
- rv = mFinder->Find (NS_ConvertUTF8toUTF16 (aSearchString),
- PR_FALSE /* links only? */,
- mHasFocus,
- &found);
-#else
rv = mFinder->Find (NS_ConvertUTF8toUTF16 (aSearchString),
PR_FALSE /* links only? */,
&found);
-#endif
return NS_SUCCEEDED (rv) && (found == nsITypeAheadFind::FIND_FOUND || found == nsITypeAheadFind::FIND_WRAPPED);
}
@@ -193,7 +185,6 @@ Yelper::FindAgain (PRBool aForward)
#ifdef HAVE_GECKO_1_9
rv = mFinder->FindAgain (!aForward,
PR_FALSE /* links only? */,
- mHasFocus,
&found);
#else
if (aForward) {
diff --git a/src/Yelper.h b/src/Yelper.h
index fe19f731..50c86e13 100644
--- a/src/Yelper.h
+++ b/src/Yelper.h
@@ -59,7 +59,6 @@ public:
private:
PRPackedBool mInitialised;
PRPackedBool mSelectionAttention;
- PRPackedBool mHasFocus;
GtkMozEmbed *mEmbed;
nsCOMPtr<nsIWebBrowser> mWebBrowser;