rpms/devhelp/devel devhelp-0.16.1-xulrunner.patch,1.1,1.2

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16635

Modified Files:
	devhelp-0.16.1-xulrunner.patch 
Log Message:
Polished patch


devhelp-0.16.1-xulrunner.patch:

Index: devhelp-0.16.1-xulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp-0.16.1-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- devhelp-0.16.1-xulrunner.patch	22 Nov 2007 11:50:34 -0000	1.1
+++ devhelp-0.16.1-xulrunner.patch	22 Nov 2007 12:03:16 -0000	1.2
@@ -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);
+ }