Helpviewer/AdBlock/AdBlockManager.py

changeset 956
f3e1500da1df
parent 945
8cd4d08fa9f6
child 992
566e87428fc8
diff -r a096fdc38f71 -r f3e1500da1df Helpviewer/AdBlock/AdBlockManager.py
--- a/Helpviewer/AdBlock/AdBlockManager.py	Mon Mar 21 20:03:13 2011 +0100
+++ b/Helpviewer/AdBlock/AdBlockManager.py	Sat Mar 26 12:51:13 2011 +0100
@@ -220,18 +220,20 @@
         if self.__subscriptionsLoaded:
             return
         
+        defaultSubscriptionUrl = \
+            "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList"
         defaultSubscriptions = []
         defaultSubscriptions.append(
             bytes(self.__customSubscriptionUrl().toEncoded()).decode())
-        defaultSubscriptions.append(
-            "abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList")
+        defaultSubscriptions.append(defaultSubscriptionUrl)
         
         subscriptions = Preferences.getHelp("AdBlockSubscriptions")
         if len(subscriptions) == 0:
             subscriptions = defaultSubscriptions
         for subscription in subscriptions:
             url = QUrl.fromEncoded(subscription.encode())
-            adBlockSubscription = AdBlockSubscription(url, self)
+            adBlockSubscription = AdBlockSubscription(url, self, 
+                subscription == defaultSubscriptionUrl)
             adBlockSubscription.rulesChanged.connect(self.rulesChanged)
             adBlockSubscription.changed.connect(self.rulesChanged)
             self.__subscriptions.append(adBlockSubscription)

eric ide

mercurial