Porting OpenChange Exchange provider to Tinymail

[Philip Van Hoof <spam pvanhoof be>]

Hi there OpenChange developers. My name is Philip and I did a library
for E-mail that focuses specifically on mobiles. It's called Tinymail
and a few mobile device vendors, like Nokia and since recently OpenMoko
and perhaps OLPC too, are interested in using this. 

More info here: http://tinymail.org

I used a modified Camel to implement certain parts of Tinymail. This
made it easy to port OpenChange's Evolution support to this Tinymail of
mine.

Together I believe we can make an equivalent of the E-mail client of
WinCE with support for Exchange. This of course means that we need to
get all the required components for OpenChange working on ARM and mobile
targets. I guess these include Samba4: I can imagine that the vendors
would want a stripped down library using just the things that OpenChange
needs, if that would be possible of course.

This ports OpenChange's Evolution plugin to Tinymail. Although I have
not yet tested this. Please note that I disabled quite a lot of files in
the build because Tinymail does not come with all the Evolution Data
Server parts that are used by certain pieces of OpenChange's EPlugin. 

I can of course imagine that certain vendors will ship their devices
with O-Hand's EDS-DBUS implementation of Evolution Data Server. I
haven't ported those pieces (I added Ross, who worked on EDS-DBUS, in
CC). I would of course welcome any such attempt.

Please let me know if you guys would be interested in this kind of
cooperation. 

 ...
 ... svn cp trunk branches/tinymail-port
 ... code code code
 ...
pvanhoof schtrumpf:~/repos/openchange/eplugin/branches/tinymail-port$ svn status
?      libcamelopenchange.so
?      configure
?      config.log
?      config.status
?      config.h
?      config.h.in
?      aclocal.m4
?      Makefile
A  +   .
M  +   camel/camel-openchange-folder.c
M  +   camel/camel/camel-private.h
M  +   camel/oc.c
M  +   camel/camel-openchange-provider.c
M  +   camel/oc_thread.c
M  +   Makefile.in
D      eplugin
D      eplugin/openchange-calendar.c
D      eplugin/openchange-lwmapi.c
D      eplugin/openchange-plugin.c
D      eplugin/openchange-addressbook.c
D      eplugin/openchange-profile.c
D      eplugin/openchange-gtk-checkname.c
D      eplugin/openchange-plugin.h
D      eplugin/openchange-gtk-auth.c
D      eplugin/org-gnome-openchange-plugin.eplug.in
D      eplugin/openchange-gtk-popup.c
M  +   configure.ac
M  +   VERSION
D      backends
D      backends/addressbook
D      backends/addressbook/e-book-backend-openchange.c
D      backends/addressbook/e-book-backend-openchange-factory.c
D      backends/addressbook/e-book-backend-openchange.h
D      backends/calendar
D      backends/calendar/e-cal-backend-openchange-factory.c
D      backends/calendar/e-cal-backend-openchange.h
D      backends/calendar/e-cal-backend-openchange.c
pvanhoof schtrumpf:~/repos/openchange/eplugin/branches/tinymail-port$ 

...
... svn diff --no-diff-deleted > differences.diff
...

-- 
Philip Van Hoof, software developer
home: me at pvanhoof dot be 
gnome: pvanhoof at gnome dot org 
http://www.pvanhoof.be/blog



Index: camel/camel-openchange-folder.c
===================================================================
--- camel/camel-openchange-folder.c	(revision 80)
+++ camel/camel-openchange-folder.c	(working copy)
@@ -43,7 +43,7 @@
 static void		openchange_refresh_info (CamelFolder *, CamelException *);
 static void		openchange_expunge (CamelFolder *, CamelException *);
 static void		openchange_sync (CamelFolder *, gboolean, CamelException *);
