Add support for specifying on which port to connect to a server; fix a potential...

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 0baaf4a..a5edabe 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,16 @@
+2000-08-25  Peter Williams  <peterw@helixcode.com>
+
+       * camel.c (camel_init): Don't call unicode_init; code in e-util
+       will do it, and if unicode_init is called twice, you get an
+       infinite loop when looking up nonexistant encodings (patch
+       has been submitted to libunicode's maintainer).
+       
+       * camel-provider.h: Add a new field, default_ports, which
+       helps the configuration code guess about how to make CamelURL's
+       from providers.
+       
+       * providers/*/camel-*-provider.c: Specify default ports.
+
 2000-08-25  Jeffrey Stedfast  <fejj@helixcode.com>
 
        * providers/imap/camel-imap-folder.c

diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 0037502..d77ae6e 100644 (file)
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -79,6 +79,7 @@ typedef struct {
        int flags;
 
        CamelType object_types [CAMEL_NUM_PROVIDER_TYPES];
+       gint default_ports [CAMEL_NUM_PROVIDER_TYPES];
 
        GHashTable *service_cache;
        

diff --git a/camel/camel.c b/camel/camel.c
index 0121c10..dd46295 100644 (file)
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -40,7 +40,8 @@ camel_init(void)
 #endif /* G_THREADS_ENABLED */
 #endif /* ENABLE_THREADS */
 
-       unicode_init ();
+       /* Taken care of by e-util/e-unicode.c */
+       /*unicode_init ();*/
 
        return 0;
 }

diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index 21452d5..a0a6279 100644 (file)
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -45,6 +45,7 @@ static CamelProvider imap_provider = {
        CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
 
        { 0, 0 },
+       { 143, 0 },
 
        NULL
 };

diff --git a/camel/providers/mbox/camel-mbox-provider.c b/camel/providers/mbox/camel-mbox-provider.c
index d4048e1..0a73f13 100644 (file)
--- a/camel/providers/mbox/camel-mbox-provider.c
+++ b/camel/providers/mbox/camel-mbox-provider.c
@@ -41,6 +41,7 @@ static CamelProvider mbox_provider = {
        CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
 
        { 0, 0 },
+       { 0, 0 },
 
        NULL
 };

diff --git a/camel/providers/mh/camel-mh-provider.c b/camel/providers/mh/camel-mh-provider.c
index 58e97ee..e7315ce 100644 (file)
--- a/camel/providers/mh/camel-mh-provider.c
+++ b/camel/providers/mh/camel-mh-provider.c
@@ -40,6 +40,7 @@ static CamelProvider mh_provider = {
        CAMEL_PROVIDER_IS_STORAGE,
 
        {0, 0},
+       {0, 0},
 
        NULL
 };

diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index 214fd4b..6cd7d96 100644 (file)
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -39,6 +39,7 @@ static CamelProvider news_provider = {
        CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_STORAGE,
 
        { 0, 0 },
+       { 119, 0 },
 
        NULL
 };
@@ -55,6 +56,7 @@ static CamelProvider nntp_provider = {
        CAMEL_PROVIDER_IS_REMOTE,
 
        { 0, 0 },
+       { 119, 0 },
 
        NULL
 };

diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 52399c9..3a82f65 100644 (file)
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -42,6 +42,7 @@ static CamelProvider pop3_provider = {
        CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE,
 
        { 0, 0 },
+       { 110, 0 },
 
        NULL
 };

diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 3b0b35d..8da50cf 100644 (file)
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -41,6 +41,7 @@ static CamelProvider sendmail_provider = {
        0,
 
        { 0, 0 },
+       { 0, 0 },
 
        NULL
 };

diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 1d18e44..ea5aec7 100644 (file)
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -40,6 +40,7 @@ static CamelProvider smtp_provider = {
        0,
 
        { 0, 0 },
+       { 0, 25 },
 
        NULL
 };

diff --git a/camel/providers/vee/camel-vee-provider.c b/camel/providers/vee/camel-vee-provider.c
index e36e7fc..cbec03d 100644 (file)
--- a/camel/providers/vee/camel-vee-provider.c
+++ b/camel/providers/vee/camel-vee-provider.c
@@ -36,6 +36,7 @@ static CamelProvider vee_provider = {
        0,
 
        { 0, 0 },
+       { 0, 0 },
 
        NULL
 };