Progress update:

	- Get context menus working in the contact preview pane.

	- Kill EABPopup.

	- Yet more code refactoring.

	- Add a handy utility function: e_shell_window_show_popup_menu()
	  Takes a widget path in the shell window's UI definition.


svn path=/branches/kill-bonobo/; revision=36366

1 files changed, 454 insertions, 250 deletions

diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index bc2e32c338..5e1dc2d62a 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -25,11 +25,11 @@
 #endif
 
 #include "eab-contact-display.h"
-#include "eab-popup.h"
 
 #include "eab-gui-util.h"
 #include "e-util/e-html-utils.h"
 #include "e-util/e-icon-factory.h"
+#include "e-util/e-plugin-ui.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
@@ -37,15 +37,29 @@
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 
-#define HANDLE_MAILTO_INTERNALLY 1
+#define EAB_CONTACT_DISPLAY_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), EAB_TYPE_CONTACT_DISPLAY, EABContactDisplayPrivate))
 
-#define PARENT_TYPE (GTK_TYPE_HTML)
+#define HANDLE_MAILTO_INTERNALLY 1
 
 struct _EABContactDisplayPrivate {
 	EContact *contact;
+	EABContactDisplayMode mode;
 
+	GtkUIManager *ui_manager;
+	GtkActionGroup *email_actions;
+	GtkActionGroup *uri_actions;
         GtkWidget *invisible;
-	char *selection_uri;
+
+	gchar *selected_uri;
+	gchar *clipboard_uri;
+};
+
+enum {
+	PROP_0,
+	PROP_CONTACT,
+	PROP_MODE
 };
 
 static struct {
@@ -76,155 +90,159 @@ common_location [] =
 
 #define MAX_COMPACT_IMAGE_DIMENSION 48
 
-static void
-eab_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data)
-{
-	EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target;
-	GError *err = NULL;
+static const gchar *ui =
+"<ui>"
+"  <popup>"
+"    <menuitem action='open-link'/>"
+"    <menuitem action='copy-link'/>"
+"    <menuitem action='send-message'/>"
+"    <menuitem action='copy-address'/>"
+"  </popup>"
+"</ui>";
 
-	gnome_url_show(t->uri, &err);
-	if (err) {
-		g_warning("gnome_url_show: %s", err->message);
-		g_error_free(err);
-	}
-}
+static gpointer parent_class;
 
 static void
-eab_uri_popup_email_address_copy(EPopup *ep, EPopupItem *item, void *data)
+action_copy_address_cb (GtkAction *action,
+                        EABContactDisplay *display)
 {
-	EABContactDisplay *display = data;
-	struct _EABContactDisplayPrivate *p = display->priv;
-        EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target;
-        const char *url = t->uri;
-        char *html=NULL;
-        int i=0;
-        GList *email_list, *l;
-        int email_num = atoi (url + strlen ("internal-mailto:"));
-
-	email_list = e_contact_get (p->contact, E_CONTACT_EMAIL);
-	for (l = email_list; l; l=l->next) {
-		if(i==email_num)
-			html = e_text_to_html (l->data, 0);
-	i++;
-        }
-
-       	g_free(p->selection_uri);
-	p->selection_uri = g_strdup(html);
-	g_free (html);
-
-	gtk_selection_owner_set(p->invisible, GDK_SELECTION_PRIMARY, gtk_get_current_event_time());
-	gtk_selection_owner_set(p->invisible, GDK_SELECTION_CLIPBOARD, gtk_get_current_event_time());
+	EContact *contact;
+	GList *list;
+	const gchar *uri;
+	gchar *html;
+	gint index;
+
+	uri = display->priv->selected_uri;
+	index = atoi (uri + strlen ("internal-mailto:"));
+	contact = eab_contact_display_get_contact (display);
+
+	list = e_contact_get (contact, E_CONTACT_EMAIL);
+	html = e_text_to_html (g_list_nth_data (list, index), 0);
+	g_list_foreach (list, (GFunc) g_free, NULL);
+	g_list_free (list);
+
+	display->priv->clipboard_uri = html;
+	display->priv->selected_uri = NULL;
+
+	gtk_selection_owner_set (
+		display->priv->invisible, GDK_SELECTION_PRIMARY,
+		gtk_get_current_event_time ());
+	gtk_selection_owner_set (
+		display->priv->invisible, GDK_SELECTION_CLIPBOARD,
+		gtk_get_current_event_time ());
 }
 
 static void
