diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-01-10 03:27:27 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-01-10 03:27:27 +0800 |
| commit | 0d54c483525a76d4eedd41b9e5f59c241139bed3 (patch) | |
| tree | 226b587fa84efa2cfc7cf706b204d2f7dd4b8de1 /camel/providers/smtp | |
| parent | 550913356fba79fb5887ea8810c8012df96ef632 (diff) | |
| download | gsoc2013-evolution-0d54c483525a76d4eedd41b9e5f59c241139bed3.tar.gz gsoc2013-evolution-0d54c483525a76d4eedd41b9e5f59c241139bed3.tar.zst gsoc2013-evolution-0d54c483525a76d4eedd41b9e5f59c241139bed3.zip | |
Kill off a long-hated Camel kludge: "empty" URLs and
query_auth_types_generic.
* camel-url.c: Remove "empty" from CamelURL.
(camel_url_new): No longer set it.
(camel_url_to_string): Treat "" as equivalent to NULL for
authmech. (Unrelated change, but it simplifies some stuff with the
new config dialog.)
* camel-service.c (camel_service_new): Remove url->empty check: if
the URL isn't valid, we don't create the service.
(camel_service_query_auth_types): No longer need to switch between
generic and connected variants.
* providers/smtp/camel-smtp-transport.c (query_auth_types):
* providers/pop3/camel-pop3-store.c (query_auth_types):
* providers/nntp/camel-nntp-store.c (nntp_store_query_auth_types):
* providers/imap/camel-imap-store.c (query_auth_types):
* camel-remote-store.c (remote_query_auth_types): Remove generic
version, rename connected version.
svn path=/trunk/; revision=7327
Diffstat (limited to 'camel/providers/smtp')
| -rw-r--r-- | camel/providers/smtp/camel-smtp-transport.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 2d20cadce8..1176cca454 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -63,8 +63,7 @@ static gboolean _send_to (CamelTransport *transport, CamelMedium *message, GList static gboolean smtp_connect (CamelService *service, CamelException *ex); static gboolean smtp_disconnect (CamelService *service, gboolean clean, CamelException *ex); static GList *esmtp_get_authtypes(gchar *buffer); -static GList *query_auth_types_connected (CamelService *service, CamelException *ex); -static GList *query_auth_types_generic (CamelService *service, CamelException *ex); +static GList *query_auth_types (CamelService *service, CamelException *ex); static void free_auth_types (CamelService *service, GList *authtypes); static char *get_name (CamelService *service, gboolean brief); @@ -93,8 +92,7 @@ camel_smtp_transport_class_init (CamelSmtpTransportClass *camel_smtp_transport_c /* virtual method overload */ camel_service_class->connect = smtp_connect; camel_service_class->disconnect = smtp_disconnect; - camel_service_class->query_auth_types_generic = query_auth_types_generic; - camel_service_class->query_auth_types_connected = query_auth_types_connected; + camel_service_class->query_auth_types = query_auth_types; camel_service_class->free_auth_types = free_auth_types; camel_service_class->get_name = get_name; @@ -300,17 +298,7 @@ static CamelServiceAuthType cram_md5_authtype = { #endif static GList * -query_auth_types_connected (CamelService *service, CamelException *ex) -{ - /* FIXME: Re-enable this when auth types are actually - * implemented. - */ - - return NULL; -} - -static GList * -query_auth_types_generic (CamelService *service, CamelException *ex) +query_auth_types (CamelService *service, CamelException *ex) { /* FIXME: Re-enable this when auth types are actually * implemented. |