[gnome-online-accounts/wip/mail: 1/5] dbus: Differentiate between STARTTLS and non-STARTTLS mail servers

[Debarshi Ray <debarshir src gnome org>]

commit 2a713409b4bddeaffdf738c082e1aaec8ea8788c
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Jan 28 21:40:47 2013 +0100

    dbus: Differentiate between STARTTLS and non-STARTTLS mail servers
    
    Secure IMAP and SMTP can be implemented using STARTTLS on a standard
    port or without it on a dedicated port. Add an extra set of properties
    to highlight this difference.
    
    The org.gnome.OnlineAccounts.Mail interface on the Google provider was
    adjusted accordingly.
    
    Fixes: https://bugzilla.gnome.org/692736

 data/dbus-interfaces.xml           |   36 +++++++++++++++++++++++++++++++-----
 src/goabackend/goagoogleprovider.c |    6 +++---
 2 files changed, 34 insertions(+), 8 deletions(-)
---
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 0cf99de..11a3d6b 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -3,7 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 
 <!--
- Copyright (C) 2011, 2012 Red Hat, Inc.
+ Copyright (C) 2011, 2012, 2013 Red Hat, Inc.
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -388,12 +388,25 @@
 
          If a port override is not given, then applications should try
          to connect to port 993 if
-         #org.gnome.OnlineAccounts.Mail:ImapUseTls is %TRUE and port
+         #org.gnome.OnlineAccounts.Mail:ImapUseSsl is %TRUE and port
          143 if not.
     -->
     <property name="ImapHost" type="s" access="read"/>
 
-    <!-- ImapUseTls: Whether TLS should be used to establish the connection. -->
+    <!-- ImapUseSsl:
+         Whether SSL should be used.
+
+         This indicates that SSL should be used on a dedicated port.
+    -->
+    <property name="ImapUseSsl" type="b" access="read"/>
+
+    <!-- ImapUseTls:
+         Whether TLS should be used.
+
+         This indicates that STARTTLS should be used on a standard port
+         after the connection has been established to obtain a secure
+         channel.
+    -->
     <property name="ImapUseTls" type="b" access="read"/>
 
     <!-- ImapUserName:
@@ -422,12 +435,25 @@
 
          If a port override is not given, then applications should try
          to connect to port 465 if
-         #org.gnome.OnlineAccounts.Mail:SmtpUseTls is %TRUE and port
+         #org.gnome.OnlineAccounts.Mail:SmtpUseSsl is %TRUE and port
          587 (or 25) if not.
     -->
     <property name="SmtpHost" type="s" access="read"/>
 
-    <!-- SmtpUseTls: Whether TLS should be used to establish the connection. -->
+    <!-- SmtpUseSsl:
+         Whether SSL should be used.
+
+         This indicates that SSL should be used on a dedicated port.
+    -->
+    <property name="SmtpUseSsl" type="b" access="read"/>
+
+    <!-- SmtpUseTls:
+         Whether TLS should be used.
+
+         This indicates that STARTTLS should be used on a standard port
+         after the connection has been established to obtain a secure
+         channel.
+    -->
     <property name="SmtpUseTls" type="b" access="read"/>
 
     <!-- SmtpUserName:
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index 666ba03..c6ab02f 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -17,8 +17,8 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: David Zeuthen <davidz redhat com>
- *         Debarshi Ray <debarshir gnome org>
+ * Authors: David Zeuthen <davidz redhat com>
+ *          Debarshi Ray <debarshir gnome org>
  */
 
 #include "config.h"
@@ -411,7 +411,7 @@ build_object (GoaProvider         *provider,
                         "imap-supported",  TRUE,
                         "imap-host",       "imap.gmail.com",
                         "imap-user-name",  email_address,
-                        "imap-use-tls",    TRUE,
+                        "imap-use-ssl",    TRUE,
                         "smtp-supported",  TRUE,
                         "smtp-host",       "smtp.gmail.com",
                         "smtp-user-name",  email_address,