[geary/geary-0.11] Fix EHLO message by adding IPv6 prefix when local address is an IPv6 address

[Michael Gratton <mjog src gnome org>]

commit c35e8837e67d4607775b53af212521886401d1dd
Author: Gautier Pelloux-Prayer <gautier+git damsy net>
Date:   Wed Jan 4 19:08:17 2017 +0100

    Fix EHLO message by adding IPv6 prefix when local address is an IPv6 address

 .../imap/transport/imap-client-connection.vala     |    2 +-
 src/engine/smtp/smtp-client-connection.vala        |    2 +-
 src/engine/smtp/smtp-request.vala                  |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/engine/imap/transport/imap-client-connection.vala 
b/src/engine/imap/transport/imap-client-connection.vala
index b61b38e..f6978ef 100644
--- a/src/engine/imap/transport/imap-client-connection.vala
+++ b/src/engine/imap/transport/imap-client-connection.vala
@@ -324,7 +324,7 @@ public class Geary.Imap.ClientConnection : BaseObject {
         try {
             return cx.get_local_address();
         } catch (Error err) {
-            debug("Unable to retrieve remote address: %s", err.message);
+            debug("Unable to retrieve local address: %s", err.message);
         }
         
         return null;
diff --git a/src/engine/smtp/smtp-client-connection.vala b/src/engine/smtp/smtp-client-connection.vala
index 047994a..71cab8f 100644
--- a/src/engine/smtp/smtp-client-connection.vala
+++ b/src/engine/smtp/smtp-client-connection.vala
@@ -191,7 +191,7 @@ public class Geary.Smtp.ClientConnection {
     
     /**
      * Sends the appropriate HELO/EHLO command and returns the response of the one that worked.
-     * Also saves the server's capabilities in the capabilties property (overwriting any that may
+     * Also saves the server's capabilities in the capabilities property (overwriting any that may
      * already be present).
      */
     public async Response say_hello_async(Cancellable? cancellable) throws Error {
diff --git a/src/engine/smtp/smtp-request.vala b/src/engine/smtp/smtp-request.vala
index 38aa70a..a98cf53 100644
--- a/src/engine/smtp/smtp-request.vala
+++ b/src/engine/smtp/smtp-request.vala
@@ -51,7 +51,8 @@ public class Geary.Smtp.EhloRequest : Geary.Smtp.Request {
     }
     
     public EhloRequest.for_local_address(InetAddress local_addr) {
-        this ("[%s]".printf(local_addr.to_string()));
+        string prefix = (local_addr.family == SocketFamily.IPV6) ? "IPv6:" : "";
+        this ("[%s%s]".printf(prefix, local_addr.to_string()));
     }
 }