Bug 1606679 follow-up - Fix linting errors. rs=lint-only
authorGeoff Lankow <geoff@darktrojan.net>
Fri, 03 Jan 2020 11:27:12 +1300
changeset 36981 c39faa95a2606fbebc561272cf483300db8c9ce8
parent 36980 ab910e13ceac6ee5812ffbf4541247d8453046bc
child 36982 1f8ec0da7271b230c9e4a088207e275bfa92a6f1
push id2543
push userclokep@gmail.com
push dateMon, 06 Jan 2020 23:26:40 +0000
treeherdercomm-beta@323890d47ddf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslint-only
bugs1606679
Bug 1606679 follow-up - Fix linting errors. rs=lint-only
mail/base/modules/MailMigrator.jsm
--- a/mail/base/modules/MailMigrator.jsm
+++ b/mail/base/modules/MailMigrator.jsm
@@ -435,23 +435,35 @@ var MailMigrator = {
           );
         }
       }
 
       if (currentUIVersion < 18) {
         // Clear socks proxy values if they were shared from http, to prevent
         // websocket breakage after bug 1577862 (see bug 1606679).
         if (
-          Services.prefs.getBoolPref("network.proxy.share_proxy_settings", false) &&
+          Services.prefs.getBoolPref(
+            "network.proxy.share_proxy_settings",
+            false
+          ) &&
           Services.prefs.getIntPref("network.proxy.type", 0) == 1
         ) {
           let httpProxy = Services.prefs.getCharPref("network.proxy.http", "");
-          let httpPort = Services.prefs.getIntPref("network.proxy.http_port", 0);
-          let socksProxy = Services.prefs.getCharPref("network.proxy.socks", "");
-          let socksPort = Services.prefs.getIntPref("network.proxy.socks_port", 0);
+          let httpPort = Services.prefs.getIntPref(
+            "network.proxy.http_port",
+            0
+          );
+          let socksProxy = Services.prefs.getCharPref(
+            "network.proxy.socks",
+            ""
+          );
+          let socksPort = Services.prefs.getIntPref(
+            "network.proxy.socks_port",
+            0
+          );
           if (httpProxy && httpProxy == socksProxy && httpPort == socksPort) {
             Services.prefs.setCharPref(
               "network.proxy.socks",
               Services.prefs.getCharPref("network.proxy.backup.socks", "")
             );
             Services.prefs.setIntPref(
               "network.proxy.socks_port",
               Services.prefs.getIntPref("network.proxy.backup.socks_port", 0)