-eab_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data)
+action_copy_link_cb (GtkAction *action,
+                     EABContactDisplay *display)
 {
-	EABContactDisplay *display = data;
-	struct _EABContactDisplayPrivate *p = display->priv;
-
-	g_free(p->selection_uri);
-	p->selection_uri = g_strdup(pitem->user_data);
-
-	gtk_selection_owner_set(p->invisible, GDK_SELECTION_PRIMARY, gtk_get_current_event_time());
-	gtk_selection_owner_set(p->invisible, GDK_SELECTION_CLIPBOARD, gtk_get_current_event_time());
+	display->priv->clipboard_uri = display->priv->selected_uri;
+	display->priv->selected_uri = NULL;
+
+	gtk_selection_owner_set (
+		display->priv->invisible, GDK_SELECTION_PRIMARY,
+		gtk_get_current_event_time ());
+	gtk_selection_owner_set (
+		display->priv->invisible, GDK_SELECTION_CLIPBOARD,
+		gtk_get_current_event_time ());
 }
 
 static void
-eab_uri_popup_address_send(EPopup *ep, EPopupItem *item, void *data)
+action_open_link_cb (GtkAction *action,
+                     EABContactDisplay *display)
 {
-         EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target;
-         const char *url = t->uri;
-         EABContactDisplay *display = data;
-  	 struct _EABContactDisplayPrivate *p = display->priv;
-
-	 int mail_num = atoi (url + strlen ("internal-mailto:"));
+	GdkScreen *screen;
+	const gchar *uri;
+	GError *error = NULL;
 
-         if (mail_num == -1)
-         return;
-
-         eab_send_contact (p->contact, mail_num, EAB_DISPOSITION_AS_TO);
+	screen = gtk_widget_get_screen (GTK_WIDGET (display));
+	uri = display->priv->selected_uri;
+	g_return_if_fail (uri != NULL);
 
+	if (!gtk_show_uri (screen, uri, GDK_CURRENT_TIME, &error)) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
 }
 
 static void
-eab_selection_get(GtkWidget *widget, GtkSelectionData *data, guint info, guint time_stamp, EABContactDisplay *display)
+action_send_message_cb (GtkAction *action,
+                        EABContactDisplay *display)
 {
-	struct _EABContactDisplayPrivate *p = display->priv;
-
-	if (p->selection_uri == NULL)
-		return;
-
-	gtk_selection_data_set(data, data->target, 8, (guchar *)p->selection_uri, strlen(p->selection_uri));
-}
+	EContact *contact;
+	const gchar *uri;
+	gint row;
 
-static void
-eab_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, EABContactDisplay *display)
-{
-#if 0
-	struct _EABContactDisplayPrivate *p = display->priv;
+	uri = display->priv->selected_uri;
+	row = atoi (uri + strlen ("internal-mailto:"));
+	g_return_if_fail (row >= 0);
 
-	g_free(p->selection_uri);
-	p->selection_uri = NULL;
-#endif
+	contact = eab_contact_display_get_contact (display);
+	eab_send_contact (contact, row, EAB_DISPOSITION_AS_TO);
 }
 
-static EPopupItem eab_uri_popups[] = {
-	{ E_POPUP_ITEM, "05.open", N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO },
-        { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "edit-copy", EAB_POPUP_URI_NOT_MAILTO },
-        { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "mail-message-new", EAB_POPUP_URI_MAILTO},
-	{ E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "edit-copy", EAB_POPUP_URI_MAILTO},
-        };
+static GtkActionEntry email_entries[] = {
+
+	{ "copy-address",
+	  NULL,
+	  N_("Copy _Email Address"),
+	  NULL,
+	  NULL,
+	  G_CALLBACK (action_copy_address_cb) },
+
+	{ "send-message",
+	  NULL,
+	  N_("_Send New Message To..."),
+	  NULL,
+	  NULL,
+	  G_CALLBACK (action_send_message_cb) }
+};
 
+static GtkActionEntry uri_entries[] = {
+
+	{ "copy-link",
+	  NULL,
+	  N_("_Copy Link Location"),
+	  NULL,
+	  NULL,
+	  G_CALLBACK (action_copy_link_cb) },
+
+	{ "open-link",
+	  NULL,
+	  N_("_Open Link in Browser"),
+	  NULL,
+	  NULL,
+	  G_CALLBACK (action_open_link_cb) }
+};
 
 static void
-eab_uri_popup_free(EPopup *ep, GSList *list, void *data)
+contact_display_selection_get (EABContactDisplay *display,
+                               GtkSelectionData *data,
+                               guint info,
+                               guint time_stamp)
 {
-	while (list){
-		GSList *n = list->next;
-		struct _EPopupItem *item = list->data;
-
-		g_free(item->user_data);
-		item->user_data = NULL;
-		g_slist_free_1(list);
+	if (display->priv->clipboard_uri == NULL)
+		return;
 
-		list = n;
-         	}
+	gtk_selection_data_set (
+		data, data->target, 8,
+		(guchar *) display->priv->clipboard_uri,
+		strlen (display->priv->clipboard_uri));
 }
 
-static int
-eab_uri_popup_event(EABContactDisplay *display, GdkEvent *event, const char *uri)
+static void
+contact_display_selection_clear_event (EABContactDisplay *display,
+                                       GdkEventSelection *event)
 {
-	EABPopup *emp;
-	EABPopupTargetURI *t ;
-	GtkMenu *menu;
-	GSList *menus = NULL;
-	int i;
-
-	emp = eab_popup_new("org.gnome.evolution.addressbook.contactdisplay.popup");
-
-	t = eab_popup_target_new_uri(emp, uri);
-	t->target.widget = (GtkWidget *)display;
-
-	for (i=0;i<sizeof(eab_uri_popups)/sizeof(eab_uri_popups[0]);i++) {
-		eab_uri_popups[i].user_data = g_strdup(t->uri);
-		menus = g_slist_prepend(menus, &eab_uri_popups[i]);
-	}
-	e_popup_add_items((EPopup *)emp, menus, NULL, eab_uri_popup_free, display);
-
-        menu = e_popup_create_menu_once((EPopup *)emp,(EPopupTarget*)t, 0);
-
-        if (event == NULL) {
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
-	} else {
-		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button.button, event->button.time);
-	}
-
-	return TRUE;
+	g_free (display->priv->clipboard_uri);
+	display->priv->clipboard_uri = NULL;
 }
 
 static void
-on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
-		  EABContactDisplay *display)
+contact_display_on_url_requested (GtkHTML *html,
+                                  const gchar *url,
+                                  GtkHTMLStream *handle,
+                                  EABContactDisplay *display)
 {
 	if (!strcmp (url, "internal-contact-photo:")) {
 		EContactPhoto *photo;
@@ -257,7 +275,9 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
 }
 
 static void
-on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display)
+contact_display_on_link_clicked (GtkHTML *html,
+                                 const gchar *url,
+                                 EABContactDisplay *display)
 {
 	GError *err = NULL;
 
@@ -282,44 +302,6 @@ on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display)
 	}
 }
 
-#if 0
-static void
-render_address (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField adr_field, EContactField label_field)
-{
-	EContactAddress *adr;
-	const char *label;
-
-	label = e_contact_get_const (contact, label_field);
-	if (label) {
-		char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
-
-		gtk_html_stream_printf (html_stream, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">%s</td></tr>", html_label, _("(map)"), html);
-
-This shoul		g_free (html);
-		return;
-	}
-
-	adr = e_contact_get (contact, adr_field);
-	if (adr &&
-	    (adr->po || adr->ext || adr->street || adr->locality || adr->region || adr->code || adr->country)) {
-
-		gtk_html_stream_printf (html_stream, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">", html_label, _("map"));
-
-		if (adr->po && *adr->po) gtk_html_stream_printf (html_stream, "%s<br>", adr->po);
-		if (adr->ext && *adr->ext) gtk_html_stream_printf (html_stream, "%s<br>", adr->ext);
-		if (adr->street && *adr->street) gtk_html_stream_printf (html_stream, "%s<br>", adr->street);
-		if (adr->locality && *adr->locality) gtk_html_stream_printf (html_stream, "%s<br>", adr->locality);
-		if (adr->region && *adr->region) gtk_html_stream_printf (html_stream, "%s<br>", adr->region);
-		if (adr->code && *adr->code) gtk_html_stream_printf (html_stream, "%s<br>", adr->code);
-		if (adr->country && *adr->country) gtk_html_stream_printf (html_stream, "%s<br>", adr->country);
-
-		gtk_html_stream_printf (html_stream, "</td></tr>");
-	}
-	if (adr)
-		e_contact_address_free (adr);
-}
-#endif
-
 static void
 render_name_value (GtkHTMLStream *html_stream, const char *label, const char *str, const char *icon, unsigned int html_flags)
 {
@@ -677,12 +659,6 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
 	GtkHTMLStream *html_stream;
 	gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
 
-	if (display->priv->contact)
-		g_object_unref (display->priv->contact);
-	display->priv->contact = contact;
-	if (display->priv->contact)
-		g_object_ref (display->priv->contact);
-
 	html_stream = gtk_html_begin (GTK_HTML (display));
 	gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
 	gtk_html_stream_printf (html_stream, "<body><table width=\"100%%\"><tr><td %s>\n", is_rtl ? " align=\"right\" " : "");
@@ -733,16 +709,11 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
 }
 
 static void
-eab_contact_display_render_compact (EABContactDisplay *display, EContact *contact)
+eab_contact_display_render_compact (EABContactDisplay *display,
+                                    EContact *contact)
 {
 	GtkHTMLStream *html_stream;
 
-	if (display->priv->contact)
-		g_object_unref (display->priv->contact);
-	display->priv->contact = contact;
-	if (display->priv->contact)
-		g_object_ref (display->priv->contact);
-
 	html_stream = gtk_html_begin (GTK_HTML (display));
 	gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
 	gtk_html_stream_write (html_stream, "<body>\n", 7);
@@ -916,98 +887,254 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac
 	gtk_html_end (GTK_HTML (display), html_stream, GTK_HTML_STREAM_OK);
 }
 
