rpms/devhelp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Polished patch

Browse Source
This commit is contained in:
Martin Stransky 2007-11-22 12:03:16 +00:00
parent 61e03a2961
commit d337ba212c
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
devhelp-0.16.1-xulrunner.patch
View File

@ -1,20 +1,30 @@
diff -up devhelp-0.16.1/src/Yelper.cpp.xl devhelp-0.16.1/src/Yelper.cpp
--- devhelp-0.16.1/src/Yelper.cpp.xl 2007-05-28 09:42:20.000000000 +0200
+++ devhelp-0.16.1/src/Yelper.cpp 2007-11-22 12:44:11.000000000 +0100
@@ -41,7 +41,7 @@
+++ devhelp-0.16.1/src/Yelper.cpp 2007-11-22 13:00:28.000000000 +0100
@@ -41,7 +41,9 @@
#include <nsIDOMWindow.h>
#include <nsIInterfaceRequestorUtils.h>
#include <nsIPrefService.h>
-#include <nsIPrintSettings.h>
+//#include <nsIPrintSettings.h>
+#ifndef HAVE_GECKO_1_9
#include <nsIPrintSettings.h>
+#endif
#include <nsISelectionController.h>
#include <nsITypeAheadFind.h>
#include <nsIWebBrowser.h>
@@ -172,7 +172,6 @@ Yelper::Find (const char *aSearchString)
#ifdef HAVE_GECKO_1_9
@@ -169,16 +171,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? */,
- mHasFocus,
&found);
#else
rv = mFinder->Find (NS_ConvertUTF8toUTF16 (aSearchString),
-#endif
return NS_SUCCEEDED (rv) && (found == nsITypeAheadFind::FIND_FOUND || found == nsITypeAheadFind::FIND_WRAPPED);
}