Mercurial Repositories > eric / file diff

diff -r 43d42a54cf50 -r 3ef014765648 UI/EmailDialog.py
--- a/UI/EmailDialog.py	Wed Jan 25 11:17:04 2017 +0100
+++ b/UI/EmailDialog.py	Wed Jan 25 12:48:42 2017 +0100
@@ -281,10 +281,17 @@
         @return flag indicating success (boolean)
         """
         try:
-            server = smtplib.SMTP(Preferences.getUser("MailServer"),
-                                  Preferences.getUser("MailServerPort"))
-            if Preferences.getUser("MailServerUseTLS"):
-                server.starttls()
+            encryption = Preferences.getUser("MailServerEncryption")
+            if encryption == "SSL":
+                server = smtplib.SMTP_SSL(
+                    Preferences.getUser("MailServer"),
+                    Preferences.getUser("MailServerPort"))
+            else:
+                server = smtplib.SMTP(
+                    Preferences.getUser("MailServer"),
+                    Preferences.getUser("MailServerPort"))
+                if encryption == "TLS":
+                    server.starttls()
             if Preferences.getUser("MailServerAuthentication"):
                 # mail server needs authentication
                 password = Preferences.getUser("MailServerPassword")