Convert the vCard Bonobo control to an EMFormatHook plugin.

18 files changed, 1871 insertions, 553 deletions

diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
index feea79d88f..52bc377115 100644
--- a/addressbook/gui/component/component-factory.c
+++ b/addressbook/gui/component/component-factory.c
@@ -31,7 +31,6 @@
 #include "addressbook-view.h"
 #include "autocompletion-config.h"
 #include "eab-popup-control.h"
-#include "eab-vcard-control.h"
 #ifdef ENABLE_SMIME
 #include "smime/gui/certificate-manager.h"
 #endif
@@ -40,7 +39,6 @@
 
 #define FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_Factory:" BASE_VERSION
 
-#define VCARD_CONTROL_ID               "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION
 #define COMPONENT_ID                   "OAFIID:GNOME_Evolution_Addressbook_Component:" BASE_VERSION
 #define ADDRESS_POPUP_ID               "OAFIID:GNOME_Evolution_Addressbook_AddressPopup:" BASE_VERSION
 #define COMPLETION_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:" BASE_VERSION
@@ -56,8 +54,6 @@ factory (BonoboGenericFactory *factory,
 {
 	d(printf ("asked to activate component_id `%s'\n", component_id));
 
-	if (strcmp (component_id, VCARD_CONTROL_ID) == 0)
-		return BONOBO_OBJECT (eab_vcard_control_new ());
 	if (strcmp (component_id, COMPONENT_ID) == 0) {
 		BonoboObject *object = BONOBO_OBJECT (addressbook_component_peek ());
 		bonobo_object_ref (object);
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index c3a14d8aeb..ebdf49ef40 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -37,8 +37,6 @@ libeabwidgets_la_SOURCES =			\
 	eab-popup.h				\
 	eab-popup-control.c			\
 	eab-popup-control.h			\
-	eab-vcard-control.c			\
-	eab-vcard-control.h			\
 	e-minicard.c				\
 	e-minicard.h				\
 	e-minicard-label.c			\
diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c
deleted file mode 100644
index 1e890167f6..0000000000
--- a/addressbook/gui/widgets/eab-vcard-control.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Authors:
- *		Chris Lahey <clahey@ximian.com>
- *		Chris Toshok <toshok@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-persist.h>
-#include <bonobo/bonobo-persist-stream.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <e-util/e-util.h>
-
-#include <libebook/e-book.h>
-#include <libebook/e-contact.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <addressbook/gui/widgets/eab-contact-display.h>
-#include <addressbook/util/eab-book-util.h>
-
-#include "eab-vcard-control.h"
-#include "eab-contact-merging.h"
-
-typedef struct {
-	EABContactDisplay *display;
-	GList *card_list;
-	GtkWidget *label;
-	EABContactDisplayRenderMode render_mode;
-} EABVCardControl;
-
-#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	char *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data, length + buffer->_length + 1);
-
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data)
-		data[length] = '\0';
-	else
-		data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	GList *list;
-	char *vcard;
-	EABVCardControl *vcard_control = data;
-
-	if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 &&
-	    g_ascii_strcasecmp (type, "text/x-vCard") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcard = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	g_list_foreach (
-		vcard_control->card_list,
-		(GFunc) g_object_unref, NULL);
-	g_list_free (vcard_control->card_list);
-
-	list = eab_contact_list_from_string (vcard);
-	g_free(vcard);
-	vcard_control->card_list = list;
-	if (list) {
-		eab_contact_display_render (vcard_control->display, E_CONTACT (list->data),
-					    vcard_control->render_mode);
-	}
-	if (list && list->next) {
-		char *message;
-		int length = g_list_length (list) - 1;
-		message = g_strdup_printf (ngettext("There is one other contact.",
-						    "There are %d other contacts.", length),
-					   length);
-		gtk_label_set_text (GTK_LABEL (vcard_control->label), message);
-		g_free (message);
-		gtk_widget_show (vcard_control->label);
-	} else {
-		gtk_widget_hide (vcard_control->label);
-	}
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EABVCardControl *vcard_control = data;
-	char             *vcard;
-	int               length;
-
-	if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 &&
-	    g_ascii_strcasecmp (type, "text/x-vCard") != 0) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	vcard = eab_contact_list_to_string (vcard_control->card_list);
-	length = strlen (vcard);
-	bonobo_stream_client_write (stream, vcard, length, ev);
-	g_free (vcard);
-} /* pstream_save */
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = closure;
-	if (status == E_BOOK_ERROR_OK) {
-		GList *p;
-		for (p = list; p; p = p->next) {
-			/* XXX argh, more passing of NULL's for callbacks */
-			eab_merging_book_add_contact (book, E_CONTACT (p->data), NULL, NULL);
-		}
-	}
-	if (book)
-		g_object_unref (book);
-	g_list_foreach (list, (GFunc) g_object_unref, NULL);
-	g_list_free (list);
-}
-
-static void
-save_in_addressbook(GtkWidget *button, gpointer data)
-{
-	EABVCardControl *vcard_control = data;
-	GList *list, *p;
-
-	list = g_list_copy (vcard_control->card_list);
-
-	for (p = list; p; p = p->next)
-		g_object_ref (p->data);
-
-	addressbook_load_default_book (book_open_cb, list);
-}
-
-static void
-toggle_full_vcard(GtkWidget *button, gpointer data)
-{
-	EABVCardControl *vcard_control = data;
-	char *label;
-
-	if (!vcard_control->card_list)
-		return;
-
-	if (vcard_control->render_mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
-		vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
-		label = _("Show Full vCard");
-	}
-	else {
-		vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
-		label = _("Show Compact vCard");
-	}
-
-	gtk_button_set_label (GTK_BUTTON (button), label);
-	eab_contact_display_render (vcard_control->display, E_CONTACT (vcard_control->card_list->data),
-				    vcard_control->render_mode);
-}
-
-static void
-free_struct (gpointer data, GObject *where_object_was)
-{
-	EABVCardControl *vcard_control = data;
-
-	g_list_foreach (
-		vcard_control->card_list,
-		(GFunc) g_object_unref, NULL);
-	g_list_free (vcard_control->card_list);
-	g_free (vcard_control);
-}
-
-BonoboControl *
-eab_vcard_control_new (void)
-{
-	BonoboControl       *control;
-	BonoboPersistStream *stream;
-	GtkWidget	    *display;
-	GtkWidget           *button1, *button2;
-	GtkWidget           *bbox;
-	GtkWidget           *vbox;
-
-	EABVCardControl    *vcard_control = g_new (EABVCardControl, 1);
-
-	vcard_control->card_list = NULL;
-	vcard_control->display = NULL;
-	vcard_control->label = NULL;
-
-	vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
-
-	/* Create the control. */
-
-	display = eab_contact_display_new ();
-	vcard_control->display = EAB_CONTACT_DISPLAY (display);
-
-	bbox = gtk_hbutton_box_new ();
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
-	gtk_box_set_spacing (GTK_BOX (bbox), 12);
-
-	button1 = gtk_button_new_with_label(_("Show Full vCard"));
-	g_signal_connect (button1, "clicked",
-			  G_CALLBACK (toggle_full_vcard), vcard_control);
-	gtk_box_pack_start (GTK_BOX (bbox), button1, FALSE, FALSE, 0);
-
-	button2 = gtk_button_new_with_label(_("Save in address book"));
-	g_signal_connect (button2, "clicked",
-			  G_CALLBACK (save_in_addressbook), vcard_control);
-	gtk_box_pack_start (GTK_BOX (bbox), button2, FALSE, FALSE, 0);
-
-	/* This is intentionally not shown. */
-	vcard_control->label = gtk_label_new ("");
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), display, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), vcard_control->label, TRUE, TRUE, 0);
-	gtk_widget_show_all (bbox);
-	gtk_widget_show (display);
-	gtk_widget_show (vbox);
-
-	control = bonobo_control_new (vbox);
-
-	g_object_weak_ref (G_OBJECT (control), free_struct, vcard_control);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_content_types,
-					    VCARD_CONTROL_ID,
-					    vcard_control);
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return control;
-}
diff --git a/addressbook/gui/widgets/eab-vcard-control.h b/addressbook/gui/widgets/eab-vcard-control.h
deleted file mode 100644
index 06ca62727a..0000000000
--- a/addressbook/gui/widgets/eab-vcard-control.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef __EAB_VCARD_CONTROL_H__
-#define __EAB_VCARD_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *eab_vcard_control_new (void);
-
-#endif /* __EAB_VCARD_CONTROL_H__ */
diff --git a/configure.in b/configure.in
index 3793b086a6..45e54f854c 100644
--- a/configure.in
+++ b/configure.in
@@ -1785,7 +1785,7 @@ plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatte
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " 
 all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
 
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import" 
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline"
 
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
@@ -2120,6 +2120,7 @@ plugins/startup-wizard/Makefile
 plugins/subject-thread/Makefile
 plugins/templates/Makefile
 plugins/tnef-attachments/Makefile
