Tweak the definition of CamelProvider. Among other things, a provider may

	* camel-provider.h: Tweak the definition of CamelProvider. Among
	other things, a provider may now be both a store and a transport.

	* camel-provider.c: Remove a lot of code we had no intention of
	using. This now only contains two functions: camel_provider_init
	to read the installed .urls files, and camel_provider_load to
	load and register a new provider.

	* camel-session.c: Remove more unused code and simplify some of
	the remaining code. The list of available provider modules is now
	stored in the session, and it handles calling camel_provider_load
	to load them as needed. Provider registration is now done by
	calling back from the module init routine, which allows a single
	module to register providers for multiple URL types.

	* providers/*: Update provider structures and init routines for
	the new stuff. Add a .urls file to each provider specifying what
	urls it handles, and install that with the library.

	* providers/nntp/camel-nntp-provider.c: Add hints towards
	supporting both news: and nntp: URLs, and using nntp as both a
	store and a transport.

svn path=/trunk/; revision=2691

3 files changed, 14 insertions, 15 deletions

diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 9c9c3f356b..0c12a6e23d 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -8,6 +8,7 @@ libcamelsendmailincludedir = $(includedir)/camel
 providerdir = $(pkglibdir)/camel-providers/$(VERSION)
 
 provider_LTLIBRARIES = libcamelsendmail.la
+provider_DATA = libcamelsendmail.urls
 
 INCLUDES =					\
 	-I..					\
@@ -26,4 +27,4 @@ libcamelsendmailinclude_HEADERS =		\
 
 libcamelsendmail_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
 
-EXTRA_DIST = 
+EXTRA_DIST = libcamelsendmail.urls
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 5d3809b6f0..16ebce8b12 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -26,30 +26,27 @@
 #include "config.h"
 #include "camel-provider.h"
 #include "camel-sendmail-transport.h"
+#include "camel-session.h"
 
-static CamelProvider _sendmail_provider = {
-	(GtkType) 0,
-	PROVIDER_TRANSPORT,
-	0,
-
+static CamelProvider sendmail_provider = {
 	"sendmail",
 	"Sendmail",
 
 	"For delivering mail by passing it to the \"sendmail\" program "
 	"on the local system.",
 
-	(GModule *) NULL
-};
-
-CamelProvider *
-camel_provider_module_init (void);
+	0,
 
+	{ 0, 0 }
+};
 
-CamelProvider *
-camel_provider_module_init (void)
+void
+camel_provider_module_init (CamelSession *session)
 {
-	_sendmail_provider.object_type = camel_sendmail_transport_get_type();
-	return &_sendmail_provider;
+	sendmail_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
+		camel_sendmail_transport_get_type();
+
+	camel_session_register_provider (session, &sendmail_provider);
 }
 
 
diff --git a/camel/providers/sendmail/libcamelsendmail.urls b/camel/providers/sendmail/libcamelsendmail.urls
new file mode 100644
index 0000000000..ccad52828e
--- /dev/null
+++ b/camel/providers/sendmail/libcamelsendmail.urls
@@ -0,0 +1 @@
+sendmail