summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-03-28 02:19:05 +0000
committerJeffrey Stedfast <fejj@src.gnome.org>2001-03-28 02:19:05 +0000
commitcf8d87d9e9d1723cb1650e213d68fcdd4919cf8c (patch)
treea85a9c7570b0422cc343ab441cda077cd5383839
parent3dec90b22d4514c126c98bb026676c7e10e1653d (diff)
downloadevolution-data-server-cf8d87d9e9d1723cb1650e213d68fcdd4919cf8c.tar.gz
Add the port (if user defined) to the path to fix bug #1996.
2001-03-27 Jeffrey Stedfast <fejj@ximian.com> * camel-service.c (get_path): Add the port (if user defined) to the path to fix bug #1996. Danw: I'm iffy on the "fix" so I'd like you to comment.
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/camel-service.c6
2 files changed, 13 insertions, 0 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index fb091ec33..2f80e1565 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,12 @@
2001-03-27 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-service.c (get_path): Add the port (if user defined) to
+ the path to fix bug #1996.
+
+ Danw: I'm iffy on the "fix" so I'd like you to comment.
+
+2001-03-27 Jeffrey Stedfast <fejj@ximian.com>
+
* providers/pop3/camel-pop3-folder.c (pop3_sync): If we aren't
going to even check the resp/free buffer that gets returned from
camel_pop3_command, don't even bother using it. Send in NULL
diff --git a/camel/camel-service.c b/camel/camel-service.c
index af9d65968..cbf0e5b68 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -342,6 +342,9 @@ get_path (CamelService *service)
g_string_sprintfa (gpath, "/%s@%s",
url->user ? url->user : "",
url->host ? url->host : "");
+
+ if (url->port)
+ g_string_sprintfa (gpath, ":%d", url->port);
} else {
g_string_sprintfa (gpath, "/%s%s",
url->user ? url->user : "",
@@ -351,6 +354,9 @@ get_path (CamelService *service)
g_string_sprintfa (gpath, "/%s%s",
CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_HOST) ? "" : "@",
url->host ? url->host : "");
+
+ if (url->port)
+ g_string_sprintfa (gpath, ":%d", url->port);
}
if (CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_PATH)) {
g_string_sprintfa (gpath, "%s%s",