[polari/gnome-3-20] connections: Always set port when SSL is enabled
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari/gnome-3-20] connections: Always set port when SSL is enabled
- Date: Thu, 6 Oct 2016 00:17:45 +0000 (UTC)
commit a069d055cc9f0c41b72d57b72643127641a1c38a
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Sep 9 02:08:26 2016 +0200
connections: Always set port when SSL is enabled
At least for now telepathy-idle does not consider the 'use-ssl'
parameter for picking a default port, so include it even when
not explicitly specified to make sure it is not accidentally
removed.
https://bugzilla.gnome.org/show_bug.cgi?id=771217
src/connections.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/connections.js b/src/connections.js
index 577f54a..b64cba8 100644
--- a/src/connections.js
+++ b/src/connections.js
@@ -263,12 +263,14 @@ const ConnectionDetails = new Lang.Class({
account: this._nickEntry.text.trim()
};
- if (port)
- params.port = port;
if (this._realnameEntry.text)
params.fullname = this._realnameEntry.text.trim();
if (this._sslCheckbox.active)
params.use_ssl = true;
+ if (port)
+ params.port = port;
+ else if (params.use_ssl)
+ params.port = DEFAULT_SSL_PORT;
return params;
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]