+plugins/vcard-inline/Makefile
 plugins/webdav-account-setup/Makefile
 smime/Makefile
 smime/lib/Makefile
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index f20af59683..bc2f4e25bf 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -46,11 +46,6 @@
 
 #include <glib/gi18n.h>
 
-#include <bonobo/bonobo-control-frame.h>
-#include <bonobo/bonobo-stream-memory.h>
-#include <bonobo/bonobo-widget.h>
-#include <bonobo-activation/bonobo-activation-mime.h>
-
 #include <camel/camel-stream.h>
 #include <camel/camel-stream-filter.h>
 #include <camel/camel-stream-mem.h>
@@ -174,8 +169,6 @@ static void efhd_format_optional(EMFormat *, CamelStream *, CamelMimePart *, Cam
 static void efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid);
 static void efhd_complete(EMFormat *);
 
-static gboolean efhd_bonobo_object(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject); 	 
-static gboolean efhd_use_component(const char *mime_type);
 static void efhd_builtin_init(EMFormatHTMLDisplayClass *efhc);
 
 enum {
@@ -187,8 +180,6 @@ enum {
 
 static guint efhd_signals[EFHD_LAST_SIGNAL] = { 0 };
 
-/* EMFormatHandler's for bonobo objects */
-static GHashTable *efhd_bonobo_handlers;
 static EMFormatHTMLClass *efhd_parent;
 static EMFormatClass *efhd_format_class;
 
@@ -338,7 +329,7 @@ efhd_class_init(GObjectClass *klass)
 }
 
 GType
-em_format_html_display_get_type(void)
+em_format_html_display_get_type (void)
 {
 	static GType type = 0;
 
@@ -354,8 +345,6 @@ em_format_html_display_get_type(void)
 		efhd_parent = g_type_class_ref(em_format_html_get_type());
 		efhd_format_class = g_type_class_ref(em_format_get_type());
 		type = g_type_register_static(em_format_html_get_type(), "EMFormatHTMLDisplay", &info, 0);
-
-		efhd_bonobo_handlers = g_hash_table_new(g_str_hash, g_str_equal);
 	}
 
 	return type;
@@ -1274,38 +1263,10 @@ efhd_builtin_init(EMFormatHTMLDisplayClass *efhc)
 		em_format_class_add_handler((EMFormatClass *)efhc, &type_builtin_table[i]);
 }
 
-/* ********************************************************************** */
-static void 	 
-efhd_bonobo_unknown(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info) 	 
-{ 	 
-	char *classid; 	 
-	  	 
-	classid = g_strdup_printf("bonobo-unknown:///em-format-html-display/%s", emf->part_id->str); 	 
-	em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object); 	 
-	camel_stream_printf(stream, "<object classid=\"%s\" type=\"%s\"></object><br>\n", classid, info->mime_type); 	 
-	g_free(classid); 	 
-} 	 
-	  	 
-	 /* ********************************************************************** */
-static const EMFormatHandler *efhd_find_handler(EMFormat *emf, const char *mime_type)
+static const EMFormatHandler *
+efhd_find_handler(EMFormat *emf, const char *mime_type)
 {
-	const EMFormatHandler *handle;
-	  	 
-	if ( (handle = ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type)) == NULL 	 
-		&& efhd_use_component(mime_type) 	 
-		&& (handle = g_hash_table_lookup(efhd_bonobo_handlers, mime_type)) == NULL) {
-
-		EMFormatHandler *h = g_malloc0(sizeof(*h)); 	 
-	  	 
-		h->mime_type = g_strdup(mime_type); 	 
-		h->handler = efhd_bonobo_unknown; 	 
-		h->flags = EM_FORMAT_HANDLER_INLINE_DISPOSITION; 	 
-		g_hash_table_insert(efhd_bonobo_handlers, h->mime_type, h); 	 
-	  	 
-		handle = h; 	 
-	} 	 
-	  	 
-	return handle;	
+	return ((EMFormatClass *) efhd_parent)->find_handler (emf, mime_type);
 }
 
 static void efhd_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *src)
@@ -1843,155 +1804,6 @@ efhd_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri)
 	}
 }
 
