aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-remote-store.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-01-10 03:27:27 +0800
committerDan Winship <danw@src.gnome.org>2001-01-10 03:27:27 +0800
commit0d54c483525a76d4eedd41b9e5f59c241139bed3 (patch)
tree226b587fa84efa2cfc7cf706b204d2f7dd4b8de1 /camel/camel-remote-store.c
parent550913356fba79fb5887ea8810c8012df96ef632 (diff)
downloadgsoc2013-evolution-0d54c483525a76d4eedd41b9e5f59c241139bed3.tar
gsoc2013-evolution-0d54c483525a76d4eedd41b9e5f59c241139bed3.tar.gz
gsoc2013-evolution-0d54c483525a76d4eedd41b9e5f59c241139bed3.tar.bz2
gsoc2013-evolution-0d54c483525a76d4eedd41b9e5f59c241139bed3.tar.lz
gsoc2013-evolution-0d54c483525a76d4eedd41b9e5f59c241139bed3.tar.xz
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/camel-remote-store.c')
-rw-r--r--camel/camel-remote-store.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c
index 3436e41733..70b34ec1f2 100644
--- a/camel/camel-remote-store.c
+++ b/camel/camel-remote-store.c
@@ -62,8 +62,7 @@ static CamelStoreClass *store_class = NULL;
static gboolean remote_connect (CamelService *service, CamelException *ex);
static gboolean remote_disconnect (CamelService *service, gboolean clean, CamelException *ex);
-static GList *remote_query_auth_types_generic (CamelService *service, CamelException *ex);
-static GList *remote_query_auth_types_connected (CamelService *service, CamelException *ex);
+static GList *remote_query_auth_types(CamelService *service, CamelException *ex);
static void remote_free_auth_types (CamelService *service, GList *authtypes);
static char *remote_get_name (CamelService *service, gboolean brief);
static char *remote_get_folder_name (CamelStore *store,
@@ -90,8 +89,7 @@ camel_remote_store_class_init (CamelRemoteStoreClass *camel_remote_store_class)
/* virtual method overload */
camel_service_class->connect = remote_connect;
camel_service_class->disconnect = remote_disconnect;
- camel_service_class->query_auth_types_generic = remote_query_auth_types_generic;
- camel_service_class->query_auth_types_connected = remote_query_auth_types_connected;
+ camel_service_class->query_auth_types = remote_query_auth_types;
camel_service_class->free_auth_types = remote_free_auth_types;
camel_service_class->get_name = remote_get_name;
@@ -167,13 +165,7 @@ static CamelServiceAuthType password_authtype = {
*/
static GList *
-remote_query_auth_types_connected (CamelService *service, CamelException *ex)
-{
- return NULL;
-}
-
-static GList *
-remote_query_auth_types_generic (CamelService *service, CamelException *ex)
+remote_query_auth_types (CamelService *service, CamelException *ex)
{
return NULL;
}