summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-19 14:40:01 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-19 14:40:01 +0100
commit71d8ada4a9335075014f41798fa1684be6c148d9 (patch)
treeafa51cb6829c266341496b614d1a03afa378d3f3
parente0baeba546f8f45bc1ec981a60b615a28f4142af (diff)
parent22198ec1941581b09dc4b3f76702a6b744eab818 (diff)
downloaduxp-71d8ada4a9335075014f41798fa1684be6c148d9.tar.gz
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
-rw-r--r--mailnews/base/prefs/content/aw-incoming.js5
-rw-r--r--mailnews/mailnews.js4
-rw-r--r--modules/libpref/Preferences.cpp12
-rw-r--r--modules/libpref/goanna.js (renamed from modules/libpref/greprefs.js)0
-rw-r--r--modules/libpref/moz.build4
-rw-r--r--python/mozbuild/mozpack/packager/formats.py2
-rw-r--r--python/mozbuild/mozpack/test/test_packager_formats.py4
-rw-r--r--toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js2
8 files changed, 17 insertions, 16 deletions
diff --git a/mailnews/base/prefs/content/aw-incoming.js b/mailnews/base/prefs/content/aw-incoming.js
index fcc063fedb..5ea0c77ae4 100644
--- a/mailnews/base/prefs/content/aw-incoming.js
+++ b/mailnews/base/prefs/content/aw-incoming.js
@@ -158,7 +158,10 @@ function setServerType()
var serverType = document.getElementById("servertype").value;
var deferStorageBox = document.getElementById("deferStorageBox");
var leaveMessages = document.getElementById("leaveMsgsOnSrvrBox");
- var port = serverType == "pop3" ? 110 : 143;
+
+ // pop3 110 (unsecure) 995 (SSL)
+ // imap 143 (unsecure) 993 (SSL)
+ var port = serverType == "pop3" ? 995 : 993;
document.getElementById("serverPort").value = port;
document.getElementById("defaultPortValue").value = port;
diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
index 705a0a08ad..7ebe2eaa7f 100644
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -450,7 +450,7 @@ pref("mail.server.default.valid", true);
pref("mail.server.default.abbreviate", true);
pref("mail.server.default.isSecure", false);
pref("mail.server.default.authMethod", 3); // cleartext password. @see nsIMsgIncomingServer.authMethod.
-pref("mail.server.default.socketType", 0); // @see nsIMsgIncomingServer.socketType
+pref("mail.server.default.socketType", 3); // SSL/TLS. @see nsIMsgIncomingServer.socketType
pref("mail.server.default.override_namespaces", true);
pref("mail.server.default.deferred_to_account", "");
@@ -579,7 +579,7 @@ pref("mail.smtp.useMatchingDomainServer", false);
pref("mail.smtp.useMatchingHostNameServer", false);
pref("mail.smtpserver.default.authMethod", 3); // cleartext password. @see nsIMsgIncomingServer.authMethod.
-pref("mail.smtpserver.default.try_ssl", 0); // @see nsISmtpServer.socketType
+pref("mail.smtpserver.default.try_ssl", 3); // SSL/TLS. @see nsISmtpServer.socketType
// For the next 3 prefs, see <http://www.bucksch.org/1/projects/mozilla/16507>
pref("mail.display_glyph", true); // TXT->HTML :-) etc. in viewer
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index 19487704f5..840406635a 100644
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -1229,10 +1229,10 @@ static nsresult pref_InitInitialObjects()
nsresult rv;
// In omni.jar case, we load the following prefs:
- // - jar:$gre/omni.jar!/greprefs.js
+ // - jar:$gre/omni.jar!/goanna.js
// - jar:$gre/omni.jar!/defaults/pref/*.js
// In non omni.jar case, we load:
- // - $gre/greprefs.js
+ // - $gre/goanna.js
//
// In both cases, we also load:
// - $gre/defaults/pref/*.js
@@ -1259,8 +1259,8 @@ static nsresult pref_InitInitialObjects()
RefPtr<nsZipArchive> jarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE);
if (jarReader) {
- // Load jar:$gre/omni.jar!/greprefs.js
- rv = pref_ReadPrefFromJar(jarReader, "greprefs.js");
+ // Load jar:$gre/omni.jar!/goanna.js
+ rv = pref_ReadPrefFromJar(jarReader, "goanna.js");
NS_ENSURE_SUCCESS(rv, rv);
// Load jar:$gre/omni.jar!/defaults/pref/*.js
@@ -1279,12 +1279,12 @@ static nsresult pref_InitInitialObjects()
NS_WARNING("Error parsing preferences.");
}
} else {
- // Load $gre/greprefs.js
+ // Load $gre/goanna.js
nsCOMPtr<nsIFile> greprefsFile;
rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile));
NS_ENSURE_SUCCESS(rv, rv);
- rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("greprefs.js"));
+ rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("goanna.js"));
NS_ENSURE_SUCCESS(rv, rv);
rv = openPrefFile(greprefsFile);
diff --git a/modules/libpref/greprefs.js b/modules/libpref/goanna.js
index d59110b6a6..d59110b6a6 100644
--- a/modules/libpref/greprefs.js
+++ b/modules/libpref/goanna.js
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
index 1c2c13e69a..1c9a51650b 100644
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -43,6 +43,4 @@ FINAL_LIBRARY = 'xul'
DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
-FINAL_TARGET_PP_FILES += [
- 'greprefs.js',
-]
+FINAL_TARGET_PP_FILES += ['goanna.js']
diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py
index c4adabab03..cedd1998bb 100644
--- a/python/mozbuild/mozpack/packager/formats.py
+++ b/python/mozbuild/mozpack/packager/formats.py
@@ -318,7 +318,7 @@ class OmniJarSubFormatter(PiecemealFormatter):
path[1] in ['pref', 'preferences'])
return path[0] in [
'modules',
- 'greprefs.js',
+ 'goanna.js',
'hyphenation',
'update.locale',
] or path[0] in STARTUP_CACHE_PATHS
diff --git a/python/mozbuild/mozpack/test/test_packager_formats.py b/python/mozbuild/mozpack/test/test_packager_formats.py
index 1af4336b25..66a7cc8e6e 100644
--- a/python/mozbuild/mozpack/test/test_packager_formats.py
+++ b/python/mozbuild/mozpack/test/test_packager_formats.py
@@ -405,13 +405,13 @@ class TestFormatters(unittest.TestCase):
self.assertFalse(
is_resource(base, 'defaults/preferences/channel-prefs.js'))
self.assertTrue(is_resource(base, 'modules/foo.jsm'))
- self.assertTrue(is_resource(base, 'greprefs.js'))
+ self.assertTrue(is_resource(base, 'goanna.js'))
self.assertTrue(is_resource(base, 'hyphenation/foo'))
self.assertTrue(is_resource(base, 'update.locale'))
self.assertTrue(
is_resource(base, 'jsloader/resource/gre/modules/foo.jsm'))
self.assertFalse(is_resource(base, 'foo'))
- self.assertFalse(is_resource(base, 'foo/bar/greprefs.js'))
+ self.assertFalse(is_resource(base, 'foo/bar/goanna.js'))
self.assertTrue(is_resource(base, 'defaults/messenger/foo.dat'))
self.assertFalse(
is_resource(base, 'defaults/messenger/mailViews.dat'))
diff --git a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
index ada08f0aeb..9a9610ddac 100644
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -839,7 +839,7 @@ function setupTestCommon() {
if (!grePrefsFile.exists()) {
grePrefsFile.create(Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
}
- grePrefsFile.append("greprefs.js");
+ grePrefsFile.append("goanna.js");
if (!grePrefsFile.exists()) {
grePrefsFile.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, PERMS_FILE);
}