Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Tue Feb 21 17:19:21 2012 +0100
+++ b/Preferences/__init__.py	Wed Feb 22 09:20:53 2012 +0100
@@ -664,6 +664,8 @@
         "SyncFtpPort": 21,
         "SyncFtpIdleTimeout": 30,
         "WarnOnMultipleClose": True,
+        "ClickToFlashEnabled": False,
+        "ClickToFlashWhitelist": [],
     }
     
     websettings = QWebSettings.globalSettings()
@@ -2043,11 +2045,11 @@
                  "LocalContentCanAccessRemoteUrls", "LocalContentCanAccessFileUrls",
                  "XSSAuditingEnabled", "SiteSpecificQuirksEnabled", "SyncEnabled",
                  "SyncBookmarks", "SyncHistory", "SyncPasswords", "SyncUserAgents",
-                 "WarnOnMultipleClose"
+                 "WarnOnMultipleClose", "ClickToFlashEnabled"
                 ]:
         return toBool(prefClass.settings.value("Help/" + key,
             prefClass.helpDefaults[key]))
-    elif key in ["AdBlockSubscriptions"]:
+    elif key in ["AdBlockSubscriptions", "ClickToFlashWhitelist"]:
         return toList(prefClass.settings.value("Help/" + key,
             prefClass.helpDefaults[key]))
     else: