1 files changed, 2 insertions, 233 deletions

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,