Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sun Feb 21 19:54:14 2016 +0100
+++ b/Preferences/__init__.py	Mon Feb 22 19:57:58 2016 +0100
@@ -1026,6 +1026,8 @@
                                     # search engine name)
         "SearchLanguage": QLocale().language(),
         "RssFeeds": [],
+        # Grease Monkey
+        "GreaseMonkeyDisabledScripts": [],
         # Flash Cookie Manager: identical to helpDefaults
         # PIM:                  identical to helpDefaults
         # VirusTotal:           identical to helpDefaults
@@ -2767,9 +2769,10 @@
 ##                 "ClickToFlashWhitelist", "SendRefererWhitelist",
 ##                 "GreaseMonkeyDisabledScripts", "NoCacheHosts",
 ##                 "FlashCookiesWhitelist", "FlashCookiesBlacklist",
-##                 ]:
-##        return toList(prefClass.settings.value(
-##            "WebBrowser/" + key, prefClass.helpDefaults[key]))
+    elif key in ["GreaseMonkeyDisabledScripts",
+                 ]:
+        return toList(prefClass.settings.value(
+            "WebBrowser/" + key, prefClass.helpDefaults[key]))
     else:
         return prefClass.settings.value("WebBrowser/" + key,
                                         prefClass.webBrowserDefaults[key])