← Back to branch summary

~ubuntu-branches/ubuntu/precise/evolution/precise

« back to all changes in this revision

Viewing changes to modules/online-accounts/e-online-accounts-google.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-09-08 09:38:57 UTC
  • mfrom: (1.1.84 upstream)
  • Revision ID: package-import@ubuntu.com-20110908093857-6lfl04ke2ns3kx2o
Tags: 3.1.91-0ubuntu1
https://launchpad.net/bugs/843769
* New upstream release. (LP: #843769)
* debian/control: bump e-d-s Build-Depends to 3.1.91. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/online-accounts/e-online-accounts-google.c
192
192
 
193
193
        /* Always == SSL (port 993) */
194
194
        if (goa_mail_get_imap_use_tls (goa_mail))
195
 
                camel_url_set_param (url, "use_ssl", "always");
 
195
                string = "ssl-on-alternate-port";
196
196
        else
197
 
                camel_url_set_param (url, "use_ssl", "never");
 
197
                string = "none";
 
198
        camel_url_set_param (url, "security-method", string);
198
199
 
199
200
        string = goa_account_get_id (goa_account);
200
201
        camel_url_set_param (url, GOA_KEY, string);
228
229
 
229
230
        /* When-Possible == STARTTLS */
230
231
        if (goa_mail_get_smtp_use_tls (goa_mail))
231
 
                camel_url_set_param (url, "use_ssl", "when-possible");
 
232
                string = "starttls-on-standard-port";
232
233
        else
233
 
                camel_url_set_param (url, "use_ssl", "never");
 
234
                string = "none";
 
235
        camel_url_set_param (url, "security-method", string);
234
236
 
235
237
        string = goa_account_get_id (goa_account);
236
238
        camel_url_set_param (url, GOA_KEY, string);