-static CamelMimeMessage	*openchange_get_message (CamelFolder *, const char *, 
+static CamelMimeMessage	*openchange_get_message (CamelFolder *, const char *, CamelFolderReceiveType, 
 						 CamelException *);
 static void		openchange_append_message (CamelFolder *, CamelMimeMessage *,
 						   const CamelMessageInfo *, char **, 
@@ -92,8 +92,9 @@
 	mi->flags = headers.flags;
 
 
-	mi->user_flags = NULL;
+/*	mi->user_flags = NULL;
 	mi->user_tags = NULL;
+*/
 	mi->date_received = 0;
 	mi->date_sent = headers.send;
 	mi->content = NULL;
@@ -343,7 +344,10 @@
 		free(uid[i_id]);
 	}
 	free(uid);
-	camel_folder_summary_save(folder->summary);
+	{
+	CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+	camel_folder_summary_save(folder->summary, &ex);
+	}
 	oc_thread_connect_unlock();
 	oc_thread_fs_unlock(((CamelOpenchangeFolder *)folder)->oc_thread);
 	oc_thread_i_unlock(((CamelOpenchangeFolder *)folder)->oc_thread);
@@ -374,7 +378,7 @@
 /*
 ** this function return a message from Exchange sever
 */
-static CamelMimeMessage *openchange_get_message(CamelFolder *folder, const char *uid, CamelException *ex)
+static CamelMimeMessage *openchange_get_message(CamelFolder *folder, const char *uid, CamelFolderReceiveType type, CamelException *ex)
 {
 	char				*text;
 	CamelMessageInfoBase		*header;
Index: camel/camel/camel-private.h
===================================================================
--- camel/camel/camel-private.h	(revision 80)
+++ camel/camel/camel-private.h	(working copy)
@@ -23,11 +23,6 @@
 #ifndef CAMEL_PRIVATE_H
 #define CAMEL_PRIVATE_H 1
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
 /* need a way to configure and save this data, if this header is to
    be installed.  For now, dont install it */
 
@@ -38,24 +33,34 @@
 #include <pthread.h>
 #include <libedataserver/e-msgport.h>
 
+G_BEGIN_DECLS
+
 struct _CamelFolderPrivate {
-	EMutex *lock;
-	EMutex *change_lock;
+	GStaticRecMutex lock;
+	GStaticMutex change_lock;
 	/* must require the 'change_lock' to access this */
 	int frozen;
 	struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */
 };
 
-#define CAMEL_FOLDER_LOCK(f, l) (e_mutex_lock(((CamelFolder *)f)->priv->l))
-#define CAMEL_FOLDER_UNLOCK(f, l) (e_mutex_unlock(((CamelFolder *)f)->priv->l))
+#define CAMEL_FOLDER_LOCK(f, l) \
+	(g_static_mutex_lock(&((CamelFolder *)f)->priv->l))
+#define CAMEL_FOLDER_UNLOCK(f, l) \
+	(g_static_mutex_unlock(&((CamelFolder *)f)->priv->l))
+#define CAMEL_FOLDER_REC_LOCK(f, l) \
+	(g_static_rec_mutex_lock(&((CamelFolder *)f)->priv->l))
+#define CAMEL_FOLDER_REC_UNLOCK(f, l) \
+	(g_static_rec_mutex_unlock(&((CamelFolder *)f)->priv->l))
 
 
 struct _CamelStorePrivate {
-	EMutex *folder_lock;	/* for locking folder operations */
+	GStaticRecMutex folder_lock;	/* for locking folder operations */
 };
 
-#define CAMEL_STORE_LOCK(f, l) (e_mutex_lock(((CamelStore *)f)->priv->l))
-#define CAMEL_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelStore *)f)->priv->l))
+#define CAMEL_STORE_LOCK(f, l) \
+	(g_static_rec_mutex_lock(&((CamelStore *)f)->priv->l))
+#define CAMEL_STORE_UNLOCK(f, l) \
+	(g_static_rec_mutex_unlock(&((CamelStore *)f)->priv->l))
 
 
 struct _CamelTransportPrivate {
@@ -67,13 +72,20 @@
 
 
 struct _CamelServicePrivate {
-	EMutex *connect_lock;	/* for locking connection operations */
-	EMutex *connect_op_lock;/* for locking the connection_op */
+	GStaticRecMutex connect_lock;	/* for locking connection operations */
+	GStaticMutex connect_op_lock;	/* for locking the connection_op */
 };
 
-#define CAMEL_SERVICE_LOCK(f, l) (e_mutex_lock(((CamelService *)f)->priv->l))
-#define CAMEL_SERVICE_UNLOCK(f, l) (e_mutex_unlock(((CamelService *)f)->priv->l))
-#define CAMEL_SERVICE_ASSERT_LOCKED(f, l) (e_mutex_assert_locked (((CamelService *)f)->priv->l))
+#define CAMEL_SERVICE_LOCK(f, l) \
+	(g_static_mutex_lock(&((CamelService *)(f))->priv->l))
+#define CAMEL_SERVICE_UNLOCK(f, l) \
+	(g_static_mutex_unlock(&((CamelService *)(f))->priv->l))
+#define CAMEL_SERVICE_REC_LOCK(f, l) \
+	(g_static_rec_mutex_lock(&((CamelService *)(f))->priv->l))
+#define CAMEL_SERVICE_REC_UNLOCK(f, l) \
+	(g_static_rec_mutex_unlock(&((CamelService *)(f))->priv->l))
+#define CAMEL_SERVICE_REC_TRYLOCK(f, l) \
+	(g_static_rec_mutex_trylock(&((CamelService *)(f))->priv->l))
 
 
 struct _CamelSessionPrivate {
@@ -82,7 +94,7 @@
 
 	int thread_id;
 	GHashTable *thread_active;
-	EThread *thread_queue;
+	GThreadPool *thread_pool;
 
 	GHashTable *thread_msg_op;
 };
@@ -104,12 +116,9 @@
 
 	struct _CamelStreamFilter *filter_stream;
 
-	struct _CamelIndex *index;
-	
 	GMutex *summary_lock;	/* for the summary hashtable/array */
 	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
 	GMutex *filter_lock;	/* for accessing any of the filtering/indexing stuff, since we share them */
-	GMutex *alloc_lock;	/* for setting up and using allocators */
 	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
 };
 
@@ -120,7 +129,6 @@
 struct _CamelStoreSummaryPrivate {
 	GMutex *summary_lock;	/* for the summary hashtable/array */
 	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
-	GMutex *alloc_lock;	/* for setting up and using allocators */
 	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */
 };
 
@@ -153,7 +161,6 @@
 struct _CamelCertDBPrivate {
 	GMutex *db_lock;	/* for the db hashtable/array */
 	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */
-	GMutex *alloc_lock;	/* for setting up and using allocators */
 	GMutex *ref_lock;	/* for reffing/unreffing certs */
 };
 
@@ -174,8 +181,8 @@
 const char *_camel_get_libexecdir (void) G_GNUC_CONST;
 const char *_camel_get_providerdir (void) G_GNUC_CONST;
 
-#undef EVOLUTION_LOCALEDIR
-#define EVOLUTION_LOCALEDIR _camel_get_localedir ()
+#undef LOCALEDIR
+#define LOCALEDIR _camel_get_localedir ()
 
 #undef CAMEL_LIBEXECDIR
 #define CAMEL_LIBEXECDIR _camel_get_libexecdir ()
@@ -185,7 +192,6 @@
 
 #endif /* G_OS_WIN32 */
 
-#ifdef __cplusplus
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* CAMEL_PRIVATE_H */
Index: camel/oc.c
===================================================================
--- camel/oc.c	(revision 80)
+++ camel/oc.c	(working copy)
@@ -1018,7 +1018,7 @@
 /* 	mapi_errstr("MAPIInitialize", GetLastError()); */
 	MAPI_RETVAL_IF(retval, retval, NULL);
 
-	retval = MapiLogonEx(&global_mapi_ctx->session, profname, NULL);
+	retval = MapiLogonEx(&global_mapi_ctx->session, profname/*, NULL*/);
 /* 	mapi_errstr("MapiLogonEx", GetLastError()); */
 	MAPI_RETVAL_IF(retval, retval, NULL);
 
Index: camel/camel-openchange-provider.c
===================================================================
--- camel/camel-openchange-provider.c	(revision 80)
+++ camel/camel-openchange-provider.c	(working copy)
@@ -94,7 +94,7 @@
 			return -1;
 		}
 /* 		mapi_errstr("GetDefaultProfile", GetLastError()); */
-		retval = MapiLogonEx(&global_mapi_ctx->session, profname, NULL);
+		retval = MapiLogonEx(&global_mapi_ctx->session, profname/*, NULL*/);
 /* 		mapi_errstr("MapiLogonEx", GetLastError()); */
 		MAPI_RETVAL_IF(retval, retval, NULL);
 		return (0);
Index: camel/oc_thread.c
===================================================================
--- camel/oc_thread.c	(revision 80)
+++ camel/oc_thread.c	(working copy)
@@ -207,8 +207,9 @@
 			mi->flags = headers[i_uids]->flags;
 
 
-			mi->user_flags = NULL;
+/*			mi->user_flags = NULL;
 			mi->user_tags = NULL;
+*/
 			mi->date_received = 0;
 			mi->date_sent = headers[i_uids]->send;
 			mi->content = NULL;
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 80)
+++ Makefile.in	(working copy)
@@ -1,10 +1,5 @@
-# Makefile for OpenChange Eplugin
-# Written by Jelmer Vernooij <jelmer samba org>, 2005.
-# Update by Julien Kerihuel <j kerihuel openchange org>, 2007.
-
-# -Wstrict-prototypes
 CC= CC@