-void
-eab_contact_display_render (EABContactDisplay *display, EContact *contact,
-			    EABContactDisplayRenderMode mode)
+static int
+contact_display_button_press_event (GtkWidget *widget,
+                                    GdkEvent *event,
+                                    EABContactDisplay *display)
 {
-	switch (mode) {
-	case EAB_CONTACT_DISPLAY_RENDER_NORMAL:
-		eab_contact_display_render_normal (display, contact);
-		break;
-	case EAB_CONTACT_DISPLAY_RENDER_COMPACT:
-		eab_contact_display_render_compact (display, contact);
-		break;
+	GtkUIManager *ui_manager;
+	GtkActionGroup *action_group;
+	GtkWidget *menu;
+	gboolean has_email;
+	gchar *uri;
+
+	if (event->button.button != 3)
+		return FALSE;
+
+       	uri = gtk_html_get_url_at (
+		GTK_HTML (widget),
+		event->button.x, event->button.y);
+
+	if (uri == NULL)
+		return FALSE;
+
+	g_free (display->priv->selected_uri);
+	display->priv->selected_uri = uri;
+
+	ui_manager = display->priv->ui_manager;
+	menu = gtk_ui_manager_get_widget (ui_manager, "/popup");
+	g_return_val_if_fail (GTK_IS_MENU (menu), FALSE);
+
+	has_email = (g_ascii_strncasecmp (uri, "internal-mailto:", 16) == 0);
+
+	/* Show the appropriate actions. */
+	action_group = display->priv->email_actions;
+	gtk_action_group_set_visible (action_group, has_email);
+	action_group = display->priv->uri_actions;
+	gtk_action_group_set_visible (action_group, !has_email);
+
+        if (event != NULL)
+		gtk_menu_popup (
+			GTK_MENU (menu), NULL, NULL, NULL, NULL,
+			event->button.button, event->button.time);
+	else
+		gtk_menu_popup (
+			GTK_MENU (menu), NULL, NULL, NULL, NULL,
+			0, gtk_get_current_event_time ());
+
+	return TRUE;
+}
+
+static void
+contact_display_set_property (GObject *object,
+                              guint property_id,
+                              const GValue *value,
+                              GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_CONTACT:
+			eab_contact_display_set_contact (
+				EAB_CONTACT_DISPLAY (object),
+				g_value_get_object (value));
+			return;
+
+		case PROP_MODE:
+			eab_contact_display_set_mode (
+				EAB_CONTACT_DISPLAY (object),
+				g_value_get_int (value));
+			return;
 	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-static int
-eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *display)
+static void
+contact_display_get_property (GObject *object,
+                              guint property_id,
+                              GValue *value,
+                              GParamSpec *pspec)
 {
-	char *uri;
-	gboolean res = FALSE;
+	switch (property_id) {
+		case PROP_CONTACT:
+			g_value_set_object (
+				value, eab_contact_display_get_contact (
+				EAB_CONTACT_DISPLAY (object)));
+			return;
 
+		case PROP_MODE:
+			g_value_set_int (
+				value, eab_contact_display_get_mode (
+				EAB_CONTACT_DISPLAY (object)));
+			return;
+	}
 
-	if (event->button.button!= 3 )
-		return FALSE;
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+contact_display_dispose (GObject *object)
+{
+	EABContactDisplayPrivate *priv;
 
-       	uri = gtk_html_get_url_at (GTK_HTML (widget), event->button.x, event->button.y);
-	if (uri){
-		eab_uri_popup_event(display,event,uri);
-               	}
+	priv = EAB_CONTACT_DISPLAY_GET_PRIVATE (object);
 
-         g_free(uri);
+	if (priv->contact != NULL) {
+		g_object_unref (priv->contact);
+		priv->contact = NULL;
+	}
 
-	return res;
+	if (priv->ui_manager != NULL) {
+		g_object_unref (priv->ui_manager);
+		priv->ui_manager = NULL;
+	}
+
+	if (priv->email_actions != NULL) {
+		g_object_unref (priv->email_actions);
+		priv->email_actions = NULL;
+	}
+
+	if (priv->uri_actions != NULL) {
+		g_object_unref (priv->uri_actions);
+		priv->uri_actions = NULL;
+	}
+
+	if (priv->invisible != NULL) {
+		g_object_unref (priv->invisible);
+		priv->invisible = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-GtkWidget*
-eab_contact_display_new (void)
+static void
+contact_display_finalize (GObject *object)
 {
-	EABContactDisplay *display;
-
-	struct _EABContactDisplayPrivate *p;
-
-	display = g_object_new (EAB_TYPE_CONTACT_DISPLAY, NULL);
-	p=display->priv = g_new0 (EABContactDisplayPrivate, 1);
-
-	gtk_html_set_default_content_type (GTK_HTML (display), "text/html; charset=utf-8");
-
-	gtk_html_set_editable (GTK_HTML (display), FALSE);
-
-	g_signal_connect (display, "url_requested",
-			  G_CALLBACK (on_url_requested),
-			  display);
-	g_signal_connect (display, "link_clicked",
-			  G_CALLBACK (on_link_clicked),
-			  display);
-        g_signal_connect(display, "button_press_event",
-                          G_CALLBACK(eab_html_press_event),
-                           display);
-        p->invisible = gtk_invisible_new();
-	g_signal_connect(p->invisible, "selection_get", G_CALLBACK(eab_selection_get), display);
-	g_signal_connect(p->invisible, "selection_clear_event", G_CALLBACK(eab_selection_clear_event), display);
-	gtk_selection_add_target(p->invisible, GDK_SELECTION_PRIMARY, GDK_SELECTION_TYPE_STRING, 0);
-	gtk_selection_add_target(p->invisible, GDK_SELECTION_CLIPBOARD, GDK_SELECTION_TYPE_STRING, 1);
-
-#if 0
-	g_signal_connect (display, "object_requested",
-			  G_CALLBACK (on_object_requested),
-			  mail_display);
-	g_signal_connect (display, "button_press_event",
-			  G_CALLBACK (html_button_press_event), mail_display);
-	g_signal_connect (display, "motion_notify_event",
-			  G_CALLBACK (html_motion_notify_event), mail_display);
-	g_signal_connect (display, "enter_notify_event",
-			  G_CALLBACK (html_enter_notify_event), mail_display);
-	g_signal_connect (display, "iframe_created",
-			  G_CALLBACK (html_iframe_created), mail_display);
-	g_signal_connect (display, "on_url",
-			  G_CALLBACK (html_on_url), mail_display);
-#endif
+	EABContactDisplayPrivate *priv;
+
+	priv = EAB_CONTACT_DISPLAY_GET_PRIVATE (object);
 
-	return GTK_WIDGET (display);
+	g_free (priv->selected_uri);
+	g_free (priv->clipboard_uri);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
-eab_contact_display_init (GObject *object)
+eab_contact_display_class_init (EABContactDisplayClass *class)
 {
-	gtk_html_construct ((GtkHTML *)object);
+	GObjectClass *object_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (EABContactDisplayPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->set_property = contact_display_set_property;
+	object_class->get_property = contact_display_get_property;
+	object_class->dispose = contact_display_dispose;
+	object_class->finalize = contact_display_finalize;
+
+	g_object_class_install_property (
+		object_class,
+		PROP_CONTACT,
+		g_param_spec_object (
+			"contact",
+			NULL,
+			NULL,
+			E_TYPE_CONTACT,
+			G_PARAM_READWRITE));
+
+	/* XXX Make this a real enum property. */
+	g_object_class_install_property (
+		object_class,
+		PROP_MODE,
+		g_param_spec_int (
+			"mode",
+			NULL,
+			NULL,
+			EAB_CONTACT_DISPLAY_RENDER_NORMAL,
+			EAB_CONTACT_DISPLAY_RENDER_COMPACT,
+			EAB_CONTACT_DISPLAY_RENDER_NORMAL,
+			G_PARAM_READWRITE));
 }
 
 static void
-eab_contact_display_class_init (GtkObjectClass *object_class)
+eab_contact_display_init (EABContactDisplay *display)
 {
-	/*	object_class->destroy = mail_display_destroy;*/
+	GtkActionGroup *action_group;
+	GtkHTML *html;
+
+	display->priv = EAB_CONTACT_DISPLAY_GET_PRIVATE (display);
+	display->priv->mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
+	display->priv->ui_manager = gtk_ui_manager_new ();
+	display->priv->invisible = gtk_invisible_new ();
+
+	g_object_ref_sink (display->priv->invisible);
+
+	action_group = gtk_action_group_new ("email");
+	gtk_action_group_set_translation_domain (
+		action_group, GETTEXT_PACKAGE);
+	gtk_action_group_add_actions (
+		action_group, email_entries,
+		G_N_ELEMENTS (email_entries), display);
+	gtk_ui_manager_insert_action_group (
+		display->priv->ui_manager, action_group, 0);
+	display->priv->email_actions = action_group;
+
+	action_group = gtk_action_group_new ("uri");
+	gtk_action_group_set_translation_domain (
+		action_group, GETTEXT_PACKAGE);
+	gtk_action_group_add_actions (
+		action_group, uri_entries,
+		G_N_ELEMENTS (uri_entries), display);
+	gtk_ui_manager_insert_action_group (
+		display->priv->ui_manager, action_group, 0);
+	display->priv->uri_actions = action_group;
+
+	gtk_ui_manager_add_ui_from_string (
+		display->priv->ui_manager, ui, -1, NULL);
+
+	html = GTK_HTML (display);
+	gtk_html_construct (html);
+	gtk_html_set_editable (html, FALSE);
+	gtk_html_set_default_content_type (html, "text/html; charset=utf-8");
+
+	g_signal_connect (
+		display, "url-requested",
+		G_CALLBACK (contact_display_on_url_requested), display);
+	g_signal_connect (
+		display, "link-clicked",
+		G_CALLBACK (contact_display_on_link_clicked), display);
+	g_signal_connect (
+		display, "button-press-event",
+		G_CALLBACK (contact_display_button_press_event), display);
+
+	g_signal_connect_swapped (
+		display->priv->invisible, "selection-get",
+		G_CALLBACK (contact_display_selection_get), display);
+	g_signal_connect_swapped (
+		display->priv->invisible, "selection-clear-event",
+		G_CALLBACK (contact_display_selection_clear_event), display);
+	gtk_selection_add_target (
+		display->priv->invisible,
+		GDK_SELECTION_PRIMARY, GDK_SELECTION_TYPE_STRING, 0);
+	gtk_selection_add_target (
+		display->priv->invisible,
+		GDK_SELECTION_CLIPBOARD, GDK_SELECTION_TYPE_STRING, 1);
+
+	e_plugin_ui_register_manager (
+		"contact-display", display->priv->ui_manager, display);
 }
 
 GType
@@ -1015,21 +1142,98 @@ eab_contact_display_get_type (void)
 {
 	static GType type = 0;
 
-	if (!type) {
-		static const GTypeInfo info =  {
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info =  {
 			sizeof (EABContactDisplayClass),
-			NULL,           /* base_init */
-			NULL,           /* base_finalize */
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
 			(GClassInitFunc) eab_contact_display_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
 			sizeof (EABContactDisplay),
-			0,             /* n_preallocs */
+			0,     /* n_preallocs */
 			(GInstanceInitFunc) eab_contact_display_init,
+			NULL   /* value_table */
 		};
 
-		type = g_type_register_static (PARENT_TYPE, "EABContactDisplay", &info, 0);
+		type = g_type_register_static (
+			GTK_TYPE_HTML, "EABContactDisplay", &type_info, 0);
 	}
 
 	return type;
 }
+
+GtkWidget *
+eab_contact_display_new (void)
+{
+	return g_object_new (EAB_TYPE_CONTACT_DISPLAY, NULL);
+}
+
+EContact *
+eab_contact_display_get_contact (EABContactDisplay *display)
+{
+	g_return_val_if_fail (EAB_IS_CONTACT_DISPLAY (display), NULL);
+
+	return display->priv->contact;
+}
+
+void
+eab_contact_display_set_contact (EABContactDisplay *display,
+                                 EContact *contact)
+{
+	EABContactDisplayMode mode;
+
+	g_return_if_fail (EAB_IS_CONTACT_DISPLAY (display));
+
+	mode = eab_contact_display_get_mode (display);
+
+	if (contact != NULL)
+		g_object_ref (contact);
+	if (display->priv->contact != NULL)
+		g_object_unref (display->priv->contact);
+	display->priv->contact = contact;
+
+	switch (mode) {
+		case EAB_CONTACT_DISPLAY_RENDER_NORMAL:
+			eab_contact_display_render_normal (display, contact);
+			break;
+
+		case EAB_CONTACT_DISPLAY_RENDER_COMPACT:
+			eab_contact_display_render_compact (display, contact);
+			break;
+	}
+
+	g_object_notify (G_OBJECT (display), "contact");
+}
+
+EABContactDisplayMode
+eab_contact_display_get_mode (EABContactDisplay *display)
+{
+	g_return_val_if_fail (EAB_IS_CONTACT_DISPLAY (display), 0);
+
+	return display->priv->mode;
+}
+
+void
+eab_contact_display_set_mode (EABContactDisplay *display,
+                              EABContactDisplayMode mode)
+{
+	EContact *contact;
+
+	g_return_if_fail (EAB_IS_CONTACT_DISPLAY (display));
+
+	display->priv->mode = mode;
+	contact = eab_contact_display_get_contact (display);
+
+	switch (mode) {
+		case EAB_CONTACT_DISPLAY_RENDER_NORMAL:
+			eab_contact_display_render_normal (display, contact);
+			break;
+
+		case EAB_CONTACT_DISPLAY_RENDER_COMPACT:
+			eab_contact_display_render_compact (display, contact);
+			break;
+	}
+
+	g_object_notify (G_OBJECT (display), "mode");
+}