-static gboolean 	 
-efhd_bonobo_object(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject) 	 
-{ 	 
-	CamelDataWrapper *wrapper; 	 
-	Bonobo_ServerInfo *component; 	 
-	GtkWidget *embedded; 	 
-	Bonobo_PersistStream persist; 	 
-	CORBA_Environment ev; 	 
-	CamelStreamMem *cstream; 	 
-	BonoboStream *bstream; 	 
-	BonoboControlFrame *control_frame; 	 
-	Bonobo_PropertyBag prop_bag; 	 
-	 
-	component = bonobo_activation_get_default_component_for_mime_type (eb->type); 	 
-	if (component == NULL) 	 
-		return FALSE; 	 
-	 
-	embedded = bonobo_widget_new_control(component->iid, NULL); 	 
-	CORBA_free(component); 	 
-	if (embedded == NULL) 	 
-		return FALSE; 	 
-	 
-	CORBA_exception_init(&ev); 	 
-	 
-	control_frame = bonobo_widget_get_control_frame((BonoboWidget *)embedded); 	 
-	prop_bag = bonobo_control_frame_get_control_property_bag(control_frame, NULL); 	 
-	if (prop_bag != CORBA_OBJECT_NIL) { 	 
-		/* 	 
-		 * Now we can take care of business. Currently, the only control 	 
-		 * that needs something passed to it through a property bag is 	 
-		 * the iTip control, and it needs only the From email address, 	 
-		 * but perhaps in the future we can generalize this section of code 	 
-		 * to pass a bunch of useful things to all embedded controls. 	 
-		 */ 	 
-		const CamelInternetAddress *from; 	 
-		char *from_address; 	 
-	
-		from = camel_mime_message_get_from((CamelMimeMessage *)((EMFormat *)efh)->message); 	 
-		from_address = camel_address_encode((CamelAddress *)from); 	 
-		bonobo_property_bag_client_set_value_string(prop_bag, "from_address", from_address, &ev); 	 
-		g_free(from_address); 	 
-	 
-		Bonobo_Unknown_unref(prop_bag, &ev); 	 
-	} 	 
-	 
-	persist = (Bonobo_PersistStream)Bonobo_Unknown_queryInterface(bonobo_widget_get_objref((BonoboWidget *)embedded), 	 
-									"IDL:Bonobo/PersistStream:1.0", &ev); 	 
-	if (persist == CORBA_OBJECT_NIL) { 	 
-		g_object_ref_sink(embedded); 	 
-		CORBA_exception_free(&ev); 	 
-		return FALSE; 	 
-	} 	 
-	 
-	/* Write the data to a CamelStreamMem... */ 	 
-	cstream = (CamelStreamMem *)camel_stream_mem_new(); 	 
-	wrapper = camel_medium_get_content_object((CamelMedium *)pobject->part); 	 
-	if (FALSE && !g_ascii_strncasecmp (eb->type, "text/", 5)) { 	 
-		/* do charset conversion, etc */ 	 
-		d(printf("performing charset conversion for %s component\n", eb->type)); 	 
-		em_format_format_text((EMFormat *)efh, (CamelStream *)cstream, wrapper); 	 
-	} else { 	 
-		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) cstream); 	 
-	} 	 
-	 
-	/* ...convert the CamelStreamMem to a BonoboStreamMem... */ 	 
-	bstream = bonobo_stream_mem_create((char *)cstream->buffer->data, cstream->buffer->len, TRUE, FALSE); 	 
-	camel_object_unref(cstream); 	 
-	 
-	/* ...and hydrate the PersistStream from the BonoboStream. */ 	 
-	Bonobo_PersistStream_load(persist, 	 
-				  bonobo_object_corba_objref(BONOBO_OBJECT (bstream)), 	 
-				  eb->type, &ev); 	 
-	bonobo_object_unref(BONOBO_OBJECT (bstream)); 	 
-	Bonobo_Unknown_unref(persist, &ev); 	 
-	CORBA_Object_release(persist, &ev); 	 
-	 
-	if (ev._major != CORBA_NO_EXCEPTION) { 	 
-		g_object_ref_sink(embedded); 	 
-		CORBA_exception_free(&ev); 	 
-		return FALSE; 	 
-	} 	 
-	CORBA_exception_free(&ev); 	 
-	 
-	gtk_widget_show(embedded); 	 
-	gtk_container_add(GTK_CONTAINER (eb), embedded); 	 
-	 
-	return TRUE; 	 
-} 	 
- 	 
-static gboolean 	 
-efhd_check_server_prop(Bonobo_ServerInfo *component, const char *propname, const char *value) 	 
-{ 	 
-	CORBA_sequence_CORBA_string stringv; 	 
-	Bonobo_ActivationProperty *prop; 	 
-	int i; 	 
-	 
-	prop = bonobo_server_info_prop_find(component, propname); 	 
-	if (!prop || prop->v._d != Bonobo_ACTIVATION_P_STRINGV) 	 
-		return FALSE; 	 
-	 
-	stringv = prop->v._u.value_stringv; 	 
-	for (i = 0; i < stringv._length; i++) { 	 
-		if (!g_ascii_strcasecmp(value, stringv._buffer[i])) 	 
-			return TRUE; 	 
-	} 	 
-	 
-	return FALSE; 	 
-} 	 
- 	 
-static gboolean 	 
-efhd_use_component(const char *mime_type) 	 
-{ 	 
-	GList *components, *iter; 	 
-	Bonobo_ServerInfo *component = NULL; 	 
-	 
-	/* should this cache it? */ 	 
-	 
-	if (g_ascii_strcasecmp(mime_type, "text/x-vcard") != 0 	 
-	    && g_ascii_strcasecmp(mime_type, "text/calendar") != 0) { 	 
-		const char **mime_types; 	 
-		int i; 	 
-	 
-		mime_types = mail_config_get_allowable_mime_types(); 	 
-		for (i = 0; mime_types[i]; i++) { 	 
-			if (!g_ascii_strcasecmp(mime_types[i], mime_type)) 	 
-				goto type_ok; 	 
-		} 	 
-		return FALSE; 	 
-	} 	 
-type_ok: 	 
-	components = bonobo_activation_get_all_components_for_mime_type (mime_type); 	 
-	for (iter = components; iter; iter = iter->next) { 	 
-		Bonobo_ServerInfo *comp = iter->data; 	 
-	 
-		comp = iter->data; 	 
-		if (efhd_check_server_prop(comp, "repo_ids", "IDL:Bonobo/PersistStream:1.0") 	 
-		    && efhd_check_server_prop(comp, "bonobo:supported_mime_types", mime_type)) { 	 
-			component = comp; 	 
-			break; 	 
-		} 	 
-	}
-	
-	/* FIXME: How should I free the Bonobo_ServerInfo's ? */
-	g_list_foreach (components, (GFunc)CORBA_free, NULL);
-	g_list_free (components);
-	 
-	return component != NULL; 	 
-}
-
 static void
 efhd_bar_resize (EMFormatHTML *efh,
                  GtkAllocation *event)
@@ -2097,16 +1909,8 @@ efhd_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
 		stream, "</font></td></tr><tr></table>\n"
 		EM_FORMAT_HTML_VPAD);
 
-	if (handle) {
-		if (info->shown)
-			handle->handler(emf, stream, part, handle);
-         } else if (efhd_use_component(mime_type)) { 	 
-	                 g_free(classid); /* messy */ 	 
-	  	 
-	                 classid = g_strdup_printf("bonobo-unknown:///em-format-html-display/%s", emf->part_id->str); 	 
-	                 em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object); 	 
-	                 camel_stream_printf(stream, "<object classid=\"%s\" type=\"%s\"></object><br>>\n", classid, mime_type);		
-	}
+	if (handle && info->shown)
+		handle->handler(emf, stream, part, handle);
 
 	g_free(classid);
 }
diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la
new file mode 120000
index 0000000000..4ffc357ca7
--- /dev/null
+++ b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la
@@ -0,0 +1 @@
+../liborg-gnome-vcard-inline.la
\ No newline at end of file
diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai
new file mode 100644
index 0000000000..21c94c82d7
--- /dev/null
+++ b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai
@@ -0,0 +1,41 @@
+# liborg-gnome-vcard-inline.la - a libtool library file
+# Generated by ltmain.sh (GNU libtool) 2.2.6
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='liborg-gnome-vcard-inline.so'
+
+# Names of this library.
+library_names='liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so'
+
+# The name of the static archive.
+old_library=''
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=' -pthread'
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/home/mbarnes/local/lib /home/mbarnes/local/lib/libedataserverui-1.2.la -L/usr/lib -L/usr/kerberos/lib -lgnome-keyring /home/mbarnes/local/lib/libebook-1.2.la /home/mbarnes/local/lib/libcamel-1.2.la -lssl3 -lsmime3 -lnss3 -lnssutil3 -lkrb5 -lk5crypto -lcom_err -lgssapi_krb5 /home/mbarnes/local/lib/libedataserver-1.2.la -lplds4 -lplc4 -lnspr4 -lsasl2 -lssl -lcrypto -lz -lsqlite3 -lsoup-2.4 /home/mbarnes/local/lib/libgtkhtml-editor.la /home/mbarnes/local/lib/libgtkhtml-3.14.la /home/mbarnes/local/lib/libgailutil.la -lXext -lXrender -lXinerama -lXrandr -lXcursor -lX11 -lXcomposite -lXdamage -lXfixes -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 /home/mbarnes/local/lib/libgthread-2.0.la -lpthread -lrt /home/mbarnes/local/lib/libgtk-x11-2.0.la -lxml2 /home/mbarnes/local/lib/libgdk-x11-2.0.la -latk-1.0 -lpangoft2-1.0 /home/mbarnes/local/lib/libgdk_pixbuf-2.0.la /home/mbarnes/local/lib/libgio-2.0.la -lselinux -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig /home/mbarnes/local/lib/libgobject-2.0.la /home/mbarnes/local/lib/libgmodule-2.0.la -ldl /home/mbarnes/local/lib/libglib-2.0.la'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for liborg-gnome-vcard-inline.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/home/mbarnes/local/lib/evolution/2.28/plugins'
diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so
new file mode 100755
index 0000000000..a7ab796fe3
--- /dev/null
+++ b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so
diff --git a/plugins/vcard-inline/.libs/vcard-inline.o b/plugins/vcard-inline/.libs/vcard-inline.o
new file mode 100644
index 0000000000..a75afa9adc
--- /dev/null
+++ b/plugins/vcard-inline/.libs/vcard-inline.o
diff --git a/plugins/vcard-inline/Makefile b/plugins/vcard-inline/Makefile
new file mode 100644
index 0000000000..bb9369d04c
--- /dev/null
+++ b/plugins/vcard-inline/Makefile
@@ -0,0 +1,719 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# plugins/vcard-inline/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/evolution
+pkglibdir = $(libdir)/evolution
+pkgincludedir = $(includedir)/evolution
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+subdir = plugins/vcard-inline
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+liborg_gnome_vcard_inline_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_liborg_gnome_vcard_inline_la_OBJECTS = vcard-inline.lo
+liborg_gnome_vcard_inline_la_OBJECTS =  \
+	$(am_liborg_gnome_vcard_inline_la_OBJECTS)
+liborg_gnome_vcard_inline_la_LINK = $(LIBTOOL) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_vcard_inline_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES)
+DIST_SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES)
+pluginDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(plugin_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+A11Y_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/atk-1.0  
+A11Y_LIBS = -L/home/mbarnes/local/lib -latk-1.0 -lgobject-2.0 -lglib-2.0  
+ACLOCAL = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run aclocal-1.10 
+ALL_LINGUAS = 
+AMTAR = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run tar
+AR = ar
+AS = as
+AUTOCONF = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run automake-1.10
+AWK = gawk
+BASE_VERSION = 2.28
+BONOBOUI_REQUIRED = 2.4.2
+CAMEL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0   $(WERROR) 
+CAMEL_EXCHANGE_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/evolution-data-server-2.28/exchange -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4   $(WERROR) 
+CAMEL_EXCHANGE_LIBS = -pthread -L/home/mbarnes/local/lib -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lexchange-storage-1.2 -lecal-1.2 -lical -licalss -licalvcal -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   
+CAMEL_GROUPWISE_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28/groupwise -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0   $(WERROR) 
+CAMEL_GROUPWISE_LIBS = -pthread -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -ledataserver-1.2 -lxml2 -lgconf-2 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -legroupwise-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0   
+CAMEL_LIBS = -pthread -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   
+CATALOGS = 
+CATOBJEXT = .gmo
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CERT_UI_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0   $(WERROR)  -I/usr/include/nss3 -I/usr/include/nspr4   $(WERROR) 
+CERT_UI_LIBS = -pthread -L/home/mbarnes/local/lib -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lbonobo-activation -lORBit-2 -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0      -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl   
+CFLAGS = -g -O0 -Wall -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wformat -Wall -Wmissing-prototypes  -Wno-sign-compare
+CPP = gcc -E
+CPPFLAGS = 
+CYGPATH_W = echo
+DATADIRNAME = share
+DATASERVER_EXEC_VERSION = 2.28
+DATASERVER_IDL = /home/mbarnes/local/share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper 
+DLLTOOL = dlltool
+DOC_USER_FORMATS = 
+DOLT_BASH = /bin/bash
+DSYMUTIL = 
+DTAPPINTEGRATE = no
+DUMPBIN = 
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGREP = /bin/grep -E
+EVOLUTION_ADDRESSBOOK_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/enchant -I/usr/include/libsoup-2.4   $(WERROR) 
+EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4   $(WERROR) 
+EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -ledataserverui-1.2 -lebook-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lsoup-2.4 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0   
+EVOLUTION_ADDRESSBOOK_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -ledataserverui-1.2 -lebook-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lsoup-2.4 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0   
+EVOLUTION_CALENDAR_CFLAGS = -pthread -DORBIT2=1 -DDBUS_API_SUBJECT_TO_CHANGE -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4 -I/usr/include/hal   $(WERROR) 
+EVOLUTION_CALENDAR_CONDUIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12   $(WERROR) -pthread -DORBIT2=1 -DDBUS_API_SUBJECT_TO_CHANGE -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4 -I/usr/include/hal   $(WERROR) 
+EVOLUTION_CALENDAR_CONDUIT_LIBS = -pthread -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0   -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lebackend-1.2 -lhal -lnotify -ldbus-glib-1 -ldbus-1 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0   
+EVOLUTION_CALENDAR_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lebackend-1.2 -lhal -lnotify -ldbus-glib-1 -ldbus-1 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0   
+EVOLUTION_DATA_SERVER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28/groupwise -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12  
+EVOLUTION_DATA_SERVER_LIBS = -pthread -L/home/mbarnes/local/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -legroupwise-1.2 -lebackend-1.2 -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
+EVOLUTION_DIR = /home/mbarnes/git/gnome/evolution
+EVOLUTION_MAIL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/nss3 -I/usr/include/nspr4   $(WERROR) 
+EVOLUTION_MAIL_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   
+EVOLUTION_TEST_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12   $(WERROR) 
+EVOLUTION_TEST_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lgnomevfs-2 -lgconf-2 -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lbonobo-2 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   
+EXEEXT = 
+E_NAME_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12   $(WERROR) 
+E_NAME_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lgnomevfs-2 -lgconf-2 -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lbonobo-2 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   
+E_UTIL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libsoup-2.4 -I/usr/include/nspr4   $(WERROR)    
+E_UTIL_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -lplds4 -lplc4 -lnspr4 -lpthread -ldl   -lpthread  -lX11  
+E_WIDGETS_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4   $(WERROR) 
+E_WIDGETS_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   
+FGREP = /bin/grep -F
+FOUND_DBUS_VERSION = 1200
+GCONFTOOL = /usr/bin/gconftool-2
+GCONF_SCHEMA_CONFIG_SOURCE = xml:merged:/etc/gconf/gconf.xml.defaults
+GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas
+GETTEXT_PACKAGE = evolution-2.28
+GIT_CFLAGS =  
+GIT_LIBS =  
+GLIB_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include  
+GLIB_GENMARSHAL = glib-genmarshal
+GLIB_LIBS = -L/home/mbarnes/local/lib -lglib-2.0  
+GLIB_MKENUMS = glib-mkenums
+GMOFILES = 
+GMSGFMT = /usr/bin/msgfmt
+GNOME_PILOT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12  
+GNOME_PILOT_LIBS = -pthread -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0  
+GNOME_PLATFORM_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1  
+GNOME_PLATFORM_LIBS = -pthread -L/home/mbarnes/local/lib -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lxml2  
+GOBJECT_QUERY = gobject-query
+GREP = /bin/grep
+GSTREAMER_CFLAGS = -pthread -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/gstreamer-0.10 -I/usr/include/libxml2  
+GSTREAMER_LIBS = -pthread -L/home/mbarnes/local/lib -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lxml2 -lglib-2.0  
+GTKHTML_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/gconf/2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2  
+GTKHTML_DATADIR = /home/mbarnes/local/share/gtkhtml-3.14
+GTKHTML_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
+HAL_CFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
+HAL_LIBS = -L/lib -lhal -ldbus-1  
+HAVE_DBUS = 
+HAVE_JW = yes
+HELP_DIR = ${datadir}/gnome/help
+ICONV_CFLAGS = 
+ICONV_LIBS = 
+IDL_INCLUDES = -I /usr/share/idl/bonobo-2.0 -I /usr/share/idl/bonobo-activation-2.0 -I /home/mbarnes/local/share/idl/evolution-data-server-1.2
+IMPORTERS_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1   $(WERROR) 
+IMPORTERS_LIBS = -pthread -L/home/mbarnes/local/lib -ledataserverui-1.2 -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+INSTOBJEXT = .mo
+INTERFACE_VERSION = 2.28
+INTLLIBS = 
+INTLTOOL_EXTRACT = /usr/bin/intltool-extract
+INTLTOOL_MERGE = /usr/bin/intltool-merge
+INTLTOOL_PERL = /usr/bin/perl
+INTLTOOL_UPDATE = /usr/bin/intltool-update
+JW = /usr/bin/jw
+KDE_APPLNK_DIR = 
+KILL_PROCESS_CMD = /usr/bin/killall
+KRB4_CFLAGS = 
+KRB4_LIBS = 
+KRB5_CFLAGS = 
+KRB5_LIBS = 
+LD = /usr/bin/ld
+LDAP_CFLAGS = -DLDAP_DEPRECATED
+LDAP_LIBS =  -lldap -llber -lresolv -lnsl
+LDFLAGS = -Wl,--as-needed
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBEXCHANGESTORAGE_CFLAGS = -I/home/mbarnes/local/include/evolution-data-server-2.28/exchange -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2  
+LIBEXCHANGESTORAGE_LIBS = -L/home/mbarnes/local/lib -lexchange-storage-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
+LIBFILTER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4   $(WERROR) 
+LIBFILTER_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lglade-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   
+LIBGWEATHER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libxml2 -I/usr/include/libsoup-2.4 -I/usr/include/gconf/2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
+LIBGWEATHER_LIBS = -L/home/mbarnes/local/lib -lgweather -lgtk-x11-2.0 -lgconf-2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
+LIBNOTIFY_CFLAGS = -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12  
+LIBNOTIFY_LIBS = -L/home/mbarnes/local/lib -L/lib -lnotify -lgtk-x11-2.0 -ldbus-glib-1 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgmodule-2.0 -ldbus-1 -lgobject-2.0 -lglib-2.0  
+LIBOBJS = 
+LIBPST_CFLAGS = 
+LIBPST_LIBS = 
+LIBS = 
+LIBSOUP_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2   $(WERROR) 
+LIBSOUP_LIBS = -L/home/mbarnes/local/lib -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0   
+LIBTOOL = $(top_builddir)/doltlibtool
+LIPO = 
+LN_S = ln -s
+LTCOMPILE = $(top_builddir)/doltcompile $(COMPILE)
+LTCXXCOMPILE = $(top_builddir)/doltcompile $(CXXCOMPILE)
+LTLIBOBJS = 
+MAINT = 
+MAKEINFO = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run makeinfo
+MANUAL_NSPR_CFLAGS = 
+MANUAL_NSPR_LIBS = 
+MANUAL_NSS_CFLAGS = 
+MANUAL_NSS_LIBS = 
+MKDIR_P = /bin/mkdir -p
+MKINSTALLDIRS = ./mkinstalldirs
+MONO_CFLAGS = 
+MONO_LIBS = 
+MOZILLA_NSS_CFLAGS = -I/usr/include/nss3 -I/usr/include/nspr4   $(WERROR) 
+MOZILLA_NSS_LIBS = -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl   
+MSGFMT = /usr/bin/msgfmt
+MSGFMT_OPTS = -c
+MSGMERGE = /usr/bin/msgmerge
+NM = /usr/bin/nm -B
+NMEDIT = 
+NMN_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
+NMN_LIBS = -L/home/mbarnes/local/lib -L/lib -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0  
+NM_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
+NM_LIBS = -L/home/mbarnes/local/lib -L/lib -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0  
+NO_UNDEFINED = 
+OBJDUMP = objdump
+OBJEXT = o
+OMF_DIR = ${datadir}/omf
+ORBIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/orbit-2.0
+ORBIT_CONFIG = /usr/bin/orbit2-config
+ORBIT_IDL = /usr/bin/orbit-idl-2
+ORBIT_LIBS = -pthread -L/home/mbarnes/local/lib -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -lm
+OTOOL = 
+OTOOL64 = 
+PACKAGE = evolution
+PACKAGE_BUGREPORT = http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution
+PACKAGE_NAME = evolution
+PACKAGE_STRING = evolution 2.27.2
+PACKAGE_TARNAME = evolution
+PACKAGE_VERSION = 2.27.2
+PATH_SEPARATOR = :
+PERL = /usr/bin/perl
+PILOT_LINK_MAJOR = 0
+PILOT_LINK_MICRO = 3
+PILOT_LINK_MINOR = 12
+PILOT_LINK_PATCH = 
+PILOT_LINK_VERSION = 0.12.3
+PISOCK_CFLAGS = 
+PISOCK_LIBS = -lpisock -lpisync
+PKG_CONFIG = /usr/bin/pkg-config
+POFILES = 
+POSUB = po
+PO_IN_DATADIR_FALSE = 
+PO_IN_DATADIR_TRUE = 
+PTHREAD_LIB = -lpthread
+PURIFY = impure 
+PY_INCLUDES = 
+PY_LIBS = 
+RANLIB = ranlib
+REGEX_LIBS = 
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/sh
+SHELL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant   $(WERROR) 
+SHELL_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgmodule-2.0 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0   
+SOEXT = .so
+STRIP = strip
+THREADS_CFLAGS = 
+THREADS_LIBS = -lpthread
+TNEF_CFLAGS = -DHAVE_LIBYTNEF_YTNEF_H
+TZDIALOG_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   $(WERROR) -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1  
+TZDIALOG_LIBS = -pthread -L/home/mbarnes/local/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0   -pthread -L/home/mbarnes/local/lib -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lxml2  
+UPGRADE_REVISION = 0
+USE_NLS = yes
+VERSION = 2.27.2
+WARN_CFLAGS = -Wall -Wmissing-prototypes 
+WINDRES = :
+XGETTEXT = /usr/bin/xgettext
+XMKMF = 
+X_CFLAGS =  
+X_EXTRA_LIBS = 
+X_LIBS = -lX11  
+X_PRE_LIBS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /home/mbarnes/git/gnome/evolution/plugins/vcard-inline
+abs_srcdir = /home/mbarnes/git/gnome/evolution/plugins/vcard-inline
+abs_top_builddir = /home/mbarnes/git/gnome/evolution
+abs_top_srcdir = /home/mbarnes/git/gnome/evolution
+ac_ct_CC = gcc
+ac_ct_DUMPBIN = 
+all_plugins_base = calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup sa-junk-plugin bogo-junk-plugin exchange-operations mono
+all_plugins_experimental = folder-unsubscribe external-editor hula-account-setup ipod-sync tnef-attachments
+all_plugins_standard = bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = tar --format=ustar -chf - "$$tardir"
+am__untar = tar -xf -
+bindir = ${exec_prefix}/bin
+bindir_in_server_file = ${exec_prefix}/bin
+build = i686-pc-linux-gnu
+build_alias = 
+build_cpu = i686
+build_os = linux-gnu
+build_vendor = pc
+builddir = .
+componentdir = ${libdir}/evolution/2.28/components
+componentdir_in_server_file = ${libdir}/evolution/2.28/components
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+etspecdir = ${datadir}/evolution/2.28/etspec
+evolutionhelpdir = ${datadir}/evolution/2.28/help
+evolutionuidir = ${datadir}/evolution/2.28/ui
+exec_prefix = ${prefix}
+gladedir = ${datadir}/evolution/2.28/glade
+host = i686-pc-linux-gnu
+host_alias = 
+host_cpu = i686
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+idldir = ${datadir}/idl/evolution-2.28
+images16dir = ${datadir}/evolution/2.28/images/16x16
+images48dir = ${datadir}/evolution/2.28/images/48x48
+imagesdir = ${datadir}/evolution/2.28/images
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = $(SHELL) /home/mbarnes/git/gnome/evolution/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = $(prefix)/$(DATADIRNAME)/locale
+localstatedir = ${prefix}/var
+lt_ECHO = echo
+mandir = ${datarootdir}/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+plugindir = ${libdir}/evolution/2.28/plugins
+plugins_enabled = calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup sa-junk-plugin bogo-junk-plugin exchange-operations bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates  vcard-inline
+prefix = /home/mbarnes/local
+privconduitdir = ${libdir}/evolution/2.28/conduits
+privdatadir = ${datadir}/evolution/2.28
+privincludedir = ${includedir}/evolution-2.28
+privlibdir = ${libdir}/evolution/2.28
+privlibexecdir = ${libexecdir}/evolution/2.28
+privlibexecdir_in_server_file = ${libexecdir}/evolution/2.28
+privsolibdir = ${libdir}/evolution/2.28
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pythonpath = 
+sbindir = ${exec_prefix}/sbin
+serverdir = ${exec_prefix}/lib/bonobo/servers
+sharedstatedir = ${prefix}/com
+soundsdir = ${datadir}/evolution/2.28/sounds
+srcdir = .
+sysconfdir = ${prefix}/etc
+target_alias = 
+top_build_prefix = ../../
+top_builddir = ../..
+top_srcdir = ../..
+viewsdir = ${datadir}/evolution/2.28/views
+INCLUDES = \
+	-I$(top_srcdir)			\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	\
+	$(EVOLUTION_MAIL_CFLAGS)
+
+plugin_DATA = org-gnome-vcard-inline.eplug
+plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la
+liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
+liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_vcard_inline_la_LIBADD = \
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
+
+EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
+BUILT_SOURCES = $(plugin_DATA)
+CLEANFILES = $(BUILT_SOURCES)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/vcard-inline/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  plugins/vcard-inline/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pluginLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	done
+
+clean-pluginLTLIBRARIES:
+	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+liborg-gnome-vcard-inline.la: $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_DEPENDENCIES) 
+	$(liborg_gnome_vcard_inline_la_LINK) -rpath $(plugindir) $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/vcard-inline.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pluginDATA: $(plugin_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	  $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+uninstall-pluginDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pluginDATA install-pluginLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginDATA \
+	install-pluginLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+
+%.eplug: %.eplug.in
+	sed -e 's|\@PLUGINDIR\@|$(plugindir)|'		\
+	-e 's|\@SOEXT\@|$(SOEXT)|'			\
+	-e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|'	\
+	-e 's|\@LOCALEDIR\@|$(localedir)|' $< > $@
+
+%.eplug.in: %.eplug.xml
+	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
+
+%.error: %.error.xml
+	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
+	$(EVOLUTION_MAIL_LIBS)
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
new file mode 100644
index 0000000000..781eb53bd4
--- /dev/null
+++ b/plugins/vcard-inline/Makefile.am
@@ -0,0 +1,20 @@
+INCLUDES = \
+	-I$(top_srcdir)			\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	\
+	$(EVOLUTION_MAIL_CFLAGS)
+
+@EVO_PLUGIN_RULE@
+
+plugin_DATA = org-gnome-vcard-inline.eplug
+plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la
+
+liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
+liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_vcard_inline_la_LIBADD =	\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
+	$(EVOLUTION_MAIL_LIBS)
+
+EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
+
+BUILT_SOURCES = $(plugin_DATA)
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/vcard-inline/Makefile.in b/plugins/vcard-inline/Makefile.in
new file mode 100644
index 0000000000..a1f373a63f
--- /dev/null
+++ b/plugins/vcard-inline/Makefile.in
@@ -0,0 +1,709 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/vcard-inline
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"
+pluginLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+liborg_gnome_vcard_inline_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_liborg_gnome_vcard_inline_la_OBJECTS = vcard-inline.lo
+liborg_gnome_vcard_inline_la_OBJECTS =  \
+	$(am_liborg_gnome_vcard_inline_la_OBJECTS)
+liborg_gnome_vcard_inline_la_LINK = $(LIBTOOL) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_vcard_inline_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES)
+DIST_SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES)
+pluginDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(plugin_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+A11Y_CFLAGS = @A11Y_CFLAGS@
+A11Y_LIBS = @A11Y_LIBS@
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASE_VERSION = @BASE_VERSION@
+BONOBOUI_REQUIRED = @BONOBOUI_REQUIRED@
+CAMEL_CFLAGS = @CAMEL_CFLAGS@
+CAMEL_EXCHANGE_CFLAGS = @CAMEL_EXCHANGE_CFLAGS@
+CAMEL_EXCHANGE_LIBS = @CAMEL_EXCHANGE_LIBS@
+CAMEL_GROUPWISE_CFLAGS = @CAMEL_GROUPWISE_CFLAGS@
+CAMEL_GROUPWISE_LIBS = @CAMEL_GROUPWISE_LIBS@
+CAMEL_LIBS = @CAMEL_LIBS@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CERT_UI_CFLAGS = @CERT_UI_CFLAGS@
+CERT_UI_LIBS = @CERT_UI_LIBS@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@
+DATASERVER_IDL = @DATASERVER_IDL@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DOLT_BASH = @DOLT_BASH@
+DSYMUTIL = @DSYMUTIL@
+DTAPPINTEGRATE = @DTAPPINTEGRATE@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@
+EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@
+EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@
+EVOLUTION_ADDRESSBOOK_LIBS = @EVOLUTION_ADDRESSBOOK_LIBS@
+EVOLUTION_CALENDAR_CFLAGS = @EVOLUTION_CALENDAR_CFLAGS@
+EVOLUTION_CALENDAR_CONDUIT_CFLAGS = @EVOLUTION_CALENDAR_CONDUIT_CFLAGS@
+EVOLUTION_CALENDAR_CONDUIT_LIBS = @EVOLUTION_CALENDAR_CONDUIT_LIBS@
+EVOLUTION_CALENDAR_LIBS = @EVOLUTION_CALENDAR_LIBS@
+EVOLUTION_DATA_SERVER_CFLAGS = @EVOLUTION_DATA_SERVER_CFLAGS@
+EVOLUTION_DATA_SERVER_LIBS = @EVOLUTION_DATA_SERVER_LIBS@
+EVOLUTION_DIR = @EVOLUTION_DIR@
+EVOLUTION_MAIL_CFLAGS = @EVOLUTION_MAIL_CFLAGS@
+EVOLUTION_MAIL_LIBS = @EVOLUTION_MAIL_LIBS@
+EVOLUTION_TEST_CFLAGS = @EVOLUTION_TEST_CFLAGS@
+EVOLUTION_TEST_LIBS = @EVOLUTION_TEST_LIBS@
+EXEEXT = @EXEEXT@
+E_NAME_CFLAGS = @E_NAME_CFLAGS@
+E_NAME_LIBS = @E_NAME_LIBS@
+E_UTIL_CFLAGS = @E_UTIL_CFLAGS@
+E_UTIL_LIBS = @E_UTIL_LIBS@
+E_WIDGETS_CFLAGS = @E_WIDGETS_CFLAGS@
+E_WIDGETS_LIBS = @E_WIDGETS_LIBS@
+FGREP = @FGREP@
+FOUND_DBUS_VERSION = @FOUND_DBUS_VERSION@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIT_CFLAGS = @GIT_CFLAGS@
+GIT_LIBS = @GIT_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_PILOT_CFLAGS = @GNOME_PILOT_CFLAGS@
+GNOME_PILOT_LIBS = @GNOME_PILOT_LIBS@
+GNOME_PLATFORM_CFLAGS = @GNOME_PLATFORM_CFLAGS@
+GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
+GTKHTML_DATADIR = @GTKHTML_DATADIR@
+GTKHTML_LIBS = @GTKHTML_LIBS@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
+HAVE_DBUS = @HAVE_DBUS@
+HAVE_JW = @HAVE_JW@
+HELP_DIR = @HELP_DIR@
+ICONV_CFLAGS = @ICONV_CFLAGS@
+ICONV_LIBS = @ICONV_LIBS@
+IDL_INCLUDES = @IDL_INCLUDES@
+IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@
+IMPORTERS_LIBS = @IMPORTERS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTERFACE_VERSION = @INTERFACE_VERSION@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+JW = @JW@
+KDE_APPLNK_DIR = @KDE_APPLNK_DIR@
+KILL_PROCESS_CMD = @KILL_PROCESS_CMD@
+KRB4_CFLAGS = @KRB4_CFLAGS@
+KRB4_LIBS = @KRB4_LIBS@
+KRB5_CFLAGS = @KRB5_CFLAGS@
+KRB5_LIBS = @KRB5_LIBS@
+LD = @LD@
+LDAP_CFLAGS = @LDAP_CFLAGS@
+LDAP_LIBS = @LDAP_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBEXCHANGESTORAGE_CFLAGS = @LIBEXCHANGESTORAGE_CFLAGS@
+LIBEXCHANGESTORAGE_LIBS = @LIBEXCHANGESTORAGE_LIBS@
+LIBFILTER_CFLAGS = @LIBFILTER_CFLAGS@
+LIBFILTER_LIBS = @LIBFILTER_LIBS@
+LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@
+LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@
+LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
+LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBPST_CFLAGS = @LIBPST_CFLAGS@
+LIBPST_LIBS = @LIBPST_LIBS@
+LIBS = @LIBS@
+LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
+LIBSOUP_LIBS = @LIBSOUP_LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@
+MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@
+MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@
+MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_CFLAGS = @MONO_CFLAGS@
+MONO_LIBS = @MONO_LIBS@
+MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@
+MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NMN_CFLAGS = @NMN_CFLAGS@
+NMN_LIBS = @NMN_LIBS@
+NM_CFLAGS = @NM_CFLAGS@
+NM_LIBS = @NM_LIBS@
+NO_UNDEFINED = @NO_UNDEFINED@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+ORBIT_CFLAGS = @ORBIT_CFLAGS@
+ORBIT_CONFIG = @ORBIT_CONFIG@
+ORBIT_IDL = @ORBIT_IDL@
+ORBIT_LIBS = @ORBIT_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PILOT_LINK_MAJOR = @PILOT_LINK_MAJOR@
+PILOT_LINK_MICRO = @PILOT_LINK_MICRO@
+PILOT_LINK_MINOR = @PILOT_LINK_MINOR@
+PILOT_LINK_PATCH = @PILOT_LINK_PATCH@
+PILOT_LINK_VERSION = @PILOT_LINK_VERSION@
+PISOCK_CFLAGS = @PISOCK_CFLAGS@
+PISOCK_LIBS = @PISOCK_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PTHREAD_LIB = @PTHREAD_LIB@
+PURIFY = @PURIFY@
+PY_INCLUDES = @PY_INCLUDES@
+PY_LIBS = @PY_LIBS@
+RANLIB = @RANLIB@
+REGEX_LIBS = @REGEX_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHELL_CFLAGS = @SHELL_CFLAGS@
+SHELL_LIBS = @SHELL_LIBS@
+SOEXT = @SOEXT@
+STRIP = @STRIP@
+THREADS_CFLAGS = @THREADS_CFLAGS@
+THREADS_LIBS = @THREADS_LIBS@
+TNEF_CFLAGS = @TNEF_CFLAGS@
+TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@
+TZDIALOG_LIBS = @TZDIALOG_LIBS@
+UPGRADE_REVISION = @UPGRADE_REVISION@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+all_plugins_base = @all_plugins_base@
+all_plugins_experimental = @all_plugins_experimental@
+all_plugins_standard = @all_plugins_standard@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+bindir_in_server_file = @bindir_in_server_file@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+componentdir = @componentdir@
+componentdir_in_server_file = @componentdir_in_server_file@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+etspecdir = @etspecdir@
+evolutionhelpdir = @evolutionhelpdir@
+evolutionuidir = @evolutionuidir@
+exec_prefix = @exec_prefix@
+gladedir = @gladedir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+idldir = @idldir@
+images16dir = @images16dir@
+images48dir = @images48dir@
+imagesdir = @imagesdir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+plugindir = @plugindir@
+plugins_enabled = @plugins_enabled@
+prefix = @prefix@
+privconduitdir = @privconduitdir@
+privdatadir = @privdatadir@
+privincludedir = @privincludedir@
+privlibdir = @privlibdir@
+privlibexecdir = @privlibexecdir@
+privlibexecdir_in_server_file = @privlibexecdir_in_server_file@
+privsolibdir = @privsolibdir@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pythonpath = @pythonpath@
+sbindir = @sbindir@
+serverdir = @serverdir@
+sharedstatedir = @sharedstatedir@
+soundsdir = @soundsdir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+viewsdir = @viewsdir@
+INCLUDES = \
+	-I$(top_srcdir)			\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	\
+	$(EVOLUTION_MAIL_CFLAGS)
+
+plugin_DATA = org-gnome-vcard-inline.eplug
+plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la
+liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
+liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_vcard_inline_la_LIBADD = \
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
+
+EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
+BUILT_SOURCES = $(plugin_DATA)
+CLEANFILES = $(BUILT_SOURCES)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/vcard-inline/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  plugins/vcard-inline/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pluginLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	done
+
+clean-pluginLTLIBRARIES:
+	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+liborg-gnome-vcard-inline.la: $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_DEPENDENCIES) 
+	$(liborg_gnome_vcard_inline_la_LINK) -rpath $(plugindir) $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcard-inline.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pluginDATA: $(plugin_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	  $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+uninstall-pluginDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pluginDATA install-pluginLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pluginDATA \
+	install-pluginLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+
+@EVO_PLUGIN_RULE@
+	$(EVOLUTION_MAIL_LIBS)
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/plugins/vcard-inline/liborg-gnome-vcard-inline.la b/plugins/vcard-inline/liborg-gnome-vcard-inline.la
new file mode 100644
index 0000000000..3af19da824
--- /dev/null
+++ b/plugins/vcard-inline/liborg-gnome-vcard-inline.la
@@ -0,0 +1,41 @@
+# liborg-gnome-vcard-inline.la - a libtool library file
+# Generated by ltmain.sh (GNU libtool) 2.2.6
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='liborg-gnome-vcard-inline.so'
+
+# Names of this library.
+library_names='liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so'
+
+# The name of the static archive.
+old_library=''
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=' -pthread'
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/home/mbarnes/local/lib /home/mbarnes/local/lib/libedataserverui-1.2.la -L/usr/lib -L/usr/kerberos/lib -lgnome-keyring /home/mbarnes/local/lib/libebook-1.2.la /home/mbarnes/local/lib/libcamel-1.2.la -lssl3 -lsmime3 -lnss3 -lnssutil3 -lkrb5 -lk5crypto -lcom_err -lgssapi_krb5 /home/mbarnes/local/lib/libedataserver-1.2.la -lplds4 -lplc4 -lnspr4 -lsasl2 -lssl -lcrypto -lz -lsqlite3 -lsoup-2.4 /home/mbarnes/local/lib/libgtkhtml-editor.la /home/mbarnes/local/lib/libgtkhtml-3.14.la /home/mbarnes/local/lib/libgailutil.la -lXext -lXrender -lXinerama -lXrandr -lXcursor -lX11 -lXcomposite -lXdamage -lXfixes -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 /home/mbarnes/local/lib/libgthread-2.0.la -lpthread -lrt /home/mbarnes/local/lib/libgtk-x11-2.0.la -lxml2 /home/mbarnes/local/lib/libgdk-x11-2.0.la -latk-1.0 -lpangoft2-1.0 /home/mbarnes/local/lib/libgdk_pixbuf-2.0.la /home/mbarnes/local/lib/libgio-2.0.la -lselinux -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig /home/mbarnes/local/lib/libgobject-2.0.la /home/mbarnes/local/lib/libgmodule-2.0.la -ldl /home/mbarnes/local/lib/libglib-2.0.la'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for liborg-gnome-vcard-inline.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=no
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/home/mbarnes/local/lib/evolution/2.28/plugins'
diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug b/plugins/vcard-inline/org-gnome-vcard-inline.eplug
new file mode 100644
index 0000000000..6221f9bcfc
--- /dev/null
+++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<e-plugin-list>
+  <e-plugin type="shlib" location="/home/mbarnes/local/lib/evolution/2.28/plugins/liborg-gnome-vcard-inline.so" id="org.gnome.evolution.plugin.vcardInline" name="Inline vCards">
+
+    <author name="Matthew Barnes" email="mbarnes@redhat.com"/>
+    <description>Show vCards directly in mail messages.</description>
+
+    <hook class="org.gnome.evolution.mail.format:1.0">
+      <group id="EMFormatHTMLDisplay">
+        <item mime_type="text/vCard" format="org_gnome_vcard_inline_format" flags="inline_disposition"/>
+        <item mime_type="text/x-vCard" format="org_gnome_vcard_inline_format" flags="inline_disposition"/>
+      </group>
+    </hook>
+
+  </e-plugin>
+</e-plugin-list>
\ No newline at end of file
diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
new file mode 100644
index 0000000000..c54587d369
--- /dev/null
+++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<e-plugin-list>
+  <e-plugin
+    type="shlib"
+    id="org.gnome.evolution.plugin.vcardInline"
+    location="@PLUGINDIR@/liborg-gnome-vcard-inline@SOEXT@"
+    _name="Inline vCards">
+
+    <author name="Matthew Barnes" email="mbarnes@redhat.com"/>
+    <_description>
+      Show vCards directly in mail messages.
+    </_description>
+
+    <hook class="org.gnome.evolution.mail.format:1.0">
+      <group id="EMFormatHTMLDisplay">
+        <item
+          mime_type="text/vCard"
+          format="org_gnome_vcard_inline_format"
+          flags="inline_disposition"/>
+        <item
+          mime_type="text/x-vCard"
+          format="org_gnome_vcard_inline_format"
+          flags="inline_disposition"/>
+      </group>
+    </hook>
+
+  </e-plugin>
+</e-plugin-list>
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
new file mode 100644
index 0000000000..68c9813da5
--- /dev/null
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -0,0 +1,284 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
+#include <libebook/e-book.h>
+#include <libebook/e-contact.h>
+#include <camel/camel-medium.h>
+#include <camel/camel-mime-part.h>
+#include <camel/camel-stream-mem.h>
+#include <gtkhtml/gtkhtml-embedded.h>
+
+#include "addressbook/gui/component/addressbook.h"
+#include "addressbook/gui/merging/eab-contact-merging.h"
+#include "addressbook/gui/widgets/eab-contact-display.h"
+#include "addressbook/util/eab-book-util.h"
+#include "mail/em-format-hook.h"
+#include "mail/em-format-html.h"
+
+#define d(x)
+
+typedef struct _VCardInlinePObject VCardInlinePObject;
+
+struct _VCardInlinePObject {
+	EMFormatHTMLPObject object;
+
+	GList *contact_list;
+	GtkWidget *contact_display;
+	GtkWidget *message_label;
+	EABContactDisplayRenderMode mode;
+};
+
+static gint org_gnome_vcard_inline_classid;
+
+/* Forward Declarations */
+void org_gnome_vcard_inline_format (void *ep, EMFormatHookTarget *target);
+
+static void
+org_gnome_vcard_inline_pobject_free (EMFormatHTMLPObject *object)
+{
+	VCardInlinePObject *vcard_object;
+
+	vcard_object = (VCardInlinePObject *) object;
+
+	g_list_foreach (
+		vcard_object->contact_list,
+		(GFunc) g_object_unref, NULL);
+	g_list_free (vcard_object->contact_list);
+	vcard_object->contact_list = NULL;
+
+	if (vcard_object->contact_display != NULL) {
+		g_object_unref (vcard_object->contact_display);
+		vcard_object->contact_display = NULL;
+	}
+
+	if (vcard_object->message_label != NULL) {
+		g_object_unref (vcard_object->message_label);
+		vcard_object->message_label = NULL;
+	}
+}
+
+static void
+org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
+                               CamelMimePart *mime_part)
+{
+	CamelDataWrapper *data_wrapper;
+	CamelMedium *medium;
+	CamelStream *stream;
+	GList *contact_list;
+	GByteArray *array;
+	const gchar *string;
+
+	array = g_byte_array_new ();
+	medium = CAMEL_MEDIUM (mime_part);
+
+	/* Stream takes ownership of the byte array. */
+	stream = camel_stream_mem_new_with_byte_array (array);
+	data_wrapper = camel_medium_get_content_object (medium);
+	camel_data_wrapper_decode_to_stream (data_wrapper, stream);
+
+	string = (gchar *) array->data;
+	contact_list = eab_contact_list_from_string (string);
+	vcard_object->contact_list = contact_list;
+
+	camel_object_unref (data_wrapper);
+	camel_object_unref (stream);
+}
+
+static void
+org_gnome_vcard_inline_book_open_cb (EBook *book,
+                                     EBookStatus status,
+                                     gpointer user_data)
+{
+	GList *contact_list = user_data;
+	GList *iter;
+
+	if (status != E_BOOK_ERROR_OK)
+		goto exit;
+
+	for (iter = contact_list; iter != NULL; iter = iter->next)
+		eab_merging_book_add_contact (
+			book, E_CONTACT (iter->data), NULL, NULL);
+
+exit:
+	if (book != NULL)
+		g_object_unref (book);
+
+	g_list_foreach (contact_list, (GFunc) g_object_unref, NULL);
+	g_list_free (contact_list);
+}
+
+static void
+org_gnome_vcard_inline_save_cb (VCardInlinePObject *vcard_object)
+{
+	GList *contact_list;
+
+	contact_list = g_list_copy (vcard_object->contact_list);
+	g_list_foreach (contact_list, (GFunc) g_object_ref, NULL);
+
+	addressbook_load_default_book (
+		org_gnome_vcard_inline_book_open_cb, contact_list);
+}
+
+static void
+org_gnome_vcard_inline_toggle_cb (VCardInlinePObject *vcard_object,
+                                  GtkButton *button)
+{
+	EABContactDisplay *contact_display;
+	const gchar *label;
+
+	contact_display = EAB_CONTACT_DISPLAY (vcard_object->contact_display);
+
+	/* Toggle between "full" and "compact" modes. */
+	if (vcard_object->mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
+		vcard_object->mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
+		label = _("Show Full vCard");
+	} else {
+		vcard_object->mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
+		label = _("Show Compact vCard");
+	}
+
+	gtk_button_set_label (button, label);
+
+	eab_contact_display_render (
+		EAB_CONTACT_DISPLAY (vcard_object->contact_display),
+		E_CONTACT (vcard_object->contact_list->data),
+		vcard_object->mode);
+}
+
+static gboolean
+org_gnome_vcard_inline_embed (EMFormatHTML *format,
+                              GtkHTMLEmbedded *embedded,
+                              EMFormatHTMLPObject *object)
+{
+	VCardInlinePObject *vcard_object;
+	GtkWidget *button_box;
+	GtkWidget *container;
+	GtkWidget *widget;
+	EContact *contact;
+	guint length;
+
+	vcard_object = (VCardInlinePObject *) object;
+	length = g_list_length (vcard_object->contact_list);
+
+	if (vcard_object->contact_list != NULL)
+		contact = E_CONTACT (vcard_object->contact_list->data);
+	else
+		contact = NULL;
+
+	container = GTK_WIDGET (embedded);
+
+	widget = gtk_vbox_new (FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = gtk_hbutton_box_new ();
+	gtk_button_box_set_layout (
+		GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START);
+	gtk_box_set_spacing (GTK_BOX (widget), 12);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0);
+	gtk_widget_show (widget);
+
+	button_box = widget;
+
+	widget = eab_contact_display_new ();
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	vcard_object->contact_display = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	widget = gtk_label_new (NULL);
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	vcard_object->message_label = g_object_ref (widget);
+
+	if (length == 2) {
+		const gchar *text;
+
+		text = _("There is one other contact.");
+		gtk_label_set_text (GTK_LABEL (widget), text);
+		gtk_widget_show (widget);
+
+	} else if (length > 2) {
+		gchar *text;
+
+		text = g_strdup_printf (
+			_("There are %d other contacts."), length - 1);
+		gtk_label_set_text (GTK_LABEL (widget), text);
+		gtk_widget_show (widget);
+		g_free (text);
+
+	} else
+		gtk_widget_hide (widget);
+
+	container = button_box;
+
+	widget = gtk_button_new_with_label (_("Show Full vCard"));
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
+	g_signal_connect_swapped (
+		widget, "clicked",
+		G_CALLBACK (org_gnome_vcard_inline_toggle_cb),
+		vcard_object);
+
+	widget = gtk_button_new_with_label (_("Save in Address Book"));
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
+	g_signal_connect_swapped (
+		widget, "clicked",
+		G_CALLBACK (org_gnome_vcard_inline_save_cb),
+		vcard_object);
+
+	return TRUE;
+}
+
+void
+org_gnome_vcard_inline_format (void *ep, EMFormatHookTarget *target)
+{
+	VCardInlinePObject *vcard_object;
+	gchar *classid;
+
+	classid = g_strdup_printf (
+		"org-gnome-vcard-inline-display-%d",
+		org_gnome_vcard_inline_classid++);
+
+	vcard_object = (VCardInlinePObject *)
+		em_format_html_add_pobject (
+			EM_FORMAT_HTML (target->format),
+			sizeof (VCardInlinePObject),
+			classid, target->part,
+			org_gnome_vcard_inline_embed);
+
+	camel_object_ref (target->part);
+
+	vcard_object->mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
+	vcard_object->object.free = org_gnome_vcard_inline_pobject_free;
+	org_gnome_vcard_inline_decode (vcard_object, target->part);
+
+	camel_stream_printf (
+		target->stream, "<object classid=%s></object>", classid);
+
+	g_free (classid);
+}
diff --git a/plugins/vcard-inline/vcard-inline.lo b/plugins/vcard-inline/vcard-inline.lo
new file mode 100644
index 0000000000..adb1c83857
--- /dev/null
+++ b/plugins/vcard-inline/vcard-inline.lo
@@ -0,0 +1,4 @@
+# vcard-inline.lo - a libtool object file
+# Generated by doltcompile, not libtool
+pic_object='.libs/vcard-inline.o'
+non_pic_object=none