-CFLAGS= CFLAGS@ -I. -Wall -g3 -Icamel/
+CFLAGS= CFLAGS@ -I. -Wall -g3 -Icamel/ @EVOLUTION_PLUGIN_CFLAGS@ @LIBMAPI_CFLAGS@
 PIDL= PIDL@
 PERL= PERL@
 DSOOPT=-shared -fPIC
@@ -23,28 +18,8 @@
 
 top_builddir=${PWD}
 
-# Evolution plugin compilation rule
-EVOLUTION_PLUGIN= EVOLUTION_PLUGIN@
-EVOLUTION_CAMEL= EVOLUTION_CAMEL@
-EVOLUTION_CALENDAR= EVOLUTION_CALENDAR@
-EVOLUTION_EBOOK= EVOLUTION_EBOOK@
-
-EVOLUTION_PLUGIN_INSTALL= EVOLUTION_PLUGIN_INSTALL@
-EVOLUTION_PLUGIN_UNINSTALL= EVOLUTION_PLUGIN_UNINSTALL@
-
-EVOLUTION_CAMEL_INSTALL= EVOLUTION_CAMEL_INSTALL@
-EVOLUTION_CAMEL_UNINSTALL= EVOLUTION_CAMEL_UNINSTALL@
-
-EVOLUTION_CALENDAR_INSTALL= EVOLUTION_CALENDAR_INSTALL@
-EVOLUTION_CALENDAR_UNINSTALL= EVOLUTION_CALENDAR_UNINSTALL@
-
-EVOLUTION_EBOOK_INSTALL= EVOLUTION_EBOOK_INSTALL@
-EVOLUTION_EBOOK_UNINSTALL= EVOLUTION_EBOOK_UNINSTALL@
-
 INTLTOOL_MERGE= INTLTOOL_MERGE@
