Mercurial Repositories > eric / file diff

--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Thu Jan 07 15:22:29 2010 +0000
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Thu Jan 07 19:03:58 2010 +0000
@@ -79,7 +79,7 @@
         result = result.replace("{inputEncoding}", "UTF-8")
         result = result.replace("{outputEncoding}", "UTF-8")
         result = result.replace("{searchTerms}", 
-                                str(QUrl.toPercentEncoding(searchTerm)))
+                                bytes(QUrl.toPercentEncoding(searchTerm)).decode())
         result = re.sub(r"""\{([^\}]*:|)source\??\}""", Program, result)
 
         return result
@@ -408,7 +408,8 @@
             return
         
         if self.__suggestionsReply is not None:
-            self.__suggestionsReply.disconnect(self)
+            self.disconnect(self.__suggestionsReply, SIGNAL("finished()"), 
+                            self.__suggestionsObtained)
             self.__suggestionsReply.abort()
             self.__suggestionsReply = None