[Xfce4-commits] <postler:master> Support secure SMTP via port 465

[Christian Dywan]

Updating branch refs/heads/master
         to b3f882d7ce6908597f22e5b74e40b9d0419b9475 (commit)
       from 8bd267e471124dfb4dd5a523e8544e97b60f8950 (commit)

commit b3f882d7ce6908597f22e5b74e40b9d0419b9475
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Mar 1 13:39:23 2011 +0100

    Support secure SMTP via port 465
    
    Also mention the different methods in the advanced
    account details. And suggest the port in error messages.
    
    Fixes: https://bugs.edge.launchpad.net/postler/+bug/726038

 postler/postler-accounts.vala     |    2 ++
 postler/postler-accountsetup.vala |    2 ++
 postler/postler-service.vala      |    7 ++++++-
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 1db3d75..dea3a61 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -518,6 +518,8 @@ public class Postler.Accounts : GLib.Object {
                 tls_options = "tls_trust_file %s\ntls_trust_file %s".printf (
                     certificate_file,
                     certificate != null ? certificate : certificate_file);
+            if (info.send_port == 465)
+                tls_options += "\ntls_starttls off"; /* SMTPS */
             string msmtprc = """
                 defaults
                 auth on
diff --git a/postler/postler-accountsetup.vala b/postler/postler-accountsetup.vala
index b042a84..74d25ca 100644
--- a/postler/postler-accountsetup.vala
+++ b/postler/postler-accountsetup.vala
@@ -137,6 +137,8 @@ public class Postler.AccountWidget : Gtk.VBox {
         if (info.send_port != 0)
             sender_port.set_text (info.send_port.to_string ());
         add_label_entry (_("Sen_ding Port:"), sender_port, true);
+        advanced_area.pack_start (new Gtk.Label (
+            _("STARTTLS is used by default, use port 465 for secure SMTP.")), false, false, 4);
         if (info.address != null)
             set_servers_from_address ();
         content_area.show_all ();
diff --git a/postler/postler-service.vala b/postler/postler-service.vala
index 8fa4005..1df0f4f 100644
--- a/postler/postler-service.vala
+++ b/postler/postler-service.vala
@@ -358,7 +358,12 @@ namespace Postler {
                             else if ("Connection timed out" in line) {
                                 helper.finnish (
                                     _("It is taking too long for the server to respond.") + "\n"
-                                  + _("Try changing the port to 26 or 587."));
+                                  + _("Try changing the port to 25, 26, 587 or 465."));
+                            }
+                            else if ("Connection refused" in line) {
+                                helper.finnish (
+                                    _("The server rejected the connection.") + "\n"
+                                  + _("Try changing the port to 25, 26, 587 or 465."));
                             }
                             else if (is_error)
                                 helper.finnish (line);