From d53eea370b1a53cbae519c92fa602d0e7aa5ecc8 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@gnu.org>
Date: Tue, 15 Feb 2000 17:28:34 +0000
Subject: Add the unicode libraries as well.

2000-02-14  Miguel de Icaza  <miguel@gnu.org>

	* camel/providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Add
	the unicode libraries as well.

	* camel/camel-provider.c (camel_provider_register_as_module): Add
	error reporting here.  Desire to use Solaris increases.  Hair loss
	in the last two hours: 5,400.

	* camel/providers/mbox/camel-mbox-provider.c
	(camel_mbox_get_provider): Renamed function.

	* camel/camel.h: All include files use camel/ now here.

	* camel/providers/mbox/Makefile.am: Drop all the dynamism from
	Camel, and make this a standard library.

	* configure.in: set the UNICODE_LIBS variable here.
2000-02-14  Miguel de Icaza  <miguel@gnu.org>

	* folder-browser.c (folder_browser_load_folder): New routine,
	loads a camel folder.
	(folder_browser_set_uri): redo.

	* session.c: new file.  Implements SessionStores to keep track of
	a Session/Store tuple.

svn path=/trunk/; revision=1783
---
 camel/camel-provider.c                     |  1 +
 camel/camel.h                              | 46 +++++++++++++++---------------
 camel/gmime-utils.h                        |  2 +-
 camel/providers/mbox/Makefile.am           |  7 +++--
 camel/providers/mbox/camel-mbox-provider.c |  5 ++--
 5 files changed, 32 insertions(+), 29 deletions(-)

(limited to 'camel')

diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index 7328f4ca64..0cff8564a1 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -105,6 +105,7 @@ camel_provider_register_as_module (const gchar *module_path)
 
 	new_module = g_module_open (module_path, 0);
 	if (!new_module) {
+		printf ("g_module_open reports: %s\n", g_module_error ());
 		CAMEL_LOG_WARNING ("CamelProvider::register_as_module Unable to load module %s\n", module_path);
 		CAMEL_LOG_FULL_DEBUG ("Leaving CamelProvider::register_as_module\n");
 		return NULL;
diff --git a/camel/camel.h b/camel/camel.h
index 0e41d32742..b3ee0dcf03 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -38,29 +38,29 @@ extern "C" {
 #include <camel/data-wrapper-repository.h>
 #include <camel/camel-log.h>	
 #include <camel/camel-data-wrapper.h>
-#include <camel-simple-data-wrapper.h>
-#include <camel-folder.h>
-#include <camel-folder-pt-proxy.h>
-#include <camel-marshal-utils.h>
-#include <camel-mime-body-part.h>
-#include <camel-mime-message.h>
-#include <camel-mime-part.h>
-#include <camel-multipart.h>
-#include <camel-op-queue.h>
-#include <camel-provider.h>
-#include <camel-service.h>
-#include <camel-session.h>
-#include <camel-store.h>
-#include <camel-stream.h>
-#include <camel-stream-fs.h>
-#include <camel-stream-mem.h>
-#include <camel-thread-proxy.h>
-#include <data-wrapper-repository.h>
-#include <gmime-content-field.h>
-#include <gmime-utils.h>
-#include <gstring-util.h>
-#include <string-utils.h>
-#include <url-util.h>
+#include <camel/camel-simple-data-wrapper.h>
+#include <camel/camel-folder.h>
+#include <camel/camel-folder-pt-proxy.h>
+#include <camel/camel-marshal-utils.h>
+#include <camel/camel-mime-body-part.h>
+#include <camel/camel-mime-message.h>
+#include <camel/camel-mime-part.h>
+#include <camel/camel-multipart.h>
+#include <camel/camel-op-queue.h>
+#include <camel/camel-provider.h>
+#include <camel/camel-service.h>
+#include <camel/camel-session.h>
+#include <camel/camel-store.h>
+#include <camel/camel-stream.h>
+#include <camel/camel-stream-fs.h>
+#include <camel/camel-stream-mem.h>
+#include <camel/camel-thread-proxy.h>
+#include <camel/data-wrapper-repository.h>
+#include <camel/gmime-content-field.h>
+#include <camel/gmime-utils.h>
+#include <camel/gstring-util.h>
+#include <camel/string-utils.h>
+#include <camel/url-util.h>
 
 gint camel_init ();
 
diff --git a/camel/gmime-utils.h b/camel/gmime-utils.h
index 2e0682fcf9..cf352cb798 100644
--- a/camel/gmime-utils.h
+++ b/camel/gmime-utils.h
@@ -36,7 +36,7 @@ extern "C" {
 
 #include <glib.h>
 #include <stdio.h>
-#include <camel-stream.h>
+#include <camel/camel-stream.h>
 
 typedef struct 
 {
diff --git a/camel/providers/mbox/Makefile.am b/camel/providers/mbox/Makefile.am
index 9b5b40ff84..c89d38db94 100644
--- a/camel/providers/mbox/Makefile.am
+++ b/camel/providers/mbox/Makefile.am
@@ -4,8 +4,9 @@ SUBDIRS =
 
 libcamelmboxincludedir = $(includedir)/camel
 
+providerdir = $(libdir)/evolution/camel-providers/$(VERSION) 
 
-lib_LTLIBRARIES = libcamelmbox.la
+provider_LTLIBRARIES = libcamelmbox.la
 
 INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir)	\
 	-I$(top_srcdir)/intl			\
@@ -30,9 +31,9 @@ libcamelmboxinclude_HEADERS =			\
 	camel-mbox-utils.h
 
 
-libcamelmbox_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libcamelmbox_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) 
 
 #libcamelmbox_la_LIBADD = -L$(top_srcdir)/libibex -libex
-libcamelmbox_la_LIBADD = $(top_srcdir)/libibex/libibex.la
+libcamelmbox_la_LIBADD = $(top_srcdir)/libibex/libibex.la $(UNICODE_LIBS)
 
 EXTRA_DIST = 
diff --git a/camel/providers/mbox/camel-mbox-provider.c b/camel/providers/mbox/camel-mbox-provider.c
index c10e42f95e..873dca0954 100644
--- a/camel/providers/mbox/camel-mbox-provider.c
+++ b/camel/providers/mbox/camel-mbox-provider.c
@@ -38,11 +38,12 @@ static CamelProvider _mbox_provider = {
 	(GModule *) NULL
 };
 
-
-
 CamelProvider *
 camel_provider_module_init ()
 {
 	_mbox_provider.object_type = camel_mbox_store_get_type();
 	return &_mbox_provider;
 }
+
+
+
-- 
cgit v1.2.3