aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/providers/imap/camel-imap-provider.c8
-rw-r--r--camel/providers/pop3/camel-pop3-provider.c8
-rw-r--r--camel/providers/smtp/camel-smtp-provider.c35
-rw-r--r--camel/providers/smtp/libcamelsmtp.urls1
5 files changed, 50 insertions, 10 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index ef762df572..ab97ed1919 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,13 @@
2001-03-14 Jeffrey Stedfast <fejj@ximian.com>
+ * providers/smtp/libcamelsmtp.urls: defined "ssmtp"
+
+ * providers/smtp/camel-smtp-provider.c: Defined the Secure SMTP
+ provider.
+ (camel_provider_module_init): Register the Secure SMTP provider.
+
+2001-03-14 Jeffrey Stedfast <fejj@ximian.com>
+
* providers/imap/camel-imap-store.c (imap_connect): Check for
"simap" instead of "imaps".
diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index ae86c1ac68..ea41a2ece8 100644
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -54,7 +54,7 @@ static CamelProvider imap_provider = {
};
#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
-static CamelProvider imaps_provider = {
+static CamelProvider simap_provider = {
"simap",
N_("Secure IMAPv4"),
@@ -80,19 +80,19 @@ camel_provider_module_init (CamelSession *session)
imap_provider.object_types[CAMEL_PROVIDER_STORE] =
camel_imap_store_get_type ();
#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
- imaps_provider.object_types[CAMEL_PROVIDER_STORE] =
+ simap_provider.object_types[CAMEL_PROVIDER_STORE] =
camel_imap_store_get_type ();
#endif
imap_provider.service_cache = g_hash_table_new (imap_url_hash, imap_url_equal);
#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
- imaps_provider.service_cache = g_hash_table_new (imap_url_hash, imap_url_equal);
+ simap_provider.service_cache = g_hash_table_new (imap_url_hash, imap_url_equal);
#endif
camel_session_register_provider (session, &imap_provider);
#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
- camel_session_register_provider (session, &imaps_provider);
+ camel_session_register_provider (session, &simap_provider);
#endif
}
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index b25cfcd7a3..af5e530818 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -49,7 +49,7 @@ static CamelProvider pop3_provider = {
};
#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
-static CamelProvider pops_provider = {
+static CamelProvider spop_provider = {
"spop",
N_("Secure POP"),
@@ -75,18 +75,18 @@ camel_provider_module_init (CamelSession *session)
pop3_provider.object_types[CAMEL_PROVIDER_STORE] =
camel_pop3_store_get_type ();
#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
- pops_provider.object_types[CAMEL_PROVIDER_STORE] =
+ spop_provider.object_types[CAMEL_PROVIDER_STORE] =
camel_pop3_store_get_type ();
#endif
pop3_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
- pops_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
+ spop_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
#endif
camel_session_register_provider (session, &pop3_provider);
#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
- camel_session_register_provider (session, &pops_provider);
+ camel_session_register_provider (session, &spop_provider);
#endif
}
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 0436800554..ec173ac5e8 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -47,15 +47,46 @@ static CamelProvider smtp_provider = {
NULL
};
+#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
+static CamelProvider ssmtp_provider = {
+ "ssmtp",
+ N_("Secure SMTP"),
+
+ N_("For delivering mail by connecting to a remote mailhub "
+ "using SMTP over an SSL connection.\n"),
+
+ "mail",
+
+ CAMEL_PROVIDER_IS_REMOTE,
+
+ CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_AUTH,
+
+ { 0, 0 },
+
+ NULL
+};
+#endif
+
void
camel_provider_module_init (CamelSession *session)
{
smtp_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
- camel_smtp_transport_get_type();
-
+ camel_smtp_transport_get_type ();
+#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
+ ssmtp_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
+ camel_smtp_transport_get_type ();
+#endif
+
smtp_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
+
+#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
+ ssmtp_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
+#endif
camel_session_register_provider (session, &smtp_provider);
+#if defined (HAVE_NSS) || defined (HAVE_OPENSSL)
+ camel_session_register_provider (session, &ssmtp_provider);
+#endif
}
diff --git a/camel/providers/smtp/libcamelsmtp.urls b/camel/providers/smtp/libcamelsmtp.urls
index ec2fc0fc16..d786e01295 100644
--- a/camel/providers/smtp/libcamelsmtp.urls
+++ b/camel/providers/smtp/libcamelsmtp.urls
@@ -1 +1,2 @@
smtp
+ssmtp