|
 |
5e6360 |
diff -up evolution-data-server-3.12.11/modules/gnome-online-accounts/module-gnome-online-accounts.c.goa-preserve-ews-host evolution-data-server-3.12.11/modules/gnome-online-accounts/module-gnome-online-accounts.c
|
|
|
5e6360 |
--- evolution-data-server-3.12.11/modules/gnome-online-accounts/module-gnome-online-accounts.c.goa-preserve-ews-host 2015-06-09 19:10:07.444489836 +0200
|
|
|
5e6360 |
+++ evolution-data-server-3.12.11/modules/gnome-online-accounts/module-gnome-online-accounts.c 2015-06-09 19:10:07.473489834 +0200
|
|
|
5e6360 |
@@ -265,24 +265,6 @@ gnome_online_accounts_new_source (EGnome
|
|
|
5e6360 |
}
|
|
|
5e6360 |
|
|
|
5e6360 |
static void
|
|
|
5e6360 |
-replace_host (gchar **url,
|
|
|
5e6360 |
- const gchar *host)
|
|
|
5e6360 |
-{
|
|
|
5e6360 |
- SoupURI *uri;
|
|
|
5e6360 |
-
|
|
|
5e6360 |
- uri = soup_uri_new (*url);
|
|
|
5e6360 |
- if (!uri)
|
|
|
5e6360 |
- return;
|
|
|
5e6360 |
-
|
|
|
5e6360 |
- soup_uri_set_host (uri, host);
|
|
|
5e6360 |
-
|
|
|
5e6360 |
- g_free (*url);
|
|
|
5e6360 |
- *url = soup_uri_to_string (uri, FALSE);
|
|
|
5e6360 |
-
|
|
|
5e6360 |
- soup_uri_free (uri);
|
|
|
5e6360 |
-}
|
|
|
5e6360 |
-
|
|
|
5e6360 |
-static void
|
|
|
5e6360 |
gnome_online_accounts_config_exchange (EGnomeOnlineAccounts *extension,
|
|
|
5e6360 |
ESource *source,
|
|
|
5e6360 |
GoaObject *goa_object)
|
|
|
5e6360 |
@@ -347,17 +329,14 @@ gnome_online_accounts_config_exchange (E
|
|
|
5e6360 |
if (source_extension != NULL) {
|
|
|
5e6360 |
GoaAccount *goa_account;
|
|
|
5e6360 |
CamelSettings *settings;
|
|
|
5e6360 |
- gchar *host, *user, *email;
|
|
|
5e6360 |
+ SoupURI *suri;
|
|
|
5e6360 |
+ gchar *user, *email;
|
|
|
5e6360 |
|
|
|
5e6360 |
goa_account = goa_object_peek_account (goa_object);
|
|
|
5e6360 |
- host = goa_exchange_dup_host (goa_exchange);
|
|
|
5e6360 |
user = goa_account_dup_identity (goa_account);
|
|
|
5e6360 |
email = goa_account_dup_presentation_identity (goa_account);
|
|
|
5e6360 |
|
|
|
5e6360 |
- if (host && *host) {
|
|
|
5e6360 |
- replace_host (&as_url, host);
|
|
|
5e6360 |
- replace_host (&oab_url, host);
|
|
|
5e6360 |
- }
|
|
|
5e6360 |
+ suri = soup_uri_new (as_url);
|
|
|
5e6360 |
|
|
|
5e6360 |
g_object_set (
|
|
|
5e6360 |
source_extension,
|
|
|
5e6360 |
@@ -371,12 +350,12 @@ gnome_online_accounts_config_exchange (E
|
|
|
5e6360 |
|
|
|
5e6360 |
g_object_set (
|
|
|
5e6360 |
settings,
|
|
|
5e6360 |
- "host", host,
|
|
|
5e6360 |
+ "host", soup_uri_get_host (suri),
|
|
|
5e6360 |
"user", user,
|
|
|
5e6360 |
"email", email,
|
|
|
5e6360 |
NULL);
|
|
|
5e6360 |
|
|
|
5e6360 |
- g_free (host);
|
|
|
5e6360 |
+ soup_uri_free (suri);
|
|
|
5e6360 |
g_free (user);
|
|
|
5e6360 |
g_free (email);
|
|
|
5e6360 |
} else {
|