diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-26 17:57:13 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-26 17:57:13 +0800 |
| commit | 6b104de6536863409d853f1822075ff1393618c4 (patch) | |
| tree | a4e2805f02189fcc7cc619d88778272f39d7808e /mail/em-account-editor.c | |
| parent | bd149b27954af20cf3f860164486191b0e879e89 (diff) | |
| parent | 251b734a8573a1d6b04d2b82ce1f0be9fe9662ab (diff) | |
| download | gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.tar.gz gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.tar.zst gsoc2013-evolution-6b104de6536863409d853f1822075ff1393618c4.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/em-account-editor.c')
| -rw-r--r-- | mail/em-account-editor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 054518ce36..49a6798415 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2097,18 +2097,18 @@ emae_check_authtype (GtkWidget *w, url_string = (gchar *) e_account_get_string ( account, emae_service_info[service->type].account_uri_key); url = camel_url_new (url_string, NULL); - if (service->settings) - camel_settings_save_to_url (service->settings, url); - url_string = camel_url_to_string (url, 0); - camel_url_free (url); /* to test on actual data, not on previously used */ camel_service = camel_session_add_service ( CAMEL_SESSION (session), uid, - url_string, service->type, &error); + url->protocol, service->type, &error); - g_free (uid); + camel_url_free (url); g_free (url_string); + g_free (uid); + + if (camel_service != NULL && service->settings != NULL) + camel_service_set_settings (camel_service, service->settings); if (editor != NULL) parent = gtk_widget_get_toplevel (editor); |