Helpviewer/AdBlock/AdBlockManager.py

branch
5_1_x
changeset 957
ff469c60f5fe
parent 791
9ec2ac20e54e
child 1510
e75ecf2bd9dd
diff -r 377efd9104a7 -r ff469c60f5fe Helpviewer/AdBlock/AdBlockManager.py
--- a/Helpviewer/AdBlock/AdBlockManager.py	Mon Mar 21 20:03:40 2011 +0100
+++ b/Helpviewer/AdBlock/AdBlockManager.py	Sat Mar 26 12:52:15 2011 +0100
@@ -219,18 +219,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