From 0d54c483525a76d4eedd41b9e5f59c241139bed3 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 9 Jan 2001 19:27:27 +0000 Subject: 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 --- camel/providers/nntp/camel-nntp-store.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'camel/providers/nntp') diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c index ff9e7a989a..a3f6926a2a 100644 --- a/camel/providers/nntp/camel-nntp-store.c +++ b/camel/providers/nntp/camel-nntp-store.c @@ -300,22 +300,15 @@ static CamelServiceAuthType password_authtype = { }; static GList * -nntp_store_query_auth_types_generic (CamelService *service, CamelException *ex) +nntp_store_query_auth_types (CamelService *service, CamelException *ex) { GList *prev; - prev = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types_generic (service, ex); + g_warning ("nntp::query_auth_types: not implemented. Defaulting."); + prev = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types (service, ex); return g_list_prepend (prev, &password_authtype); } -static GList * -nntp_store_query_auth_types_connected (CamelService *service, CamelException *ex) -{ - g_warning ("nntp::query_auth_types_connected: not implemented. Defaulting."); - /* FIXME: use the classfunc instead of the local? */ - return nntp_store_query_auth_types_generic (service, ex); -} - static CamelFolder * nntp_store_get_folder (CamelStore *store, const gchar *folder_name, guint32 flags, CamelException *ex) @@ -607,8 +600,7 @@ camel_nntp_store_class_init (CamelNNTPStoreClass *camel_nntp_store_class) /* virtual method overload */ camel_service_class->connect = nntp_store_connect; camel_service_class->disconnect = nntp_store_disconnect; - camel_service_class->query_auth_types_generic = nntp_store_query_auth_types_generic; - camel_service_class->query_auth_types_connected = nntp_store_query_auth_types_connected; + camel_service_class->query_auth_types = nntp_store_query_auth_types; camel_service_class->get_name = nntp_store_get_name; camel_store_class->get_folder = nntp_store_get_folder; -- cgit