aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-12-08 22:59:01 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:10 +0800
commit60dc92eb4497e5d0c5f600bae9c382da693d9012 (patch)
treeaa42bda21a24132b1cbf2a698844b3907414e49a
parent49dd425fc9cd6d001b04ea440ae9ee1672b9369b (diff)
downloadgsoc2013-evolution-60dc92eb4497e5d0c5f600bae9c382da693d9012.tar.gz
gsoc2013-evolution-60dc92eb4497e5d0c5f600bae9c382da693d9012.tar.zst
gsoc2013-evolution-60dc92eb4497e5d0c5f600bae9c382da693d9012.zip
Bug #633332 - Preserve port number in WebDAV address book
-rw-r--r--plugins/webdav-account-setup/webdav-contacts-source.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index 6ce62e4bdd..870fa46b13 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -123,9 +123,17 @@ set_ui_from_source (ui_data *data)
gtk_toggle_button_set_active (data->avoid_ifmatch_toggle, avoid_ifmatch);
/* it's really a http or https protocol */
- if (suri)
+ if (suri) {
+ gint port;
+
+ port = soup_uri_get_port (suri);
+
soup_uri_set_scheme (suri, use_ssl ? "https" : "http");
+ if (port > 0 && port != soup_uri_get_port (suri))
+ soup_uri_set_port (suri, port);
+ }
+
/* remove user/username and set user field */
if (suri && suri->user != NULL) {
gtk_entry_set_text (data->username_entry, suri->user);