Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/__init__.py	Sun Aug 23 11:08:41 2020 +0200
+++ b/eric6/Preferences/__init__.py	Sun Aug 23 14:40:12 2020 +0200
@@ -979,7 +979,7 @@
         "FlashCookiesWhitelist": [],
         "FlashCookiesBlacklist": [],
         "FlashCookiesDataPath": flashDataPathForOS(),
-        # PIM:                  identical to helpDefaults
+        # PIM:
         "PimFullName": "",
         "PimFirstName": "",
         "PimLastName": "",
@@ -2742,7 +2742,7 @@
         value = int(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
         if QWebEngineSettings is None:
-            value = prefClass.helpDefaults[key]
+            value = prefClass.webBrowserDefaults[key]
         return value
     elif key in ["StartupBehavior", "HistoryLimit",
                  "DownloadManagerRemovePolicy", "SyncType", "SyncFtpPort",
@@ -3716,16 +3716,6 @@
         )
     for key in ["SyncFtpPassword", "SyncEncryptionKey"]:
         prefClass.settings.setValue(
-            "Help/" + key,
-            pwRecode(
-                prefClass.settings.value("Help/" + key,
-                                         prefClass.helpDefaults[key]),
-                oldPassword,
-                newPassword
-            )
-        )
-    for key in ["SyncFtpPassword", "SyncEncryptionKey"]:
-        prefClass.settings.setValue(
             "WebBrowser/" + key,
             pwRecode(
                 prefClass.settings.value("WebBrowser/" + key,