aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2005-03-17 19:16:35 +0800
committerSushma Rai <rsushma@src.gnome.org>2005-03-17 19:16:35 +0800
commitf316821f46181b2c5a9a9902b49a1c519828a6e2 (patch)
tree5d4127566a9ba4ccb8344010346ddd90366b1b9d
parent70d082e4d8d58f7bbf114653184ba8fcfbd5f5eb (diff)
downloadgsoc2013-evolution-f316821f46181b2c5a9a9902b49a1c519828a6e2.tar.gz
gsoc2013-evolution-f316821f46181b2c5a9a9902b49a1c519828a6e2.tar.zst
gsoc2013-evolution-f316821f46181b2c5a9a9902b49a1c519828a6e2.zip
Setting the authentication mechanism on the the transport url along with
source url. svn path=/trunk/; revision=29051
-rw-r--r--plugins/exchange-account-setup/ChangeLog5
-rw-r--r--plugins/exchange-account-setup/exchange-account-setup.c37
2 files changed, 30 insertions, 12 deletions
diff --git a/plugins/exchange-account-setup/ChangeLog b/plugins/exchange-account-setup/ChangeLog
index a4b3694bc2..a3b6de03b6 100644
--- a/plugins/exchange-account-setup/ChangeLog
+++ b/plugins/exchange-account-setup/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-17 Sushma Rai <rsushma@novell.com>
+
+ * exchange-account-setup.c (exchange_authtype_changed): Setting the
+ authentication mechanism to both transport and source urls.
+
2005-03-05 Sushma Rai <rsushma@novell.com>
* org-gnome-exchange-account-setup.eplug.in: Added the commit function
diff --git a/plugins/exchange-account-setup/exchange-account-setup.c b/plugins/exchange-account-setup/exchange-account-setup.c
index 78f5eb3147..f01f721d49 100644
--- a/plugins/exchange-account-setup/exchange-account-setup.c
+++ b/plugins/exchange-account-setup/exchange-account-setup.c
@@ -602,29 +602,42 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
GtkTreeModel *model;
GtkTreeIter iter;
CamelServiceAuthType *authtype;
- CamelURL *url;
- const char *source_url;
- char *url_string;
+ CamelURL *url_source, *url_transport;
+ const char *source_url, *transport_url;
+ char *source_url_string, *transport_url_string;
source_url = e_account_get_string (target->account,
E_ACCOUNT_SOURCE_URL);
if (id == -1)
return;
- url = camel_url_new (source_url, NULL);
+ url_source = camel_url_new (source_url, NULL);
+
+ transport_url = e_account_get_string (target->account,
+ E_ACCOUNT_TRANSPORT_URL);
+ url_transport = camel_url_new (transport_url, NULL);
+
model = gtk_combo_box_get_model(dropdown);
if (gtk_tree_model_iter_nth_child(model, &iter, NULL, id)) {
gtk_tree_model_get(model, &iter, 1, &authtype, -1);
- if (authtype)
- camel_url_set_authmech(url, authtype->authproto);
- else
- camel_url_set_authmech(url, NULL);
+ if (authtype) {
+ camel_url_set_authmech(url_source, authtype->authproto);
+ camel_url_set_authmech(url_transport, authtype->authproto);
+ }
+ else {
+ camel_url_set_authmech(url_source, NULL);
+ camel_url_set_authmech(url_transport, NULL);
+ }
- url_string = camel_url_to_string(url, 0);
- e_account_set_string(target->account, E_ACCOUNT_SOURCE_URL, url_string);
- g_free(url_string);
+ source_url_string = camel_url_to_string(url_source, 0);
+ transport_url_string = camel_url_to_string(url_transport, 0);
+ e_account_set_string(target->account, E_ACCOUNT_SOURCE_URL, source_url_string);
+ e_account_set_string(target->account, E_ACCOUNT_TRANSPORT_URL, transport_url_string);
+ g_free(source_url_string);
+ g_free(transport_url_string);
}
- camel_url_free(url);
+ camel_url_free(url_source);
+ camel_url_free(url_transport);
}