Index: find.py
===================================================================
RCS file: /cvs/gnome/orca/src/orca/find.py,v
retrieving revision 1.1
diff -u -r1.1 find.py
--- find.py	30 Nov 2006 16:38:58 -0000	1.1
+++ find.py	30 Nov 2006 22:55:25 -0000
@@ -63,7 +63,7 @@
         self.windowWrap = False
         self.startAtTop = False
 
-        self.debugLevel = debug.LEVEL_FINEST
+        self.debugLevel = debug.debugLevel
 
     def debugContext(self, context, string):
         debug.println(self.debugLevel, \
@@ -202,14 +202,6 @@
                                 else:
                                     i += 1
                     if not found:
-                        ## Check to see if we've looked at all the zones on
-                        ## this line. If we have, then reset the zone, word
-                        ## and char indices, bump the line index and get the 
-                        ## next line.
-                        ##
-                        #if context.zoneIndex == (noZones-1):
-                        #    continue
-
                         # Locate the next zone to try again.
                         #
                         if self.searchBackwards:
@@ -274,10 +266,11 @@
                            originalWordIndex, originalCharIndex)
         self.debugContext(context, "after setting original")
 
-        debug.println(self.debugLevel, \
-            "findQuery: returning line=%d zone=%d word=%d char=%d" \
-                % (location.lineIndex, location.zoneIndex, \
-                   location.wordIndex, location.charIndex))
+        if location:
+            debug.println(self.debugLevel, \
+                "findQuery: returning line=%d zone=%d word=%d char=%d" \
+                    % (location.lineIndex, location.zoneIndex, \
+                       location.wordIndex, location.charIndex))
 
         return location
 