-plugindir= plugindir@
 camel_providerdir= camel_providerdir@
-extensiondir= extensiondir@
 
 EVOLUTION_PLUGIN_LIBS= EVOLUTION_PLUGIN_LIBS@ @LIBMAPI_LIBS@
 EVOLUTION_PLUGIN_CFLAGS= EVOLUTION_PLUGIN_CFLAGS@ @LIBMAPI_CFLAGS@
@@ -57,61 +32,27 @@
 # Portability hack...
 CFLAGS+=-Duint_t="unsigned int" 
 
-all: $(EVOLUTION_PLUGIN) $(EVOLUTION_CAMEL) $(EVOLUTION_CALENDAR) $(EVOLUTION_EBOOK)
+all: evolution-camel
 
-install: all $(EVOLUTION_PLUGIN_INSTALL) $(EVOLUTION_CAMEL_INSTALL) $(EVOLUTION_CALENDAR_INSTALL) $(EVOLUTION_EBOOK_INSTALL)
+install: all evolution-camel-install
 
-uninstall: $(EVOLUTION_PLUGIN_UNINSTALL) $(EVOLUTION_CAMEL_UNINSTALL) $(EVOLUTION_CALENDAR_UNINSTALL) $(EVOLUTION_EBOOK_UNINSTALL)
+uninstall: evolution-camel-uninstall
 
 re: clean install
 
 # Evolution plugin compilation
 
