From 5a4fa8505d6a81836da77e2cc07e5fbd0cd21b7c Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 3 Nov 2000 18:22:34 +0000 Subject: Add an "url_flags" field to CamelProvider. Move the CAMEL_SERVICE_URL_* * camel-provider.h: Add an "url_flags" field to CamelProvider. Move the CAMEL_SERVICE_URL_* defines here and remove the SERVICE_ part of the name. * camel-service.h: Remove CAMEL_SERVICE_URL_* flags and service->url_flags field. * camel-service.c (check_url, get_path): Get URL flags from service->provider, update for changed flag names. * providers/*/camel-*-provider.c: Add URL flags to provider structures. * providers/*/camel-*-{store,transport}.c, camel-remote-store.c: Remove service->url_flags initialization. svn path=/trunk/; revision=6370 --- camel/providers/imap/camel-imap-provider.c | 6 +++++- camel/providers/imap/camel-imap-store.c | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'camel/providers/imap') diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c index a94daa3e19..9b962df5f4 100644 --- a/camel/providers/imap/camel-imap-provider.c +++ b/camel/providers/imap/camel-imap-provider.c @@ -42,7 +42,11 @@ static CamelProvider imap_provider = { "mail", - CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE, + CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE | + CAMEL_PROVIDER_IS_STORAGE, + + CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | + CAMEL_URL_ALLOW_PATH | CAMEL_URL_ALLOW_AUTH, { 0, 0 }, diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 904bd6bc37..0a8618ff90 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -126,16 +126,10 @@ camel_imap_store_finalize (CamelObject *object) static void camel_imap_store_init (gpointer object, gpointer klass) { - CamelService *service = CAMEL_SERVICE (object); CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object); CamelImapStore *imap_store = CAMEL_IMAP_STORE (object); CamelStore *store = CAMEL_STORE (object); - service->url_flags |= (CAMEL_SERVICE_URL_NEED_USER | - CAMEL_SERVICE_URL_NEED_HOST | - CAMEL_SERVICE_URL_ALLOW_PATH | - CAMEL_SERVICE_URL_ALLOW_AUTH); - remote_store->default_port = 143; imap_store->dir_sep = '\0'; -- cgit v1.2.3