diff -r 572a009369f0 -r 23b45a742e17 Helpviewer/AdBlock/AdBlockManager.py
--- a/Helpviewer/AdBlock/AdBlockManager.py Fri Jan 08 19:14:19 2010 +0000
+++ b/Helpviewer/AdBlock/AdBlockManager.py Sat Jan 09 19:43:36 2010 +0000
@@ -190,7 +190,7 @@
if not self.__loaded:
return
- Preferences.setHelp("AdBlockEnabled", int(self.__enabled))
+ Preferences.setHelp("AdBlockEnabled", self.__enabled)
subscriptions = []
for subscription in self.__subscriptions:
if subscription is None:
@@ -208,7 +208,7 @@
self.__loaded = True
- self.__enabled = bool(Preferences.getHelp("AdBlockEnabled"))
+ self.__enabled = Preferences.getHelp("AdBlockEnabled")
defaultSubscriptions = []
defaultSubscriptions.append(
@@ -220,7 +220,7 @@
if len(subscriptions) == 0:
subscriptions = defaultSubscriptions
for subscription in subscriptions:
- url = QUrl.fromEncoded(subscription)
+ url = QUrl.fromEncoded(subscription.encode())
adBlockSubscription = AdBlockSubscription(url, self)
self.connect(adBlockSubscription, SIGNAL("rulesChanged()"),
self, SIGNAL("rulesChanged()"))
