diff options
| -rw-r--r-- | camel/ChangeLog | 13 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-store.c | 2 | ||||
| -rw-r--r-- | camel/providers/imap/libcamelimap.urls | 2 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 4 | ||||
| -rw-r--r-- | camel/providers/pop3/libcamelpop3.urls | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 534e60f49f..ef762df572 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,18 @@ 2001-03-14 Jeffrey Stedfast <fejj@ximian.com> + * providers/imap/camel-imap-store.c (imap_connect): Check for + "simap" instead of "imaps". + + * providers/pop3/camel-pop3-store.c (pop3_connect): Change the + port to be 995 for spop. + + * providers/pop3/libcamelpop3.urls: Change to "spop". + + * providers/imap/libcamelimap.urls: Change "imaps" to "simap" to + correspond to /etc/services. + +2001-03-14 Jeffrey Stedfast <fejj@ximian.com> + * providers/pop3/camel-pop3-store.c (pop3_connect): Check to see if we are using "pops" and then set the appropriate SSL settings. diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index dd25bea6d9..83f9548bde 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -399,7 +399,7 @@ imap_connect (CamelService *service, CamelException *ex) CamelImapResponse *response; int len, i, flags; - if (!g_strcasecmp (service->url->protocol, "imaps")) { + if (!g_strcasecmp (service->url->protocol, "simap")) { CamelRemoteStore *rstore = CAMEL_REMOTE_STORE (service); rstore->default_port = 993; diff --git a/camel/providers/imap/libcamelimap.urls b/camel/providers/imap/libcamelimap.urls index cf07f4426f..3d22d610b2 100644 --- a/camel/providers/imap/libcamelimap.urls +++ b/camel/providers/imap/libcamelimap.urls @@ -1,2 +1,2 @@ imap -imaps +simap diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index b58504dcae..4d87d7ff53 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -460,11 +460,11 @@ pop3_connect (CamelService *service, CamelException *ex) } #endif - if (!g_strcasecmp (service->url->protocol, "pops")) { + if (!g_strcasecmp (service->url->protocol, "spop")) { CamelRemoteStore *rstore = CAMEL_REMOTE_STORE (service); /* FIXME: what should this port be?? */ - rstore->default_port = 993; + rstore->default_port = 995; rstore->use_ssl = TRUE; } diff --git a/camel/providers/pop3/libcamelpop3.urls b/camel/providers/pop3/libcamelpop3.urls index 39a0315454..789e1d7db1 100644 --- a/camel/providers/pop3/libcamelpop3.urls +++ b/camel/providers/pop3/libcamelpop3.urls @@ -1,2 +1,2 @@ pop -pops +spop |