-$(EVOLUTION_PLUGIN): $(PLUGINNAME).$(SHLIBEXT)
-$(EVOLUTION_CAMEL):  $(CAMELNAME).$(SHLIBEXT)
-$(EVOLUTION_CALENDAR):  $(OPCCALNAME).$(SHLIBEXT)
-$(EVOLUTION_EBOOK):  $(OPCEBOOKNAME).$(SHLIBEXT)
+evolution-camel:  $(CAMELNAME).$(SHLIBEXT)
 
-evolution-plugin-install: $(EVOLUTION_PLUGIN)
-	cp $(PLUGINNAME).$(SHLIBEXT) $(plugindir)
-	cp eplugin/org-gnome-openchange-plugin.eplug  $(plugindir)/org-gnome-openchange-plugin.eplug
-
-evolution-camel-install: $(EVOLUTION_CAMEL)
+evolution-camel-install: evolution-camel
 	cp camel/libcamelopenchange.urls $(camel_providerdir)
 	cp libcamelopenchange.$(SHLIBEXT) $(camel_providerdir)
 
-evolution-calendar-install: $(EVOLUTION_CALENDAR)
-	cp $(OPCCALNAME).$(SHLIBEXT) $(extensiondir)
-
-evolution-ebook-install: $(EVOLUTION_EBOOK)
-	cp $(OPCEBOOKNAME).$(SHLIBEXT) $(extensiondir)
-
-evolution-plugin-uninstall:
-	rm -f $(plugindir)/$(PLUGINNAME).$(SHLIBEXT)
-	rm -f $(plugindir)/org-gnome-openchange-plugin.eplug
-
 evolution-camel-uninstall:
 	rm -f $(camel_providerdir)/libcamelopenchange.urls
 	rm -f $(camel_providerdir)/libcamelopenchange.$(SHLIBEXT)
 
-evolution-calendar-uninstall:
-	rm -f $(extensiondir)/$(OPCCALNAME).$(SHLIBEXT)
 
-evolution-ebook-uninstall:
-	rm -f $(extensiondir)/$(OPCEBOOKNAME).$(SHLIBEXT)
-
-
-$(PLUGINNAME).$(SHLIBEXT):	eplugin/openchange-plugin.o		\
-				eplugin/openchange-gtk-auth.o		\
-				eplugin/openchange-gtk-checkname.o	\
-				eplugin/openchange-gtk-popup.o		\
-				eplugin/openchange-lwmapi.o		\
-				eplugin/openchange-calendar.o		\
-				eplugin/openchange-addressbook.o	\
-				eplugin/openchange-profile.o
-	@echo "Linking $<"
-	@$(CC) -o $@ $(DSOOPT) $^ -L. $(EVOLUTION_PLUGIN_LIBS)
-
 $(CAMELNAME).$(SHLIBEXT): 	camel/camel-openchange-provider.o	\
 				camel/camel-openchange-store.o		\
 				camel/camel-openchange-store-summary.o	\
