Convert EMailPart to a GObject.

EMailPart is reference-counted, subclassed, and allows a custom
finalize function.  There's no excuse for it not to use GObject.

17 files changed, 776 insertions, 385 deletions

diff --git a/modules/audio-inline/Makefile.am b/modules/audio-inline/Makefile.am
index b53c2913fd..ad75a62ab7 100644
--- a/modules/audio-inline/Makefile.am
+++ b/modules/audio-inline/Makefile.am
@@ -15,6 +15,7 @@ module_audio_inline_la_SOURCES =				\
 	e-mail-formatter-audio.h					\
 	e-mail-parser-audio.c						\
 	e-mail-parser-audio.h						\
+	e-mail-part-audio.c						\
 	e-mail-part-audio.h						\
 	evolution-module-audio-inline.c
 
diff --git a/modules/audio-inline/e-mail-formatter-audio.c b/modules/audio-inline/e-mail-formatter-audio.c
index b700651221..fc27bb7091 100644
--- a/modules/audio-inline/e-mail-formatter-audio.c
+++ b/modules/audio-inline/e-mail-formatter-audio.c
@@ -287,7 +287,8 @@ mail_formatter_audio_get_widget (EMailFormatterExtension *extension,
 	GtkWidget *box;
 	EMailPartAudio *ai_part;
 
-	g_return_val_if_fail (E_MAIL_PART_IS (part, EMailPartAudio), NULL);
+	g_return_val_if_fail (E_IS_MAIL_PART_AUDIO (part), NULL);
+
 	ai_part = (EMailPartAudio *) part;
 
 	/* it is OK to call UI functions here, since we are called from UI thread */
diff --git a/modules/audio-inline/e-mail-parser-audio.c b/modules/audio-inline/e-mail-parser-audio.c
index c81a94bcff..c9c41335ac 100644
--- a/modules/audio-inline/e-mail-parser-audio.c
+++ b/modules/audio-inline/e-mail-parser-audio.c
@@ -23,7 +23,6 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gstdio.h>
 
 #include "e-mail-parser-audio.h"
 #include "e-mail-part-audio.h"
@@ -75,33 +74,6 @@ static const gchar *parser_mime_types[] = {
 	NULL
 };
 
-static void
-mail_part_audio_free (EMailPart *mail_part)
-{
-	EMailPartAudio *ai_part = (EMailPartAudio *) mail_part;
-
-	g_clear_object (&ai_part->play_button);
-	g_clear_object (&ai_part->pause_button);
-	g_clear_object (&ai_part->stop_button);
-
-	if (ai_part->filename) {
-		g_unlink (ai_part->filename);
-		g_free (ai_part->filename);
-		ai_part->filename = NULL;
-	}
-
-	if (ai_part->bus_id) {
-		g_source_remove (ai_part->bus_id);
-		ai_part->bus_id = 0;
-	}
-
-	if (ai_part->playbin) {
-		gst_element_set_state (ai_part->playbin, GST_STATE_NULL);
-		gst_object_unref (ai_part->playbin);
-		ai_part->playbin = NULL;
-	}
-}
-
 static gint
 mail_parser_audio_parse (EMailParserExtension *extension,
                          EMailParser *parser,
@@ -110,7 +82,7 @@ mail_parser_audio_parse (EMailParserExtension *extension,
                          GCancellable *cancellable,
                          GQueue *out_mail_queue)
 {
-	EMailPartAudio *mail_part;
+	EMailPart *mail_part;
 	GQueue work_queue = G_QUEUE_INIT;
 	gint len;
 	gint n_parts_added = 0;
@@ -120,12 +92,8 @@ mail_parser_audio_parse (EMailParserExtension *extension,
 
 	d (printf ("audio formatter: format classid %s\n", part_id->str));
 
-	mail_part = (EMailPartAudio *) e_mail_part_subclass_new (
-		part, part_id->str, sizeof (EMailPartAudio),
-		(GFreeFunc) mail_part_audio_free);
-	mail_part->parent.mime_type = camel_content_type_simple (
-		camel_mime_part_get_content_type (part));
-	mail_part->parent.is_attachment = TRUE;
+	mail_part = e_mail_part_audio_new (part, part_id->str);
+
 	g_string_truncate (part_id, len);
 
 	g_queue_push_tail (&work_queue, mail_part);
diff --git a/modules/audio-inline/e-mail-part-audio.c b/modules/audio-inline/e-mail-part-audio.c
new file mode 100644
index 0000000000..0c8ae7fa16
--- /dev/null
+++ b/modules/audio-inline/e-mail-part-audio.c
@@ -0,0 +1,142 @@
+/*
+ * e-mail-part-audio.c
+ *
+ * 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/>
+ *
+ */
+
+#include "e-mail-part-audio.h"
+
+#include <glib/gstdio.h>
+
+#define E_MAIL_PART_AUDIO_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_MAIL_PART_AUDIO, EMailPartAudioPrivate))
+
+struct _EMailPartAudioPrivate {
+	gint placeholder;
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+	EMailPartAudio,
+	e_mail_part_audio,
+	E_TYPE_MAIL_PART)
+
+static void
+mail_part_audio_dispose (GObject *object)
+{
+	EMailPartAudio *part = E_MAIL_PART_AUDIO (object);
+
+	if (part->bus_id > 0) {
+		g_source_remove (part->bus_id);
+		part->bus_id = 0;
+	}
+
+	if (part->playbin != NULL) {
+		gst_element_set_state (part->playbin, GST_STATE_NULL);
+		gst_object_unref (part->playbin);
+		part->playbin = NULL;
+	}
+
+	g_clear_object (&part->play_button);
+	g_clear_object (&part->pause_button);
+	g_clear_object (&part->stop_button);
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_mail_part_audio_parent_class)->dispose (object);
+}
+
+static void
+mail_part_audio_finalize (GObject *object)
+{
+	EMailPartAudio *part = E_MAIL_PART_AUDIO (object);
+
+	if (part->filename != NULL) {
+		g_unlink (part->filename);
+		g_free (part->filename);
+	}
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_mail_part_audio_parent_class)->finalize (object);
+}
+
+static void
+mail_part_audio_constructed (GObject *object)
+{
+	EMailPart *part;
+	CamelMimePart *mime_part;
+	CamelContentType *content_type;
+	gchar *mime_type;
+
+	part = E_MAIL_PART (object);
+
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_mail_part_audio_parent_class)->constructed (object);
+
+	e_mail_part_set_is_attachment (part, TRUE);
+
+	mime_part = e_mail_part_ref_mime_part (part);
+
+	content_type = camel_mime_part_get_content_type (mime_part);
+	mime_type = camel_content_type_simple (content_type);
+	e_mail_part_set_mime_type (part, mime_type);
+	g_free (mime_type);
+
+	g_object_unref (mime_part);
+}
+
+static void
+e_mail_part_audio_class_init (EMailPartAudioClass *class)
+{
+	GObjectClass *object_class;
+
+	g_type_class_add_private (class, sizeof (EMailPartAudioPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = mail_part_audio_dispose;
+	object_class->finalize = mail_part_audio_finalize;
+	object_class->constructed = mail_part_audio_constructed;
+}
+
+static void
+e_mail_part_audio_class_finalize (EMailPartAudioClass *class)
+{
+}
+
+static void
+e_mail_part_audio_init (EMailPartAudio *part)
+{
+	part->priv = E_MAIL_PART_AUDIO_GET_PRIVATE (part);
+}
+
+void
+e_mail_part_audio_type_register (GTypeModule *type_module)
+{
+	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+	 *     function, so we have to wrap it with a public function in
+	 *     order to register types from a separate compilation unit. */
+	e_mail_part_audio_register_type (type_module);
+}
+
+EMailPart *
+e_mail_part_audio_new (CamelMimePart *mime_part,
+                       const gchar *id)
+{
+	g_return_val_if_fail (id != NULL, NULL);
+
+	return g_object_new (
+		E_TYPE_MAIL_PART_AUDIO,
+		"id", id, "mime-part", mime_part, NULL);
+}
+
diff --git a/modules/audio-inline/e-mail-part-audio.h b/modules/audio-inline/e-mail-part-audio.h
index 628da0bc22..42459e01ff 100644
--- a/modules/audio-inline/e-mail-part-audio.h
+++ b/modules/audio-inline/e-mail-part-audio.h
@@ -19,17 +19,37 @@
 #ifndef E_MAIL_PART_AUDIO_H
 #define E_MAIL_PART_AUDIO_H
 
-#include <glib-object.h>
-
 #include <em-format/e-mail-part.h>
 #include <gst/gst.h>
 
+/* Standard GObject macros */
+#define E_TYPE_MAIL_PART_AUDIO \
+	(e_mail_part_audio_get_type ())
+#define E_MAIL_PART_AUDIO(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_MAIL_PART_AUDIO, EMailPartAudio))
+#define E_MAIL_PART_AUDIO_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_MAIL_PART_AUDIO, EMailPartAudioClass))
+#define E_IS_MAIL_PART_AUDIO(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_MAIL_PART_AUDIO))
+#define E_IS_MAIL_PART_AUDIO_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_MAIL_PART_AUDIO))
+#define E_MAIL_PART_AUDIO_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_MAIL_PART_AUDIO, EMailPartAudioClass))
+
 G_BEGIN_DECLS
 
 typedef struct _EMailPartAudio EMailPartAudio;
+typedef struct _EMailPartAudioClass EMailPartAudioClass;
+typedef struct _EMailPartAudioPrivate EMailPartAudioPrivate;
 
 struct _EMailPartAudio {
 	EMailPart parent;
+	EMailPartAudioPrivate *priv;
 
 	gchar *filename;
 	GstElement *playbin;
@@ -40,6 +60,15 @@ struct _EMailPartAudio {
 	GtkWidget  *stop_button;
 };
 
+struct _EMailPartAudioClass {
+	EMailPartClass parent_class;
+};
+
+GType		e_mail_part_audio_get_type	(void) G_GNUC_CONST;
+void		e_mail_part_audio_type_register	(GTypeModule *type_module);
+EMailPart *	e_mail_part_audio_new		(CamelMimePart *mime_part,
+						 const gchar *id);
+
 G_END_DECLS
 
 #endif /* E_MAIL_PART_AUDIO_H */
diff --git a/modules/audio-inline/evolution-module-audio-inline.c b/modules/audio-inline/evolution-module-audio-inline.c
index d58883ae1a..678bfe436c 100644
--- a/modules/audio-inline/evolution-module-audio-inline.c
+++ b/modules/audio-inline/evolution-module-audio-inline.c
@@ -18,6 +18,7 @@
 
 #include "e-mail-formatter-audio.h"
 #include "e-mail-parser-audio.h"
+#include "e-mail-part-audio.h"
 
 #include <gmodule.h>
 
@@ -28,6 +29,7 @@ const gchar * g_module_check_init (GModule *module);
 G_MODULE_EXPORT void
 e_module_load (GTypeModule *type_module)
 {
+	e_mail_part_audio_type_register (type_module);
 	e_mail_parser_audio_type_register (type_module);
 	e_mail_formatter_audio_type_register (type_module);
 }
diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am
index abb45f3f81..240e09f903 100644
--- a/modules/itip-formatter/Makefile.am
+++ b/modules/itip-formatter/Makefile.am
@@ -20,6 +20,7 @@ module_itip_formatter_la_SOURCES =					\
 	e-mail-formatter-itip.h						\
 	e-mail-parser-itip.c						\
 	e-mail-parser-itip.h						\
+	e-mail-part-itip.c						\
 	e-mail-part-itip.h						\
 	e-source-conflict-search.c					\
 	e-source-conflict-search.h					\
diff --git a/modules/itip-formatter/e-mail-parser-itip.c b/modules/itip-formatter/e-mail-parser-itip.c
index 088f79d8ae..04c08e9cc3 100644
--- a/modules/itip-formatter/e-mail-parser-itip.c
+++ b/modules/itip-formatter/e-mail-parser-itip.c
@@ -62,106 +62,6 @@ static const gchar *parser_mime_types[] = {
 	NULL
 };
 
-static void
-mail_part_itip_free (EMailPart *mail_part)
-{
-	EMailPartItip *pitip = (EMailPartItip *) mail_part;
-
-	g_cancellable_cancel (pitip->cancellable);
-	g_clear_object (&pitip->cancellable);
-	g_clear_object (&pitip->client_cache);
-
-	g_free (pitip->vcalendar);
-	pitip->vcalendar = NULL;
-
-	if (pitip->comp) {
-		g_object_unref (pitip->comp);
-		pitip->comp = NULL;
-	}
-
-	if (pitip->top_level) {
-		icalcomponent_free (pitip->top_level);
-		pitip->top_level = NULL;
-	}
-
-	if (pitip->main_comp) {
-		icalcomponent_free (pitip->main_comp);
-		pitip->main_comp = NULL;
-	}
-	pitip->ical_comp = NULL;
-
-	g_free (pitip->calendar_uid);
-	pitip->calendar_uid = NULL;
-
-	g_free (pitip->from_address);
-	pitip->from_address = NULL;
-	g_free (pitip->from_name);
-	pitip->from_name = NULL;
-	g_free (pitip->to_address);
-	pitip->to_address = NULL;
-	g_free (pitip->to_name);
-	pitip->to_name = NULL;
-	g_free (pitip->delegator_address);
-	pitip->delegator_address = NULL;
-	g_free (pitip->delegator_name);
-	pitip->delegator_name = NULL;
-	g_free (pitip->my_address);
-	pitip->my_address = NULL;
-	g_free (pitip->uid);
-	g_hash_table_destroy (pitip->real_comps);
-
-	g_clear_object (&pitip->view);
-}
-
-/******************************************************************************/
-
-static void
-bind_itip_view (EMailPart *part,
-                WebKitDOMElement *element)
-{
-	GString *buffer;
-	WebKitDOMDocument *document;
-	ItipView *view;
-	EMailPartItip *pitip;
-
-	if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) {
-
-		WebKitDOMNodeList *nodes;
-		guint length, i;
-
-		nodes = webkit_dom_element_get_elements_by_tag_name (
-				element, "iframe");
-		length = webkit_dom_node_list_get_length (nodes);
-		for (i = 0; i < length; i++) {
-
-			element = WEBKIT_DOM_ELEMENT (
-					webkit_dom_node_list_item (nodes, i));
-			break;
-		}
-
-	}
-
-	g_return_if_fail (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element));
-
-	buffer = g_string_new ("");
-	document = webkit_dom_html_iframe_element_get_content_document (
-			WEBKIT_DOM_HTML_IFRAME_ELEMENT (element));
-	pitip = E_MAIL_PART_ITIP (part);
-
-	view = itip_view_new (pitip, pitip->client_cache);
-	g_object_set_data_full (
-		G_OBJECT (element), "view", view,
-		(GDestroyNotify) g_object_unref);
-
-	itip_view_create_dom_bindings (
-		view, webkit_dom_document_get_document_element (document));
-
-	itip_view_init_view (view);
-	g_string_free (buffer, TRUE);
-}
-
-/*******************************************************************************/
-
 static gboolean
 empe_itip_parse (EMailParserExtension *extension,
                  EMailParser *parser,
@@ -189,13 +89,7 @@ empe_itip_parse (EMailParserExtension *extension,
 	shell = e_shell_get_default ();
 	client_cache = e_shell_get_client_cache (shell);
 
-	itip_part = (EMailPartItip *) e_mail_part_subclass_new (
-		part, part_id->str,
-		sizeof (EMailPartItip),
-		(GFreeFunc) mail_part_itip_free);
-	itip_part->parent.mime_type = g_strdup ("text/calendar");
-	itip_part->parent.bind_func = bind_itip_view;
-	itip_part->parent.force_collapse = TRUE;
+	itip_part = e_mail_part_itip_new (part, part_id->str);
 	itip_part->delete_message = g_settings_get_boolean (settings, CONF_KEY_DELETE);
 	itip_part->has_organizer = FALSE;
 	itip_part->no_reply_wanted = FALSE;
diff --git a/modules/itip-formatter/e-mail-part-itip.c b/modules/itip-formatter/e-mail-part-itip.c
new file mode 100644
index 0000000000..e4e6302822
--- /dev/null
+++ b/modules/itip-formatter/e-mail-part-itip.c
@@ -0,0 +1,171 @@
+/*
+ * e-mail-part-itip.c
+ *
+ * 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/>
+ *
+ */
+
+#include "e-mail-part-itip.h"
+
+#define E_MAIL_PART_ITIP_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_MAIL_PART_ITIP, EMailPartItipPrivate))
+
+struct _EMailPartItipPrivate {
+	gint placeholder;
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+	EMailPartItip,
+	e_mail_part_itip,
+	E_TYPE_MAIL_PART)
+
+static void
+mail_part_itip_dispose (GObject *object)
+{
+	EMailPartItip *part = E_MAIL_PART_ITIP (object);
+
+	g_cancellable_cancel (part->cancellable);
+
+	g_clear_object (&part->cancellable);
+	g_clear_object (&part->client_cache);
+	g_clear_object (&part->comp);
+	g_clear_object (&part->view);
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_mail_part_itip_parent_class)->dispose (object);
+}
+
+static void
+mail_part_itip_finalize (GObject *object)
+{
+	EMailPartItip *part = E_MAIL_PART_ITIP (object);
+
+	g_free (part->vcalendar);
+	g_free (part->calendar_uid);
+	g_free (part->from_address);
+	g_free (part->from_name);
+	g_free (part->to_address);
+	g_free (part->to_name);
+	g_free (part->delegator_address);
+	g_free (part->delegator_name);
+	g_free (part->my_address);
+	g_free (part->uid);
+
+	if (part->top_level != NULL)
+		icalcomponent_free (part->top_level);
+
+	if (part->main_comp != NULL)
+		icalcomponent_free (part->main_comp);
+
+	g_hash_table_destroy (part->real_comps);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_mail_part_itip_parent_class)->finalize (object);
+}
+
+static void
+mail_part_itip_bind_dom_element (EMailPart *part,
+                                 WebKitDOMElement *element)
+{
+	GString *buffer;
+	WebKitDOMDocument *document;
+	ItipView *view;
+	EMailPartItip *pitip;
+
+	pitip = E_MAIL_PART_ITIP (part);
+
+	if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) {
+		WebKitDOMNodeList *nodes;
+		guint ii, length;
+
+		nodes = webkit_dom_element_get_elements_by_tag_name (
+			element, "iframe");
+		length = webkit_dom_node_list_get_length (nodes);
+		for (ii = 0; ii < length; ii++) {
+			element = WEBKIT_DOM_ELEMENT (
+				webkit_dom_node_list_item (nodes, ii));
+			break;
+		}
+	}
+
+	g_return_if_fail (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element));
+
+	buffer = g_string_new ("");
+	document = webkit_dom_html_iframe_element_get_content_document (
+		WEBKIT_DOM_HTML_IFRAME_ELEMENT (element));
+
+	view = itip_view_new (pitip, pitip->client_cache);
+	g_object_set_data_full (
+		G_OBJECT (element), "view", view,
+		(GDestroyNotify) g_object_unref);
+
+	itip_view_create_dom_bindings (
+		view, webkit_dom_document_get_document_element (document));
+
+	itip_view_init_view (view);
+	g_string_free (buffer, TRUE);
+}
+
+static void
+e_mail_part_itip_class_init (EMailPartItipClass *class)
+{
+	GObjectClass *object_class;
+	EMailPartClass *mail_part_class;
+
+	g_type_class_add_private (class, sizeof (EMailPartItipPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = mail_part_itip_dispose;
+	object_class->finalize = mail_part_itip_finalize;
+
+	mail_part_class = E_MAIL_PART_CLASS (class);
+	mail_part_class->bind_dom_element = mail_part_itip_bind_dom_element;
+}
+
+static void
+e_mail_part_itip_class_finalize (EMailPartItipClass *class)
+{
+}
+
+static void
+e_mail_part_itip_init (EMailPartItip *part)
+{
+	part->priv = E_MAIL_PART_ITIP_GET_PRIVATE (part);
+
+	e_mail_part_set_mime_type (E_MAIL_PART (part), "text/calendar");
+
+	E_MAIL_PART (part)->force_collapse = TRUE;
+}
+
+void
+e_mail_part_itip_type_register (GTypeModule *type_module)
+{
+	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+	 *     function, so we have to wrap it with a public function in
+	 *     order to register types from a separate compilation unit. */
+	e_mail_part_itip_register_type (type_module);
+}
+
+EMailPartItip *
+e_mail_part_itip_new (CamelMimePart *mime_part,
+                      const gchar *id)
+{
+	g_return_val_if_fail (id != NULL, NULL);
+
+	return g_object_new (
+		E_TYPE_MAIL_PART_ITIP,
+		"id", id, "mime-part", mime_part, NULL);
+}
+
diff --git a/modules/itip-formatter/e-mail-part-itip.h b/modules/itip-formatter/e-mail-part-itip.h
index 78004bca96..ef978bed8e 100644
--- a/modules/itip-formatter/e-mail-part-itip.h
+++ b/modules/itip-formatter/e-mail-part-itip.h
@@ -26,17 +26,34 @@
 
 #include "itip-view.h"
 
-#define E_MAIL_PART_ITIP(part) \
-	((EMailPartItip *) part)
-#define E_IS_MAIL_PART_ITIP(part) \
-	(E_MAIL_PART_IS (part, EMailPartItip))
+/* Standard GObject macros */
+#define E_TYPE_MAIL_PART_ITIP \
+	(e_mail_part_itip_get_type ())
+#define E_MAIL_PART_ITIP(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_MAIL_PART_ITIP, EMailPartItip))
+#define E_MAIL_PART_ITIP_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_MAIL_PART_ITIP, EMailPartItipClass))
+#define E_IS_MAIL_PART_ITIP(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_MAIL_PART_ITIP))
+#define E_IS_MAIL_PART_ITIP_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_MAIL_PART_ITIP))
+#define E_MAIL_PART_ITIP_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_MAIL_PART_ITIP, EMailPartItipClass))
 
 G_BEGIN_DECLS
 
 typedef struct _EMailPartItip EMailPartItip;
+typedef struct _EMailPartItipClass EMailPartItipClass;
+typedef struct _EMailPartItipPrivate EMailPartItipPrivate;
 
 struct _EMailPartItip {
 	EMailPart parent;
+	EMailPartItipPrivate *priv;
 
 	CamelFolder *folder;
 	CamelMimeMessage *msg;
@@ -114,6 +131,15 @@ struct _EMailPartItip {
 	ItipView *view;
 };
 
+struct _EMailPartItipClass {
+	EMailPartClass parent_class;
+};
+
+GType		e_mail_part_itip_get_type	(void) G_GNUC_CONST;
+void		e_mail_part_itip_type_register	(GTypeModule *type_module);
+EMailPartItip *	e_mail_part_itip_new		(CamelMimePart *mime_part,
+						 const gchar *id);
+
 G_END_DECLS
 
 #endif /* E_MAIL_PART_ITIP_H */
diff --git a/modules/itip-formatter/evolution-module-itip-formatter.c b/modules/itip-formatter/evolution-module-itip-formatter.c
index 13a73a30d7..af1a2358ce 100644
--- a/modules/itip-formatter/evolution-module-itip-formatter.c
+++ b/modules/itip-formatter/evolution-module-itip-formatter.c
@@ -18,6 +18,7 @@
 
 #include "e-mail-formatter-itip.h"
 #include "e-mail-parser-itip.h"
+#include "e-mail-part-itip.h"
 
 #include <gmodule.h>
 #include <gio/gio.h>
@@ -49,6 +50,7 @@ e_module_load (GTypeModule *type_module)
 
 	}
 
+	e_mail_part_itip_type_register (type_module);
 	e_mail_parser_itip_type_register (type_module);
 	e_mail_formatter_itip_type_register (type_module);
 
diff --git a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
index 91df97cdb5..60d183a698 100644
--- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
@@ -342,7 +342,7 @@ mail_display_popup_prefer_plain_update_actions (EMailDisplayPopupExtension *exte
 	}
 
 	while (!g_queue_is_empty (&queue))
-		e_mail_part_unref (g_queue_pop_head (&queue));
+		g_object_unref (g_queue_pop_head (&queue));
 
 	if (action_name) {
 		action = gtk_action_group_get_action (
diff --git a/modules/vcard-inline/Makefile.am b/modules/vcard-inline/Makefile.am
index 324a7ab4fd..32f79d9a7b 100644
--- a/modules/vcard-inline/Makefile.am
+++ b/modules/vcard-inline/Makefile.am
@@ -14,6 +14,7 @@ module_vcard_inline_la_SOURCES =				\
 	e-mail-formatter-vcard.h					\
 	e-mail-parser-vcard.c						\
 	e-mail-parser-vcard.h						\
+	e-mail-part-vcard.c						\
 	e-mail-part-vcard.h						\
 	evolution-module-vcard-inline.c
 
diff --git a/modules/vcard-inline/e-mail-parser-vcard.c b/modules/vcard-inline/e-mail-parser-vcard.c
index 5fbc3c0dc3..fc2881720f 100644
--- a/modules/vcard-inline/e-mail-parser-vcard.c
+++ b/modules/vcard-inline/e-mail-parser-vcard.c
@@ -33,14 +33,10 @@
 #include <em-format/e-mail-extension-registry.h>
 #include <em-format/e-mail-parser-extension.h>
 #include <em-format/e-mail-part.h>
-#include <em-format/e-mail-part-utils.h>
-#include <em-format/e-mail-formatter-utils.h>
 
 #include <libebook/libebook.h>
 #include <libedataserver/libedataserver.h>
 
-#include <shell/e-shell.h>
-#include <addressbook/gui/merging/eab-contact-merging.h>
 #include <addressbook/util/eab-book-util.h>
 
 #include <libebackend/libebackend.h>
@@ -68,228 +64,6 @@ static const gchar *parser_mime_types[] = {
 };
 
 static void
-mail_part_vcard_free (EMailPart *mail_part)
-{
-	EMailPartVCard *vi_part = (EMailPartVCard *) mail_part;
-
-	g_clear_object (&vi_part->contact_display);
-	g_clear_object (&vi_part->message_label);
-	g_clear_object (&vi_part->formatter);
-	g_clear_object (&vi_part->iframe);
-	g_clear_object (&vi_part->save_button);
-	g_clear_object (&vi_part->toggle_button);
-	g_clear_object (&vi_part->folder);
-
-	if (vi_part->message_uid) {
-		g_free (vi_part->message_uid);
-		vi_part->message_uid = NULL;
-	}
-}
-
-static void
-client_connect_cb (GObject *source_object,
-                   GAsyncResult *result,
-                   gpointer user_data)
-{
-	GSList *contact_list = user_data;
-	EShell *shell;
-	EClient *client;
-	EBookClient *book_client;
-	ESourceRegistry *registry;
-	GSList *iter;
-	GError *error = NULL;
-
-	client = e_book_client_connect_finish (result, &error);
-
-	/* Sanity check. */
-	g_return_if_fail (
-		((client != NULL) && (error == NULL)) ||
-		((client == NULL) && (error != NULL)));
-
-	if (error != NULL) {
-		g_warning ("%s: %s", G_STRFUNC, error->message);
-		g_error_free (error);
-		goto exit;
-	}
-
-	book_client = E_BOOK_CLIENT (client);
-
-	shell = e_shell_get_default ();
-	registry = e_shell_get_registry (shell);
-
-	for (iter = contact_list; iter != NULL; iter = iter->next) {
-		EContact *contact;
-
-		contact = E_CONTACT (iter->data);
-		eab_merging_book_add_contact (
-			registry, book_client, contact, NULL, NULL);
-	}
-
-	g_object_unref (client);
-
- exit:
-	g_slist_free_full (contact_list, (GDestroyNotify) g_object_unref);
-}
-
-static void
-save_vcard_cb (WebKitDOMEventTarget *button,
-               WebKitDOMEvent *event,
-               EMailPartVCard *vcard_part)
-{
-	EShell *shell;
-	ESource *source;
-	ESourceRegistry *registry;
-	ESourceSelector *selector;
-	GSList *contact_list;
-	const gchar *extension_name;
-	GtkWidget *dialog;
-
-	shell = e_shell_get_default ();
-	registry = e_shell_get_registry (shell);
-	extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
-
-	dialog = e_source_selector_dialog_new (NULL, registry, extension_name);
-
-	selector = e_source_selector_dialog_get_selector (
-		E_SOURCE_SELECTOR_DIALOG (dialog));
-
-	source = e_source_registry_ref_default_address_book (registry);
-	e_source_selector_set_primary_selection (selector, source);
-	g_object_unref (source);
-
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) {
-		gtk_widget_destroy (dialog);
-		return;
-	}
-
-	source = e_source_selector_dialog_peek_primary_selection (
-		E_SOURCE_SELECTOR_DIALOG (dialog));
-
-	gtk_widget_destroy (dialog);
-
-	g_return_if_fail (source != NULL);
-
-	contact_list = g_slist_copy_deep (
-		vcard_part->contact_list,
-		(GCopyFunc) g_object_ref, NULL);
-
-	e_book_client_connect (
-		source, NULL, client_connect_cb, contact_list);
-}
-
-static void
-display_mode_toggle_cb (WebKitDOMEventTarget *button,
-                        WebKitDOMEvent *event,
-                        EMailPartVCard *vcard_part)
-{
-	EABContactDisplayMode mode;
-	gchar *uri;
-	gchar *html_label, *access_key;
-
-	mode = eab_contact_formatter_get_display_mode (vcard_part->formatter);
-	if (mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
-		mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
-
-		html_label = e_mail_formatter_parse_html_mnemonics (
-				_("Show F_ull vCard"), &access_key);
-
-		webkit_dom_html_element_set_inner_html (
-			WEBKIT_DOM_HTML_ELEMENT (button),
-			html_label, NULL);
-		if (access_key) {
-			webkit_dom_html_element_set_access_key (
-				WEBKIT_DOM_HTML_ELEMENT (button),
-				access_key);
-			g_free (access_key);
-		}
-
-		g_free (html_label);
-
-	} else {
-		mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
-
-		html_label = e_mail_formatter_parse_html_mnemonics (
-				_("Show Com_pact vCard"), &access_key);
-
-		webkit_dom_html_element_set_inner_html (
-			WEBKIT_DOM_HTML_ELEMENT (button),
-			html_label, NULL);
-		if (access_key) {
-			webkit_dom_html_element_set_access_key (
-				WEBKIT_DOM_HTML_ELEMENT (button),
-				access_key);
-			g_free (access_key);
-		}
-
-		g_free (html_label);
-	}
-
-	eab_contact_formatter_set_display_mode (vcard_part->formatter, mode);
-
-	uri = e_mail_part_build_uri (
-		vcard_part->folder, vcard_part->message_uid,
-		"part_id", G_TYPE_STRING, vcard_part->parent.id,
-		"mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW, NULL);
-
-	webkit_dom_html_iframe_element_set_src (
-		WEBKIT_DOM_HTML_IFRAME_ELEMENT (vcard_part->iframe), uri);
-
-	g_free (uri);
-}
-
-static void
-bind_dom (EMailPartVCard *vcard_part,
-          WebKitDOMElement *attachment)
-{
-	WebKitDOMNodeList *list;
-	WebKitDOMElement *iframe, *toggle_button, *save_button;
-
-        /* IFRAME */
-	list = webkit_dom_element_get_elements_by_tag_name (attachment, "iframe");
-	if (webkit_dom_node_list_get_length (list) != 1)
-		return;
-	iframe = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (list, 0));
-	if (vcard_part->iframe)
-		g_object_unref (vcard_part->iframe);
-	vcard_part->iframe = g_object_ref (iframe);
-
-	/* TOGGLE DISPLAY MODE BUTTON */
-	list = webkit_dom_element_get_elements_by_class_name (
-		attachment, "org-gnome-vcard-display-mode-button");
-	if (webkit_dom_node_list_get_length (list) != 1)
-		return;
-	toggle_button = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (list, 0));
-	if (vcard_part->toggle_button)
-		g_object_unref (vcard_part->toggle_button);
-	vcard_part->toggle_button = g_object_ref (toggle_button);
-
-	/* SAVE TO ADDRESSBOOK BUTTON */
-	list = webkit_dom_element_get_elements_by_class_name (
-		attachment, "org-gnome-vcard-save-button");
-	if (webkit_dom_node_list_get_length (list) != 1)
-		return;
-	save_button = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (list, 0));
-	if (vcard_part->save_button)
-		g_object_unref (vcard_part->save_button);
-	vcard_part->save_button = g_object_ref (save_button);
-
-	webkit_dom_event_target_add_event_listener (
-		WEBKIT_DOM_EVENT_TARGET (toggle_button),
-		"click", G_CALLBACK (display_mode_toggle_cb),
-		FALSE, vcard_part);
-
-	webkit_dom_event_target_add_event_listener (
-		WEBKIT_DOM_EVENT_TARGET (save_button),
-		"click", G_CALLBACK (save_vcard_cb),
-		FALSE, vcard_part);
-
-	/* Bind collapse buttons for contact lists. */
-	eab_contact_formatter_bind_dom (
-		webkit_dom_html_iframe_element_get_content_document (
-			WEBKIT_DOM_HTML_IFRAME_ELEMENT (iframe)));
-}
-
-static void
 decode_vcard (EMailPartVCard *vcard_part,
               CamelMimePart *mime_part)
 {
@@ -336,13 +110,8 @@ empe_vcard_parse (EMailParserExtension *extension,
 	len = part_id->len;
 	g_string_append (part_id, ".org-gnome-vcard-display");
 
-	vcard_part = (EMailPartVCard *) e_mail_part_subclass_new (
-		part, part_id->str, sizeof (EMailPartVCard),
-		(GFreeFunc) mail_part_vcard_free);
-	vcard_part->parent.mime_type = camel_content_type_simple (
-		camel_mime_part_get_content_type (part));
-	vcard_part->parent.bind_func = (EMailPartDOMBindFunc) bind_dom;
-	vcard_part->parent.is_attachment = TRUE;
+	vcard_part = e_mail_part_vcard_new (part, part_id->str);
+
 	vcard_part->formatter = g_object_new (
 		EAB_TYPE_CONTACT_FORMATTER,
 		"display-mode", EAB_CONTACT_DISPLAY_RENDER_COMPACT,
diff --git a/modules/vcard-inline/e-mail-part-vcard.c b/modules/vcard-inline/e-mail-part-vcard.c
new file mode 100644
index 0000000000..5986154d55
--- /dev/null
+++ b/modules/vcard-inline/e-mail-part-vcard.c
@@ -0,0 +1,353 @@
+/*
+ * e-mail-part-vcard.c
+ *
+ * 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/>
+ *
+ */
+
+#include "e-mail-part-vcard.h"
+
+#include <config.h>
+#include <glib/gi18n.h>
+
+#include <em-format/e-mail-formatter-utils.h>
+#include <em-format/e-mail-part-utils.h>
+
+#include <shell/e-shell.h>
+#include <addressbook/gui/merging/eab-contact-merging.h>
+
+#define E_MAIL_PART_VCARD_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_MAIL_PART_VCARD, EMailPartVCardPrivate))
+
+struct _EMailPartVCardPrivate {
+	gint placeholder;
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+	EMailPartVCard,
+	e_mail_part_vcard,
+	E_TYPE_MAIL_PART)
+
+static void
+client_connect_cb (GObject *source_object,
+                   GAsyncResult *result,
+                   gpointer user_data)
+{
+	GSList *contact_list = user_data;
+	EShell *shell;
+	EClient *client;
+	EBookClient *book_client;
+	ESourceRegistry *registry;
+	GSList *iter;
+	GError *error = NULL;
+
+	client = e_book_client_connect_finish (result, &error);
+
+	/* Sanity check. */
+	g_return_if_fail (
+		((client != NULL) && (error == NULL)) ||
+		((client == NULL) && (error != NULL)));
+
+	if (error != NULL) {
+		g_warning ("%s: %s", G_STRFUNC, error->message);
+		g_error_free (error);
+		goto exit;
+	}
+
+	book_client = E_BOOK_CLIENT (client);
+
+	shell = e_shell_get_default ();
+	registry = e_shell_get_registry (shell);
+
+	for (iter = contact_list; iter != NULL; iter = iter->next) {
+		EContact *contact;
+
+		contact = E_CONTACT (iter->data);
+		eab_merging_book_add_contact (
+			registry, book_client, contact, NULL, NULL);
+	}
+
+	g_object_unref (client);
+
+ exit:
+	g_slist_free_full (contact_list, (GDestroyNotify) g_object_unref);
+}
+
+static void
+save_vcard_cb (WebKitDOMEventTarget *button,
+               WebKitDOMEvent *event,
+               EMailPartVCard *vcard_part)
+{
+	EShell *shell;
+	ESource *source;
+	ESourceRegistry *registry;
+	ESourceSelector *selector;
+	GSList *contact_list;
+	const gchar *extension_name;
+	GtkWidget *dialog;
+
+	shell = e_shell_get_default ();
+	registry = e_shell_get_registry (shell);
+	extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
+
+	dialog = e_source_selector_dialog_new (NULL, registry, extension_name);
+
+	selector = e_source_selector_dialog_get_selector (
+		E_SOURCE_SELECTOR_DIALOG (dialog));
+
+	source = e_source_registry_ref_default_address_book (registry);
+	e_source_selector_set_primary_selection (selector, source);
+	g_object_unref (source);
+
+	if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) {
+		gtk_widget_destroy (dialog);
+		return;
+	}
+
+	source = e_source_selector_dialog_peek_primary_selection (
+		E_SOURCE_SELECTOR_DIALOG (dialog));
+
+	gtk_widget_destroy (dialog);
+
+	g_return_if_fail (source != NULL);
+
+	contact_list = g_slist_copy_deep (
+		vcard_part->contact_list,
+		(GCopyFunc) g_object_ref, NULL);
+
+	e_book_client_connect (
+		source, NULL, client_connect_cb, contact_list);
+}
+
+static void
+display_mode_toggle_cb (WebKitDOMEventTarget *button,
+                        WebKitDOMEvent *event,
+                        EMailPartVCard *vcard_part)
+{
+	EABContactDisplayMode mode;
+	gchar *uri;
+	gchar *html_label;
+	gchar *access_key;
+	const gchar *part_id;
+
+	part_id = e_mail_part_get_id (E_MAIL_PART (vcard_part));
+
+	mode = eab_contact_formatter_get_display_mode (vcard_part->formatter);
+	if (mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) {
+		mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT;
+
+		html_label = e_mail_formatter_parse_html_mnemonics (
+				_("Show F_ull vCard"), &access_key);
+
+		webkit_dom_html_element_set_inner_html (
+			WEBKIT_DOM_HTML_ELEMENT (button),
+			html_label, NULL);
+		if (access_key) {
+			webkit_dom_html_element_set_access_key (
+				WEBKIT_DOM_HTML_ELEMENT (button),
+				access_key);
+			g_free (access_key);
+		}
+
+		g_free (html_label);
+
+	} else {
+		mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
+
+		html_label = e_mail_formatter_parse_html_mnemonics (
+				_("Show Com_pact vCard"), &access_key);
+
+		webkit_dom_html_element_set_inner_html (
+			WEBKIT_DOM_HTML_ELEMENT (button),
+			html_label, NULL);
+		if (access_key) {
+			webkit_dom_html_element_set_access_key (
+				WEBKIT_DOM_HTML_ELEMENT (button),
+				access_key);
+			g_free (access_key);
+		}
+
+		g_free (html_label);
+	}
+
+	eab_contact_formatter_set_display_mode (vcard_part->formatter, mode);
+
+	uri = e_mail_part_build_uri (
+		vcard_part->folder, vcard_part->message_uid,
+		"part_id", G_TYPE_STRING, part_id,
+		"mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW, NULL);
+
+	webkit_dom_html_iframe_element_set_src (
+		WEBKIT_DOM_HTML_IFRAME_ELEMENT (vcard_part->iframe), uri);
+
+	g_free (uri);
+}
+
+static void
+mail_part_vcard_dispose (GObject *object)
+{
+	EMailPartVCard *part = E_MAIL_PART_VCARD (object);
+
+	g_clear_object (&part->contact_display);
+	g_clear_object (&part->message_label);
+	g_clear_object (&part->formatter);
+	g_clear_object (&part->iframe);
+	g_clear_object (&part->save_button);
+	g_clear_object (&part->toggle_button);
+	g_clear_object (&part->folder);
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_mail_part_vcard_parent_class)->dispose (object);
+}
+
+static void
+mail_part_vcard_finalize (GObject *object)
+{
+	EMailPartVCard *part = E_MAIL_PART_VCARD (object);
+
+	g_free (part->message_uid);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_mail_part_vcard_parent_class)->finalize (object);
+}
+
+static void
+mail_part_vcard_constructed (GObject *object)
+{
+	EMailPart *part;
+	CamelMimePart *mime_part;
+	CamelContentType *content_type;
+	gchar *mime_type;
+
+	part = E_MAIL_PART (object);
+
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_mail_part_vcard_parent_class)->constructed (object);
+
+	e_mail_part_set_is_attachment (part, TRUE);
+
+	mime_part = e_mail_part_ref_mime_part (part);
+
+	content_type = camel_mime_part_get_content_type (mime_part);
+	mime_type = camel_content_type_simple (content_type);
+	e_mail_part_set_mime_type (part, mime_type);
+	g_free (mime_type);
+
+	g_object_unref (mime_part);
+}
+
+static void
+mail_part_vcard_bind_dom_element (EMailPart *part,
+                                  WebKitDOMElement *element)
+{
+	EMailPartVCard *vcard_part;
+	WebKitDOMNodeList *list;
+	WebKitDOMElement *iframe;
+	WebKitDOMElement *toggle_button;
+	WebKitDOMElement *save_button;
+
+	vcard_part = E_MAIL_PART_VCARD (part);
+
+	/* IFRAME */
+	list = webkit_dom_element_get_elements_by_tag_name (
+		element, "iframe");
+	if (webkit_dom_node_list_get_length (list) != 1)
+		return;
+	iframe = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (list, 0));
+	g_clear_object (&vcard_part->iframe);
+	vcard_part->iframe = g_object_ref (iframe);
+
+	/* TOGGLE DISPLAY MODE BUTTON */
+	list = webkit_dom_element_get_elements_by_class_name (
+		element, "org-gnome-vcard-display-mode-button");
+	if (webkit_dom_node_list_get_length (list) != 1)
+		return;
+	toggle_button = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (list, 0));
+	g_clear_object (&vcard_part->toggle_button);
+	vcard_part->toggle_button = g_object_ref (toggle_button);
+
+	/* SAVE TO ADDRESSBOOK BUTTON */
+	list = webkit_dom_element_get_elements_by_class_name (
+		element, "org-gnome-vcard-save-button");
+	if (webkit_dom_node_list_get_length (list) != 1)
+		return;
+	save_button = WEBKIT_DOM_ELEMENT (webkit_dom_node_list_item (list, 0));
+	g_clear_object (&vcard_part->save_button);
+	vcard_part->save_button = g_object_ref (save_button);
+
+	webkit_dom_event_target_add_event_listener (
+		WEBKIT_DOM_EVENT_TARGET (toggle_button),
+		"click", G_CALLBACK (display_mode_toggle_cb),
+		FALSE, vcard_part);
+
+	webkit_dom_event_target_add_event_listener (
+		WEBKIT_DOM_EVENT_TARGET (save_button),
+		"click", G_CALLBACK (save_vcard_cb),
+		FALSE, vcard_part);
+
+	/* Bind collapse buttons for contact lists. */
+	eab_contact_formatter_bind_dom (
+		webkit_dom_html_iframe_element_get_content_document (
+			WEBKIT_DOM_HTML_IFRAME_ELEMENT (iframe)));
+}
+
+static void
+e_mail_part_vcard_class_init (EMailPartVCardClass *class)
+{
+	GObjectClass *object_class;
+	EMailPartClass *mail_part_class;
+
+	g_type_class_add_private (class, sizeof (EMailPartVCardPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = mail_part_vcard_dispose;
+	object_class->finalize = mail_part_vcard_finalize;
+	object_class->constructed = mail_part_vcard_constructed;
+
+	mail_part_class = E_MAIL_PART_CLASS (class);
+	mail_part_class->bind_dom_element = mail_part_vcard_bind_dom_element;
+}
+
+static void
+e_mail_part_vcard_class_finalize (EMailPartVCardClass *class)
+{
+}
+
+static void
+e_mail_part_vcard_init (EMailPartVCard *part)
+{
+	part->priv = E_MAIL_PART_VCARD_GET_PRIVATE (part);
+}
+
+void
+e_mail_part_vcard_type_register (GTypeModule *type_module)
+{
+	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+	 *     function, so we have to wrap it with a public function in
+	 *     order to register types from a separate compilation unit. */
+	e_mail_part_vcard_register_type (type_module);
+}
+
+EMailPartVCard *
+e_mail_part_vcard_new (CamelMimePart *mime_part,
+                       const gchar *id)
+{
+	g_return_val_if_fail (id != NULL, NULL);
+
+	return g_object_new (
+		E_TYPE_MAIL_PART_VCARD,
+		"id", id, "mime-part", mime_part, NULL);
+}
+
diff --git a/modules/vcard-inline/e-mail-part-vcard.h b/modules/vcard-inline/e-mail-part-vcard.h
index c05b0a8570..a6d726791a 100644
--- a/modules/vcard-inline/e-mail-part-vcard.h
+++ b/modules/vcard-inline/e-mail-part-vcard.h
@@ -24,15 +24,34 @@
 #include <addressbook/gui/widgets/eab-contact-formatter.h>
 #include <webkit/webkitdom.h>
 
-#define E_IS_MAIL_PART_VCARD(part) \
-	(E_MAIL_PART_IS (part, EMailPartVCard))
+/* Standard GObject macros */
+#define E_TYPE_MAIL_PART_VCARD \
+	(e_mail_part_vcard_get_type ())
+#define E_MAIL_PART_VCARD(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_MAIL_PART_VCARD, EMailPartVCard))
+#define E_MAIL_PART_VCARD_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_MAIL_PART_VCARD, EMailPartVCardClass))
+#define E_IS_MAIL_PART_VCARD(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_MAIL_PART_VCARD))
+#define E_IS_MAIL_PART_VCARD_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_MAIL_PART_VCARD))
+#define E_MAIL_PART_VCARD_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_MAIL_PART_VCARD, EMailPartVCardClass))
 
 G_BEGIN_DECLS
 
 typedef struct _EMailPartVCard EMailPartVCard;
+typedef struct _EMailPartVCardClass EMailPartVCardClass;
+typedef struct _EMailPartVCardPrivate EMailPartVCardPrivate;
 
 struct _EMailPartVCard {
 	EMailPart parent;
+	EMailPartVCardPrivate *priv;
 
 	GSList *contact_list;
 	GtkWidget *contact_display;
@@ -47,6 +66,16 @@ struct _EMailPartVCard {
 	gchar *message_uid;
 };
 
+struct _EMailPartVCardClass {
+	EMailPartClass parent_class;
+};
+
+GType		e_mail_part_vcard_get_type	(void) G_GNUC_CONST;
+void		e_mail_part_vcard_type_register	(GTypeModule *type_module);
+EMailPartVCard *
+		e_mail_part_vcard_new		(CamelMimePart *mime_part,
+						 const gchar *id);
+
 G_END_DECLS
 
 #endif /* E_MAIL_PART_VCARD_H */
diff --git a/modules/vcard-inline/evolution-module-vcard-inline.c b/modules/vcard-inline/evolution-module-vcard-inline.c
index abf4d36c97..978ecdba08 100644
--- a/modules/vcard-inline/evolution-module-vcard-inline.c
+++ b/modules/vcard-inline/evolution-module-vcard-inline.c
@@ -18,6 +18,7 @@
 
 #include "e-mail-formatter-vcard.h"
 #include "e-mail-parser-vcard.h"
+#include "e-mail-part-vcard.h"
 
 #include <gmodule.h>
 
@@ -30,6 +31,7 @@ e_module_load (GTypeModule *type_module)
 {
 	e_mail_formatter_vcard_type_register (type_module);
 	e_mail_parser_vcard_type_register (type_module);
+	e_mail_part_vcard_type_register (type_module);
 }
 
 G_MODULE_EXPORT void