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

14 files changed, 21 insertions, 26 deletions

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';
diff --git a/camel/providers/mbox/camel-mbox-provider.c b/camel/providers/mbox/camel-mbox-provider.c
index 3130a3ffd9..bfce8b5ada 100644
--- a/camel/providers/mbox/camel-mbox-provider.c
+++ b/camel/providers/mbox/camel-mbox-provider.c
@@ -40,6 +40,8 @@ static CamelProvider mbox_provider = {
 
 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
 
+	CAMEL_URL_NEED_PATH,
+
 	{ 0, 0 },
 
 	NULL
diff --git a/camel/providers/mbox/camel-mbox-store.c b/camel/providers/mbox/camel-mbox-store.c
index 68ecfd229e..e3110ef3d3 100644
--- a/camel/providers/mbox/camel-mbox-store.c
+++ b/camel/providers/mbox/camel-mbox-store.c
@@ -69,11 +69,8 @@ camel_mbox_store_class_init (CamelMboxStoreClass *camel_mbox_store_class)
 static void
 camel_mbox_store_init (gpointer object, gpointer klass)
 {
-	CamelService *service = CAMEL_SERVICE (object);
 	CamelStore *store = CAMEL_STORE (object);
 
-	service->url_flags = CAMEL_SERVICE_URL_NEED_PATH;
-
 	/* mbox names are filenames, so they are case-sensitive. */
 	store->folders = g_hash_table_new (g_str_hash, g_str_equal);
 }
diff --git a/camel/providers/mh/camel-mh-provider.c b/camel/providers/mh/camel-mh-provider.c
index 25a3522678..74329a3203 100644
--- a/camel/providers/mh/camel-mh-provider.c
+++ b/camel/providers/mh/camel-mh-provider.c
@@ -39,6 +39,8 @@ static CamelProvider mh_provider = {
 
 	CAMEL_PROVIDER_IS_STORAGE,
 
+	CAMEL_URL_NEED_PATH,
+
 	{0, 0},
 
 	NULL
diff --git a/camel/providers/mh/camel-mh-store.c b/camel/providers/mh/camel-mh-store.c
index 65b1005b85..0a6da11162 100644
--- a/camel/providers/mh/camel-mh-store.c
+++ b/camel/providers/mh/camel-mh-store.c
@@ -68,11 +68,8 @@ static void camel_mh_store_class_init(CamelObjectClass * camel_mh_store_class)
 
 static void camel_mh_store_init(CamelObject * object)
 {
-	CamelService *service = CAMEL_SERVICE(object);
 	CamelStore *store = CAMEL_STORE(object);
 
-	service->url_flags = CAMEL_SERVICE_URL_NEED_PATH;
-
 	/* mh names are filenames, so they are case-sensitive. */
 	store->folders = g_hash_table_new(g_str_hash, g_str_equal);
 }
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index 59a251a795..76ac521ec6 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -44,6 +44,9 @@ static CamelProvider news_provider = {
 
 	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_STORAGE,
 
+	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_USER |
+	CAMEL_URL_ALLOW_PASSWORD | CAMEL_URL_ALLOW_AUTH,
+
 	{ 0, 0 },
 
 	NULL
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 41466fe06c..ff9e7a989a 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -626,14 +626,9 @@ camel_nntp_store_class_init (CamelNNTPStoreClass *camel_nntp_store_class)
 static void
 camel_nntp_store_init (gpointer object, gpointer klass)
 {
-	CamelService *service = CAMEL_SERVICE (object);
 	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
 	CamelStore *store = CAMEL_STORE (object);
 
-	service->url_flags = (CAMEL_SERVICE_URL_NEED_HOST
-			      | CAMEL_SERVICE_URL_ALLOW_USER
-			      | CAMEL_SERVICE_URL_ALLOW_PASSWORD
-			      | CAMEL_SERVICE_URL_ALLOW_AUTH);
 	remote_store->default_port = NNTP_PORT;
 
 	store->flags = CAMEL_STORE_SUBSCRIPTIONS;
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 2884cf6238..5af0dad73c 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -41,6 +41,8 @@ static CamelProvider pop3_provider = {
 
 	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE,
 
+	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_AUTH,
+
 	{ 0, 0 },
 
 	NULL
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 67d32da796..d572cc0a98 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -112,12 +112,8 @@ camel_pop3_store_class_init (CamelPop3StoreClass *camel_pop3_store_class)
 static void
 camel_pop3_store_init (gpointer object, gpointer klass)
 {
-	CamelService *service = CAMEL_SERVICE (object);
 	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
 
-	service->url_flags |= (CAMEL_SERVICE_URL_NEED_USER |
-			       CAMEL_SERVICE_URL_NEED_HOST |
-			       CAMEL_SERVICE_URL_ALLOW_AUTH);
 	remote_store->default_port = 110;
 }
 
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 5fbac10434..d0e40b4cf8 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -40,6 +40,8 @@ static CamelProvider sendmail_provider = {
 
 	0,
 
+	0,
+
 	{ 0, 0 },
 
 	NULL
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index ca6116042c..6d94536937 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -38,7 +38,9 @@ static CamelProvider smtp_provider = {
 
 	"mail",
 
-	0,
+	CAMEL_PROVIDER_IS_REMOTE,
+
+	CAMEL_URL_NEED_HOST,
 
 	{ 0, 0 },
 
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 62cd0b7525..6fa39bb930 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -107,11 +107,8 @@ static void
 camel_smtp_transport_init (gpointer object)
 {
 	CamelTransport *transport = CAMEL_TRANSPORT (object);
-	CamelService *service = CAMEL_SERVICE (transport);
 	
 	transport->supports_8bit = FALSE;
-	
-	service->url_flags = CAMEL_SERVICE_URL_NEED_HOST;
 }
 
 CamelType
diff --git a/camel/providers/vee/camel-vee-provider.c b/camel/providers/vee/camel-vee-provider.c
index 335a5de097..4588fb77d3 100644
--- a/camel/providers/vee/camel-vee-provider.c
+++ b/camel/providers/vee/camel-vee-provider.c
@@ -35,6 +35,8 @@ static CamelProvider vee_provider = {
 
 	0,
 
+	0,
+
 	{ 0, 0 },
 
 	NULL