@@ -120,26 +61,9 @@
 				camel/camel-openchange-folder.o		\
 				camel/oc_thread.o
 	@echo "Linking $<"
-	@$(CC) -o $@ $(DSOOPT) $^ -L. $(EVOLUTION_PLUGIN_LIBS)
+	@$(CC) -o $@ $(DSOOPT) $^ -L. $(EVOLUTION_PLUGIN_LIBS) $(LIBMAPI_LIBS)
 
 
-$(OPCCALNAME).$(SHLIBEXT): 	backends/calendar/e-cal-backend-openchange.o		\
-				backends/calendar/e-cal-backend-openchange-factory.o
-	@echo "Linking $<"
-	@$(CC) -o $@ $(DSOOPT) $^ -L. $(EVOLUTION_PLUGIN_LIBS)
-
-
-$(OPCEBOOKNAME).$(SHLIBEXT): 	backends/addressbook/e-book-backend-openchange.o	\
-				backends/addressbook/e-book-backend-openchange-factory.o
-	@echo "Linking $<"
-	@$(CC) -o $@ $(DSOOPT) $^ -L. $(EVOLUTION_PLUGIN_LIBS)
-
-%.o: CFLAGS+=$(EVOLUTION_PLUGIN_CFLAGS)
-
-.c.o:
-	@echo "Compiling $<"
-	@$(CC) -DLDIF_DATADIR=\"$(LDIF_DATADIR)\" $(EPLUGINS_UI_CFLAGS) $(CFLAGS) -c $< -o $@
-
 realdistclean: distclean
 	rm -rf config.h config.h.in config.log config.status
 
Index: eplugin/openchange-calendar.c (deleted)
===================================================================
Index: eplugin/openchange-lwmapi.c (deleted)
===================================================================
Index: eplugin/openchange-plugin.c (deleted)
===================================================================
Index: eplugin/openchange-addressbook.c (deleted)
===================================================================
Index: eplugin/openchange-profile.c (deleted)
===================================================================
Index: eplugin/openchange-gtk-checkname.c (deleted)
===================================================================
Index: eplugin/openchange-plugin.h (deleted)
===================================================================
Index: eplugin/openchange-gtk-auth.c (deleted)
===================================================================
Index: eplugin/org-gnome-openchange-plugin.eplug.in (deleted)
===================================================================
Index: eplugin/openchange-gtk-popup.c (deleted)
===================================================================
Index: configure.ac
===================================================================
--- configure.ac	(revision 80)
+++ configure.ac	(working copy)
@@ -1,6 +1,3 @@
-# Simple configuration script for openchange evolution plugin
-# Written by Julien Kerihuel <j kerihuel openchange org>
-
 AC_PREREQ(2.57)
 AC_INIT(eplugin, 0.1, [openchange openchange org])
 AC_CONFIG_HEADER([config.h])
@@ -8,70 +5,20 @@
 
 AC_PROG_CC
 
-dnl ****************************
-dnl Check for evolution plugins 
-dnl ****************************
+AC_ARG_WITH(camel-liteprovider, [  --camel-lite=[version] Use Tinymail camel-lite Provider version.],
+				   camel_version="$withval", camel_version="1.2" )
 
-AC_ARG_WITH(evolution, [  --evolution=[version] Use Evolution version.],
-			evolution_version="$withval", evolution_version="2.8")	
+PKG_CHECK_MODULES(EVOLUTION_PLUGIN, glib-2.0 camel-lite-provider-${camel_version})
 
-AC_ARG_WITH(evolution-camelprovider, [  --evolution-camel=[version] Use Evolution Camel Provider version.],
-				   evolution_camel_version="$withval", evolution_camel_version="1.2" )
-
-PKG_CHECK_MODULES(EVOLUTION_PLUGIN, evolution-plugin-${evolution_version} evolution-data-server-${evolution_camel_version} camel-provider-${evolution_camel_version})
-
 PKG_CHECK_MODULES(LIBMAPI, libmapi)
 
-GETTEXT_PACKAGE=evolution
+GETTEXT_PACKAGE=camel-lite
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package Name for Gettext])
 
-dnl Add evolution plugin rules here
-EVOLUTION_PLUGIN="evolution-plugin"
-AC_SUBST(EVOLUTION_PLUGIN)
-
-EVOLUTION_CAMEL="evolution-camel"
-AC_SUBST(EVOLUTION_CAMEL)
-
-EVOLUTION_CALENDAR="evolution-calendar"
-AC_SUBST(EVOLUTION_CALENDAR)
-
-EVOLUTION_EBOOK="evolution-ebook"
-AC_SUBST(EVOLUTION_EBOOK)
-
-EVOLUTION_PLUGIN_INSTALL="evolution-plugin-install"
-AC_SUBST(EVOLUTION_PLUGIN_INSTALL)
-
-EVOLUTION_CAMEL_INSTALL="evolution-camel-install"
-AC_SUBST(EVOLUTION_CAMEL_INSTALL)
-
-EVOLUTION_CALENDAR_INSTALL="evolution-calendar-install"
-AC_SUBST(EVOLUTION_CALENDAR_INSTALL)
-
-EVOLUTION_EBOOK_INSTALL="evolution-ebook-install"
-AC_SUBST(EVOLUTION_EBOOK_INSTALL)
-
-EVOLUTION_PLUGIN_UNINSTALL="evolution-plugin-uninstall"
-AC_SUBST(EVOLUTION_PLUGIN_UNINSTALL)
-
-EVOLUTION_CAMEL_UNINSTALL="evolution-camel-uninstall"
-AC_SUBST(EVOLUTION_CAMEL_UNINSTALL)
-
-EVOLUTION_CALENDAR_UNINSTALL="evolution-calendar-uninstall"
-AC_SUBST(EVOLUTION_CALENDAR_UNINSTALL)
-
-EVOLUTION_EBOOK_UNINSTALL="evolution-ebook-uninstall"
-AC_SUBST(EVOLUTION_EBOOK_UNINSTALL)
-
-plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-${evolution_version}`
-AC_SUBST(plugindir)
-
-camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir camel-provider-${evolution_camel_version}`
+camel_providerdir=`$PKG_CONFIG --variable=camel_providerdir camel-provider-${camel_version}`
 AC_SUBST(camel_providerdir)
 
-extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-${evolution_camel_version}`
-AC_SUBST(extensiondir)
-
 ldif_datadir=`$PKG_CONFIG --variable=datadir libmapi`/setup
 AC_SUBST(ldif_datadir)
 
@@ -79,5 +26,5 @@
 dnl Makefiles 
 dnl ***********************
 
-AC_CONFIG_FILES([Makefile eplugin/org-gnome-openchange-plugin.eplug])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
Index: VERSION
===================================================================
--- VERSION	(revision 80)
+++ VERSION	(working copy)
@@ -1 +1 @@
-openchange-eplugin-0.1 TP1
+openchange-eplugin-0.1.1 TP1-TNY
Index: backends/addressbook/e-book-backend-openchange.c (deleted)
===================================================================
Index: backends/addressbook/e-book-backend-openchange-factory.c (deleted)
===================================================================
Index: backends/addressbook/e-book-backend-openchange.h (deleted)
===================================================================
Index: backends/calendar/e-cal-backend-openchange-factory.c (deleted)
===================================================================
Index: backends/calendar/e-cal-backend-openchange.h (deleted)
===================================================================
Index: backends/calendar/e-cal-backend-openchange.c (deleted)
===================================================================