Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sun Aug 09 17:01:36 2015 +0200
+++ b/Preferences/__init__.py	Sun Aug 09 17:18:21 2015 +0200
@@ -48,6 +48,9 @@
     ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
     OthersBrowserFlag, AllBrowsersFlag
 
+from Helpviewer.FlashCookieManager.FlashCookieUtilities import \
+    flashDataPathForOS
+
 
 class Prefs(object):
     """
@@ -889,6 +892,13 @@
         "PimSpecial3": "",
         "PimSpecial4": "",
         "GreaseMonkeyDisabledScripts": [],
+        # Flash Cookie Manager
+        "FlashCookiesDeleteOnStartExit": False,
+        "FlashCookieAutoRefresh": False,
+        "FlashCookieNotify": False,
+        "FlashCookiesWhitelist": [],
+        "FlashCookiesBlacklist": [],
+        "FlashCookiesDataPath": flashDataPathForOS(),
     }
     
     @classmethod
@@ -2411,13 +2421,17 @@
                  "SyncHistory", "SyncPasswords", "SyncUserAgents",
                  "SyncSpeedDial", "SyncEncryptData",
                  "SyncEncryptPasswordsOnly",
-                 "WarnOnMultipleClose", "ClickToFlashEnabled"
+                 "WarnOnMultipleClose", "ClickToFlashEnabled",
+                 "FlashCookiesDeleteOnStartExit", "FlashCookieAutoRefresh",
+                 "FlashCookieNotify",
                  ]:
         return toBool(prefClass.settings.value(
             "Help/" + key, prefClass.helpDefaults[key]))
     elif key in ["AdBlockSubscriptions", "AdBlockExceptions",
                  "ClickToFlashWhitelist", "SendRefererWhitelist",
-                 "GreaseMonkeyDisabledScripts", "NoCacheHosts"]:
+                 "GreaseMonkeyDisabledScripts", "NoCacheHosts",
+                 "FlashCookiesWhitelist", "FlashCookiesBlacklist",
+                 ]:
         return toList(prefClass.settings.value(
             "Help/" + key, prefClass.helpDefaults[key]))
     else: