Mercurial Repositories > eric / file diff

--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Mon Mar 21 20:03:13 2011 +0100
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Sat Mar 26 12:51:13 2011 +0100
@@ -31,18 +31,20 @@
     changed = pyqtSignal()
     rulesChanged = pyqtSignal()
     
-    def __init__(self, url, parent=None):
+    def __init__(self, url, parent=None, default=False):
         """
         Constructor
         
         @param url AdBlock URL for the subscription (QUrl)
         @param parent reference to the parent object (QObject)
+        @param default flag indicating a default subscription (Boolean)
         """
         QObject.__init__(self, parent)
         
         self.__url = url.toEncoded()
         self.__enabled = False
         self.__downloading = None
+        self.__defaultSubscription = default
         
         self.__title = ""
         self.__location = QByteArray()
@@ -262,10 +264,15 @@
         self.__downloading = None
         
         if reply.error() != QNetworkReply.NoError:
-            E5MessageBox.warning(None,
-                self.trUtf8("Downloading subscription rules"),
-                self.trUtf8("""<p>Subscription rules could not be downloaded.</p>"""
-                            """<p>Error: {0}</p>""").format(reply.errorString()))
+            if not self.__defaultSubscription:
+                # don't show error if we try to load the default
+                E5MessageBox.warning(None,
+                    self.trUtf8("Downloading subscription rules"),
+                    self.trUtf8("""<p>Subscription rules could not be downloaded.</p>"""
+                                """<p>Error: {0}</p>""").format(reply.errorString()))
+            else:
+                # reset after first download attempt
+                self.__defaultSubscription = False
             return
         
         if redirect.isValid():