[Xfce4-commits] <postler:master> Set timeout of 90 seconds and suggest other ports

[Christian Dywan]

Updating branch refs/heads/master
         to 2700ee0b990683a2867b89b82092a15701cbb3fc (commit)
       from f102bdba9508d3dbfc292b86c6af0a6409e34599 (commit)

commit 2700ee0b990683a2867b89b82092a15701cbb3fc
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Feb 28 02:05:55 2011 +0100

    Set timeout of 90 seconds and suggest other ports

 postler/postler-accounts.vala |    1 +
 postler/postler-service.vala  |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 341a626..8b01d6d 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -527,6 +527,7 @@ public class Postler.Accounts : GLib.Object {
                 user %s
                 password %s
                 port %d
+                timeout 90
                 account default : postler
                 """.
                 printf (
diff --git a/postler/postler-service.vala b/postler/postler-service.vala
index d17767e..8fa4005 100644
--- a/postler/postler-service.vala
+++ b/postler/postler-service.vala
@@ -355,6 +355,11 @@ namespace Postler {
                         helper.line_read.connect ((line, is_error) => {
                             if ("TLS certificate verification failed" in line)
                                 helper.finnish (_("Can't verify mail server authenticity."));
+                            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."));
+                            }
                             else if (is_error)
                                 helper.finnish (line);
                         });