[Xfce4-commits] <postler:master> Honor unverified flag for sending messages

[Christian Dywan]

Updating branch refs/heads/master
         to f9c3bf588580adabed288a00fca95b932afbdee3 (commit)
       from 9b20a405b86db3ac847c2edeaa35a6d2bf328490 (commit)

commit f9c3bf588580adabed288a00fca95b932afbdee3
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Feb 16 01:55:11 2011 +0100

    Honor unverified flag for sending messages

 postler/postler-accounts.vala |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 6dc4634..c6d0464 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -461,12 +461,18 @@ public class Postler.Accounts : GLib.Object {
         }
 
         if (send != null) {
+            string tls_options;
+            if (info.unverified)
+                tls_options = "tls_certcheck off";
+            else
+                tls_options = "tls_trust_file %s\ntls_trust_file %s".printf (
+                    certificate_file,
+                    certificate != null ? certificate : certificate_file);
             string msmtprc = """
                 defaults
                 auth on
                 tls on
-                tls_trust_file %s
-                tls_trust_file %s
+                %s
                 auto_from on
                 maildomain %s
                 account postler
@@ -477,8 +483,7 @@ public class Postler.Accounts : GLib.Object {
                 account default : postler
                 """.
                 printf (
-                    certificate_file,
-                    certificate != null ? certificate : certificate_file,
+                    tls_options,
                     info.address.split (",")[0].split ("@")[1],
                     info.send,
                     info.address.split (",")[0],