Expand EmpathyIndividualWidget

It's now a fully-fledged widget of its own, rather than a thin wrapper
around EmpathyContactWidget. Closes: bgo#626728

5 files changed, 1984 insertions, 72 deletions

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 878f9fb5a..eb75b0707 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -188,7 +188,8 @@ ui_DATA = 					\
 	empathy-log-window.ui			\
 	empathy-chat.ui				\
 	empathy-contact-selector-dialog.ui      \
-	empathy-search-bar.ui
+	empathy-search-bar.ui			\
+	empathy-individual-widget.ui
 
 empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
 	$(AM_V_GEN)( cd $(srcdir) && \
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 2d2e9af7d..172f9e262 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Collabora Ltd.
+ * Copyright (C) 2007-2010 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,7 +15,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * Authors: Philip Withnall <philip.withnall@collabora.co.uk>
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
+ *          Philip Withnall <philip.withnall@collabora.co.uk>
  */
 
 #include <config.h>
@@ -28,12 +29,28 @@
 
 #include <telepathy-glib/util.h>
 
-#include <libempathy/empathy-utils.h>
-
+#include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 
-#include "empathy-individual-widget.h"
+#ifdef HAVE_LIBCHAMPLAIN
+#include <champlain/champlain.h>
+#include <champlain-gtk/champlain-gtk.h>
+#endif
+
+#include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-location.h>
+#include <libempathy/empathy-time.h>
+
+#include "empathy-avatar-image.h"
+#include "empathy-groups-widget.h"
 #include "empathy-gtk-enum-types.h"
+#include "empathy-individual-widget.h"
+#include "empathy-kludge-label.h"
+#include "empathy-string-parser.h"
+#include "empathy-ui-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include <libempathy/empathy-debug.h>
 
 /**
  * SECTION:empathy-individual-widget
@@ -53,16 +70,46 @@
  *
  * Widget which displays appropriate widgets with details about an individual,
  * also allowing changing these details, if desired.
- *
- * Currently, it's just a thin wrapper around #EmpathyContactWidget, and
- * displays the details of the first eligible persona found in the individual.
  */
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualWidget)
 
 typedef struct {
-  FolksIndividual *individual;
+  FolksIndividual *individual; /* owned */
   EmpathyIndividualWidgetFlags flags;
+
+  /* weak pointer to the contact whose contact details we're displaying */
+  TpContact *contact_info_contact;
+
+  /* unowned Persona (borrowed from priv->individual) -> GtkTable child */
+  GHashTable *persona_tables;
+  /* Table containing the information for the individual as whole, or NULL */
+  GtkTable *individual_table;
+
+  /* Individual */
+  GtkWidget *hbox_presence;
+  GtkWidget *vbox_individual;
+
+  /* Location */
+  GtkWidget *vbox_location;
+  GtkWidget *subvbox_location;
+  GtkWidget *table_location;
+  GtkWidget *label_location;
+#ifdef HAVE_LIBCHAMPLAIN
+  GtkWidget *viewport_map;
+  GtkWidget *map_view_embed;
+  ChamplainView *map_view;
+#endif
+
+  /* Groups */
+  GtkWidget *groups_widget;
+
+  /* Details */
+  GtkWidget *vbox_details;
+  GtkWidget *table_details;
+  GtkWidget *hbox_details_requested;
+  GtkWidget *details_spinner;
+  GCancellable *details_cancellable; /* owned */
 } EmpathyIndividualWidgetPriv;
 
 G_DEFINE_TYPE (EmpathyIndividualWidget, empathy_individual_widget,
@@ -74,13 +121,1699 @@ enum {
 };
 
 static void
+details_set_up (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+
+  gtk_widget_hide (priv->vbox_details);
+
+  priv->details_spinner = gtk_spinner_new ();
+  gtk_box_pack_end (GTK_BOX (priv->hbox_details_requested),
+      priv->details_spinner, TRUE, TRUE, 0);
+  gtk_widget_show (priv->details_spinner);
+}
+
+typedef struct
+{
+  const gchar *field_name;
+  const gchar *title;
+  gboolean linkify;
+} InfoFieldData;
+
+static InfoFieldData info_field_data[] =
+{
+  { "fn",    N_("Full name:"),      FALSE },
+  { "tel",   N_("Phone number:"),   FALSE },
+  { "email", N_("E-mail address:"), TRUE },
+  { "url",   N_("Website:"),        TRUE },
+  { "bday",  N_("Birthday:"),       FALSE },
+  { NULL, NULL }
+};
+
+static InfoFieldData *
+find_info_field_data (const gchar *field_name)
+{
+  guint i;
+
+  for (i = 0; info_field_data[i].field_name != NULL; i++)
+    {
+      if (tp_strdiff (info_field_data[i].field_name, field_name) == FALSE)
+        return info_field_data + i;
+    }
+  return NULL;
+}
+
+static gint
+contact_info_field_name_cmp (const gchar *name1,
+    const gchar *name2)
+{
+  guint i;
+
+  if (tp_strdiff (name1, name2) == FALSE)
+    return 0;
+
+  /* We use the order of info_field_data */
+  for (i = 0; info_field_data[i].field_name != NULL; i++)
+    {
+      if (tp_strdiff (info_field_data[i].field_name, name1) == FALSE)
+        return -1;
+      if (tp_strdiff (info_field_data[i].field_name, name2) == FALSE)
+        return +1;
+    }
+
+  return g_strcmp0 (name1, name2);
+}
+
+static gint
+contact_info_field_cmp (TpContactInfoField *field1,
+    TpContactInfoField *field2)
+{
+  return contact_info_field_name_cmp (field1->field_name, field2->field_name);
+}
+
+typedef struct {
+  EmpathyIndividualWidget *widget; /* weak */
+  TpContact *contact; /* owned */
+} DetailsData;
+
+static void
+details_data_free (DetailsData *data)
+{
+  if (data->widget != NULL)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (data->widget),
+          (gpointer *) &data->widget);
+    }
+  g_object_unref (data->contact);
+  g_slice_free (DetailsData, data);
+}
+
+static guint
+details_update_show (EmpathyIndividualWidget *self,
+    TpContact *contact)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GList *info, *l;
+  guint n_rows = 0;
+
+  info = tp_contact_get_contact_info (contact);
+  info = g_list_sort (info, (GCompareFunc) contact_info_field_cmp);
+  for (l = info; l != NULL; l = l->next)
+    {
+      TpContactInfoField *field = l->data;
+      InfoFieldData *field_data;
+      const gchar *value;
+      GtkWidget *w;
+
+      if (field->field_value == NULL || field->field_value[0] == NULL)
+        continue;
+
+      value = field->field_value[0];
+
+      field_data = find_info_field_data (field->field_name);
+      if (field_data == NULL)
+        {
+          DEBUG ("Unhandled ContactInfo field: %s", field->field_name);
+          continue;
+        }
+
+      /* Add Title */
+      w = gtk_label_new (_(field_data->title));
+      gtk_table_attach (GTK_TABLE (priv->table_details),
+          w, 0, 1, n_rows, n_rows + 1, GTK_FILL, 0, 0, 0);
+      gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+      gtk_widget_show (w);
+
+      /* Add Value */
+      w = gtk_label_new (value);
+      if (field_data->linkify == TRUE)
+        {
+          gchar *markup;
+
+          markup = empathy_add_link_markup (value);
+          gtk_label_set_markup (GTK_LABEL (w), markup);
+          g_free (markup);
+        }
+
+      if (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP))
+        gtk_label_set_selectable (GTK_LABEL (w), TRUE);
+
+      gtk_table_attach_defaults (GTK_TABLE (priv->table_details),
+          w, 1, 2, n_rows, n_rows + 1);
+      gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+      gtk_widget_show (w);
+
+      n_rows++;
+    }
+  g_list_free (info);
+
+  return n_rows;
+}
+
+static void
+details_notify_cb (TpContact *contact,
+    GParamSpec *pspec,
+    EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  guint n_rows;
+
+  gtk_container_foreach (GTK_CONTAINER (priv->table_details),
+      (GtkCallback) gtk_widget_destroy, NULL);
+
+  n_rows = details_update_show (self, contact);
+
+  if (n_rows > 0)
+    {
+      gtk_widget_show (priv->vbox_details);
+      gtk_widget_show (priv->table_details);
+    }
+  else
+    {
+      gtk_widget_hide (priv->vbox_details);
+    }
+
+  gtk_widget_hide (priv->hbox_details_requested);
+  gtk_spinner_stop (GTK_SPINNER (priv->details_spinner));
+}
+
+static void
+details_request_cb (TpContact *contact,
+    GAsyncResult *res,
+    DetailsData *data)
+{
+  EmpathyIndividualWidget *self = data->widget;
+  gboolean hide_widget = FALSE;
+  GError *error = NULL;
+
+  if (tp_contact_request_contact_info_finish (contact, res, &error) == TRUE)
+    details_notify_cb (contact, NULL, self);
+  else
+    hide_widget = TRUE;
+
+  g_clear_error (&error);
+
+  if (self != NULL)
+    {
+      EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+
+      if (hide_widget == TRUE)
+        gtk_widget_hide (GET_PRIV (self)->vbox_details);
+
+      tp_clear_object (&priv->details_cancellable);
+
+      /* We need a (weak) pointer to the contact so that we can disconnect the
+       * signal handler on deconstruction. */
+      if (priv->contact_info_contact != NULL)
+        {
+          g_object_remove_weak_pointer (G_OBJECT (priv->contact_info_contact),
+            (gpointer *) &priv->contact_info_contact);
+        }
+
+      priv->contact_info_contact = contact;
+      g_object_add_weak_pointer (G_OBJECT (contact),
+          (gpointer *) &priv->contact_info_contact);
+
+      g_signal_connect (contact, "notify::contact-info",
+          (GCallback) details_notify_cb, self);
+    }
+
+  details_data_free (data);
+}
+
+static void
+details_feature_prepared_cb (TpConnection *connection,
+    GAsyncResult *res,
+    DetailsData *data)
+{
+  EmpathyIndividualWidget *self = data->widget;
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+
+  if (tp_proxy_prepare_finish (connection, res, NULL) == FALSE)
+    {
+      gtk_widget_hide (priv->vbox_details);
+      details_data_free (data);
+      return;
+    }
+
+  /* Request the Individual's info */
+  gtk_widget_show (priv->vbox_details);
+  gtk_widget_show (priv->hbox_details_requested);
+  gtk_widget_hide (priv->table_details);
+  gtk_spinner_start (GTK_SPINNER (priv->details_spinner));
+
+  if (priv->details_cancellable == NULL)
+    {
+      priv->details_cancellable = g_cancellable_new ();
+      tp_contact_request_contact_info_async (data->contact,
+          priv->details_cancellable, (GAsyncReadyCallback) details_request_cb,
+          data);
+    }
+}
+
+static void
+details_update (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  TpContact *tp_contact = NULL;
+
+  if (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_SHOW_DETAILS))
+    return;
+
+  gtk_widget_hide (priv->vbox_details);
+
+  if (priv->individual != NULL)
+    {
+      /* FIXME: We take the first TpContact we find and only use its details.
+       * It would be a lot better if we would get the details for every
+       * TpContact in the Individual and merge them all, but that requires
+       * vCard support in libfolks for it to not be hideously complex.
+       * (bgo#627399) */
+      GList *personas, *l;
+
+      personas = folks_individual_get_personas (priv->individual);
+      for (l = personas; l != NULL; l = l->next)
+        {
+          if (TPF_IS_PERSONA (l->data))
+            {
+              tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data));
+              if (tp_contact != NULL)
+                break;
+            }
+        }
+    }
+
+  if (tp_contact != NULL)
+    {
+      GQuark features[] = { TP_CONNECTION_FEATURE_CONTACT_INFO, 0 };
+      TpConnection *connection;
+      DetailsData *data;
+
+      data = g_slice_new (DetailsData);
+      data->widget = self;
+      g_object_add_weak_pointer (G_OBJECT (self), (gpointer *) &data->widget);
+      data->contact = g_object_ref (tp_contact);
+
+      /* First, make sure the CONTACT_INFO feature is ready on the connection */
+      connection = tp_contact_get_connection (tp_contact);
+      tp_proxy_prepare_async (connection, features,
+          (GAsyncReadyCallback) details_feature_prepared_cb, data);
+    }
+}
+
+static void
+groups_update (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_GROUPS &&
+      priv->individual != NULL)
+    {
+      empathy_groups_widget_set_groupable (
+          EMPATHY_GROUPS_WIDGET (priv->groups_widget),
+          FOLKS_GROUPS (priv->individual));
+      gtk_widget_show (priv->groups_widget);
+    }
+  else
+    {
+      gtk_widget_hide (priv->groups_widget);
+    }
+}
+
+/* Converts the Location's GHashTable's key to a user readable string */
+static const gchar *
+location_key_to_label (const gchar *key)
+{
+  if (tp_strdiff (key, EMPATHY_LOCATION_COUNTRY_CODE) == FALSE)
+    return _("Country ISO Code:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_COUNTRY) == FALSE)
+    return _("Country:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_REGION) == FALSE)
+    return _("State:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_LOCALITY) == FALSE)
+    return _("City:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_AREA) == FALSE)
+    return _("Area:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_POSTAL_CODE) == FALSE)
+    return _("Postal Code:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_STREET) == FALSE)
+    return _("Street:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_BUILDING) == FALSE)
+    return _("Building:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_FLOOR) == FALSE)
+    return _("Floor:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_ROOM) == FALSE)
+    return _("Room:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_TEXT) == FALSE)
+    return _("Text:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_DESCRIPTION) == FALSE)
+    return _("Description:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_URI) == FALSE)
+    return _("URI:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_ACCURACY_LEVEL) == FALSE)
+    return _("Accuracy Level:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_ERROR) == FALSE)
+    return _("Error:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_VERTICAL_ERROR_M) == FALSE)
+    return _("Vertical Error (meters):");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_HORIZONTAL_ERROR_M) == FALSE)
+    return _("Horizontal Error (meters):");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_SPEED) == FALSE)
+    return _("Speed:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_BEARING) == FALSE)
+    return _("Bearing:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_CLIMB) == FALSE)
+    return _("Climb Speed:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_TIMESTAMP) == FALSE)
+    return _("Last Updated on:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_LON) == FALSE)
+    return _("Longitude:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_LAT) == FALSE)
+    return _("Latitude:");
+  else if (tp_strdiff (key, EMPATHY_LOCATION_ALT) == FALSE)
+    return _("Altitude:");
+  else
+  {
+    DEBUG ("Unexpected Location key: %s", key);
+    return key;
+  }
+}
+
+static void
+location_update (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  EmpathyContact *contact = NULL;
+  GHashTable *location = NULL;
+  GValue *value;
+  GtkWidget *label;
+  guint row = 0;
+  static const gchar* ordered_geolocation_keys[] = {
+    EMPATHY_LOCATION_TEXT,
+    EMPATHY_LOCATION_URI,
+    EMPATHY_LOCATION_DESCRIPTION,
+    EMPATHY_LOCATION_BUILDING,
+    EMPATHY_LOCATION_FLOOR,
+    EMPATHY_LOCATION_ROOM,
+    EMPATHY_LOCATION_STREET,
+    EMPATHY_LOCATION_AREA,
+    EMPATHY_LOCATION_LOCALITY,
+    EMPATHY_LOCATION_REGION,
+    EMPATHY_LOCATION_COUNTRY,
+    NULL
+  };
+  int i;
+  const gchar *skey;
+  gboolean display_map = FALSE;
+  GList *personas, *l;
+
+  if (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_SHOW_LOCATION))
+    {
+      gtk_widget_hide (priv->vbox_location);
+      return;
+    }
+
+  /* FIXME: For the moment, we just display the first location data we can
+   * find amongst the Individual's Personas. Once libfolks grows a location
+   * interface, we can use that. (bgo#627400) */
+  personas = folks_individual_get_personas (priv->individual);
+  for (l = personas; l != NULL; l = l->next)
+    {
+      FolksPersona *persona = FOLKS_PERSONA (l->data);
+
+      if (TPF_IS_PERSONA (persona))
+        {
+          TpContact *tp_contact;
+
+          /* Get the contact. If it turns out to have location information, we
+           * have to keep it alive for the duration of the function, since we're
+           * accessing its private data. */
+          tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
+          contact = empathy_contact_dup_from_tp_contact (tp_contact);
+          empathy_contact_set_persona (contact, persona);
+
+          /* Try and get a location */
+          location = empathy_contact_get_location (contact);
+          if (location != NULL && g_hash_table_size (location) > 0)
+            break;
+
+          location = NULL;
+          tp_clear_object (&contact);
+        }
+    }
+
+  if (contact == NULL || location == NULL)
+    {
+      gtk_widget_hide (priv->vbox_location);
+      tp_clear_object (&contact);
+      return;
+    }
+
+  value = g_hash_table_lookup (location, EMPATHY_LOCATION_TIMESTAMP);
+  if (value == NULL)
+    {
+      gchar *loc = g_strdup_printf ("<b>%s</b>", _("Location"));
+      gtk_label_set_markup (GTK_LABEL (priv->label_location), loc);
+      g_free (loc);
+    }
+  else
+    {
+      gchar *user_date;
+      gchar *text;
+      gint64 stamp;
+      time_t time_;
+
+      stamp = g_value_get_int64 (value);
+      time_ = stamp;
+
+      user_date = empathy_time_to_string_relative (time_);
+
+      text = g_strconcat ( _("<b>Location</b>, "), user_date, NULL);
+      gtk_label_set_markup (GTK_LABEL (priv->label_location), text);
+      g_free (user_date);
+      g_free (text);
+    }
+
+  /* Prepare the location information table */
+  if (priv->table_location != NULL)
+    gtk_widget_destroy (priv->table_location);
+
+  priv->table_location = gtk_table_new (1, 2, FALSE);
+  gtk_box_pack_start (GTK_BOX (priv->subvbox_location),
+      priv->table_location, FALSE, FALSE, 5);
+
+
+  for (i = 0; (skey = ordered_geolocation_keys[i]); i++)
+    {
+      const gchar* user_label;
+      GValue *gvalue;
+      char *svalue = NULL;
+
+      gvalue = g_hash_table_lookup (location, (gpointer) skey);
+      if (gvalue == NULL)
+        continue;
+
+      user_label = location_key_to_label (skey);
+
+      label = gtk_label_new (user_label);
+      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_table_attach (GTK_TABLE (priv->table_location),
+          label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 10, 0);
+      gtk_widget_show (label);
+
+      if (G_VALUE_TYPE (gvalue) == G_TYPE_DOUBLE)
+        {
+          gdouble dvalue;
+          dvalue = g_value_get_double (gvalue);
+          svalue = g_strdup_printf ("%f", dvalue);
+        }
+      else if (G_VALUE_TYPE (gvalue) == G_TYPE_STRING)
+        {
+          svalue = g_value_dup_string (gvalue);
+        }
+      else if (G_VALUE_TYPE (gvalue) == G_TYPE_INT64)
+        {
+          time_t time_;
+
+          time_ = g_value_get_int64 (value);
+          svalue = empathy_time_to_string_utc (time_, _("%B %e, %Y at %R UTC"));
+        }
+
+      if (svalue != NULL)
+        {
+          label = gtk_label_new (svalue);
+          gtk_table_attach_defaults (GTK_TABLE (priv->table_location),
+              label, 1, 2, row, row + 1);
+          gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
+          gtk_widget_show (label);
+
+          if (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP))
+            gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+        }
+
+      g_free (svalue);
+      row++;
+    }
+
+  tp_clear_object (&contact);
+
+#ifdef HAVE_LIBCHAMPLAIN
+  if ((g_hash_table_lookup (location, EMPATHY_LOCATION_LAT) != NULL) &&
+      (g_hash_table_lookup (location, EMPATHY_LOCATION_LON) != NULL) &&
+      !(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP))
+    {
+      /* Cannot be displayed in tooltips until Clutter-Gtk can deal with such
+       * windows */
+      display_map = TRUE;
+    }
+#endif
+
+  if (row > 0)
+    {
+      /* We can display some fields */
+      gtk_widget_show (priv->table_location);
+    }
+  else if (display_map == FALSE)
+    {
+      /* Can't display either fields or map */
+      gtk_widget_hide (priv->vbox_location);
+      return;
+    }
+
+#ifdef HAVE_LIBCHAMPLAIN
+  if (display_map == TRUE)
+    {
+      GPtrArray *markers;
+      ChamplainLayer *layer;
+
+      priv->map_view_embed = gtk_champlain_embed_new ();
+      priv->map_view = gtk_champlain_embed_get_view (
+          GTK_CHAMPLAIN_EMBED (priv->map_view_embed));
+
+      gtk_container_add (GTK_CONTAINER (priv->viewport_map),
+          priv->map_view_embed);
+      g_object_set (G_OBJECT (priv->map_view),
+          "show-license", TRUE,
+          "scroll-mode", CHAMPLAIN_SCROLL_MODE_KINETIC,
+          "zoom-level", 10,
+          NULL);
+
+      layer = champlain_layer_new ();
+      champlain_view_add_layer (priv->map_view, layer);
+      markers = g_ptr_array_new ();
+
+      /* FIXME: For now, we have to do this manually. Once libfolks grows a
+       * location interface, we can use that. (bgo#627400) */
+      personas = folks_individual_get_personas (priv->individual);
+      for (l = personas; l != NULL; l = l->next)
+        {
+          FolksPersona *persona = FOLKS_PERSONA (l->data);
+
+          if (TPF_IS_PERSONA (persona))
+            {
+              gdouble lat = 0.0, lon = 0.0;
+              ClutterActor *marker;
+              TpContact *tp_contact;
+
+              /* Get the contact */
+              tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
+              contact = empathy_contact_dup_from_tp_contact (tp_contact);
+              empathy_contact_set_persona (contact, persona);
+
+              /* Try and get a location */
+              location = empathy_contact_get_location (contact);
+              if (location == NULL || g_hash_table_size (location) == 0)
+                {
+                  g_object_unref (contact);
+                  continue;
+                }
+
+              /* Get this persona's latitude and longitude */
+              value = g_hash_table_lookup (location, EMPATHY_LOCATION_LAT);
+              if (value == NULL)
+                {
+                  g_object_unref (contact);
+                  continue;
+                }
+
+              lat = g_value_get_double (value);
+
+              value = g_hash_table_lookup (location, EMPATHY_LOCATION_LON);
+              if (value == NULL)
+                {
+                  g_object_unref (contact);
+                  continue;
+                }
+
+              lon = g_value_get_double (value);
+
+              /* Add a marker to the map */
+              marker = champlain_marker_new_with_text (
+                  folks_alias_get_alias (FOLKS_ALIAS (persona)), NULL, NULL,
+                  NULL);
+              champlain_base_marker_set_position (
+                  CHAMPLAIN_BASE_MARKER (marker), lat, lon);
+              clutter_container_add (CLUTTER_CONTAINER (layer), marker, NULL);
+
+              g_ptr_array_add (markers, marker);
+
+              g_object_unref (contact);
+            }
+        }
+
+      /* Zoom to show all of the markers */
+      g_ptr_array_add (markers, NULL); /* NULL-terminate the array */
+      champlain_view_ensure_markers_visible (priv->map_view,
+          (ChamplainBaseMarker **) markers->pdata, FALSE);
+      g_ptr_array_free (markers, TRUE);
+
+      gtk_widget_show_all (priv->viewport_map);
+    }
+#endif
+
+    gtk_widget_show (priv->vbox_location);
+}
+
+static EmpathyAvatar *
+persona_dup_avatar (FolksPersona *persona)
+{
+  TpContact *tp_contact;
+  EmpathyContact *contact;
+  EmpathyAvatar *avatar;
+
+  if (!TPF_IS_PERSONA (persona))
+    return NULL;
+
+  tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
+  contact = empathy_contact_dup_from_tp_contact (tp_contact);
+  empathy_contact_set_persona (contact, persona);
+
+  avatar = empathy_contact_get_avatar (contact);
+  if (avatar != NULL)
+    empathy_avatar_ref (avatar);
+  g_object_unref (contact);
+
+  return avatar;
+}
+
+static EmpathyAvatar *
+individual_dup_avatar (FolksIndividual *individual)
+{
+  GList *personas, *l;
+  EmpathyAvatar *avatar = NULL;
+
+  /* FIXME: We just choose the first Persona which has an avatar, and save that.
+   * The avatar handling in EmpathyContact needs to be moved into libfolks as
+   * much as possible, and this code rewritten to use FolksAvatar.
+   * (bgo#627401) */
+  personas = folks_individual_get_personas (individual);
+  for (l = personas; l != NULL; l = l->next)
+    {
+      avatar = persona_dup_avatar (FOLKS_PERSONA (l->data));
+      if (avatar != NULL)
+        break;
+    }
+
+  return avatar;
+}
+
+static void
+save_avatar_menu_activate_cb (GtkWidget *widget,
+    EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GtkWidget *dialog;
+  EmpathyAvatar *avatar;
+  gchar *ext = NULL, *filename;
+
+  dialog = gtk_file_chooser_dialog_new (_("Save Avatar"),
+      NULL,
+      GTK_FILE_CHOOSER_ACTION_SAVE,
+      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+      GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+      NULL);
+
+  gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
+      TRUE);
+
+  avatar = individual_dup_avatar (priv->individual);
+  if (avatar == NULL)
+    return;
+
+  /* look for the avatar extension */
+  if (avatar->format != NULL)
+    {
+      gchar **splitted;
+
+      splitted = g_strsplit (avatar->format, "/", 2);
+      if (splitted[0] != NULL && splitted[1] != NULL)
+          ext = g_strdup (splitted[1]);
+
+      g_strfreev (splitted);
+    }
+  else
+    {
+      /* Avatar was loaded from the cache so was converted to PNG */
+      ext = g_strdup ("png");
+    }
+
+  if (ext != NULL)
+    {
+      gchar *id;
+
+      id = tp_escape_as_identifier (folks_individual_get_id (priv->individual));
+
+      filename = g_strdup_printf ("%s.%s", id, ext);
+      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
+
+      g_free (id);
+      g_free (ext);
+      g_free (filename);
+    }
+
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+    {
+      GError *error = NULL;
+
+      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+      if (empathy_avatar_save_to_file (avatar, filename, &error) == FALSE)
+        {
+          /* Save error */
+          GtkWidget *error_dialog;
+
+          error_dialog = gtk_message_dialog_new (NULL, 0,
+              GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+              _("Unable to save avatar"));
+
+          gtk_message_dialog_format_secondary_text (
+              GTK_MESSAGE_DIALOG (error_dialog), "%s", error->message);
+
+          g_signal_connect (error_dialog, "response",
+              (GCallback) gtk_widget_destroy, NULL);
+
+          gtk_window_present (GTK_WINDOW (error_dialog));
+
+          g_clear_error (&error);
+        }
+
+      g_free (filename);
+    }
+
+  gtk_widget_destroy (dialog);
+  empathy_avatar_unref (avatar);
+}
+
+static gboolean
+popup_avatar_menu (EmpathyIndividualWidget *self,
+    GtkWidget *parent,
+    GdkEventButton *event)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GtkWidget *menu, *item;
+  EmpathyAvatar *avatar;
+  gint button, event_time;
+
+  if (priv->individual == NULL)
+    return FALSE;
+
+  avatar = individual_dup_avatar (priv->individual);
+  if (avatar == NULL)
+    return FALSE;
+  empathy_avatar_unref (avatar);
+
+  menu = gtk_menu_new ();
+
+  /* Add "Save as..." entry */
+  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE_AS, NULL);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_widget_show (item);
+
+  g_signal_connect (item, "activate",
+      (GCallback) save_avatar_menu_activate_cb, self);
+
+  if (event != NULL)
+    {
+      button = event->button;
+      event_time = event->time;
+    }
+  else
+    {
+      button = 0;
+      event_time = gtk_get_current_event_time ();
+    }
+
+  gtk_menu_attach_to_widget (GTK_MENU (menu), parent, NULL);
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, event_time);
+  g_object_ref_sink (menu);
+  g_object_unref (menu);
+
+  return TRUE;
+}
+
+static gboolean
+avatar_widget_popup_menu_cb (GtkWidget *widget,
+    EmpathyIndividualWidget *self)
+{
+  return popup_avatar_menu (self, widget, NULL);
+}
+
+static gboolean
+avatar_widget_button_press_event_cb (GtkWidget *widget,
+    GdkEventButton *event,
+    EmpathyIndividualWidget *self)
+{
+  /* Ignore double-clicks and triple-clicks */
+  if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+    return popup_avatar_menu (self, widget, event);
+
+  return FALSE;
+}
+
+/* Returns the TpAccount for the user as a convenience. Note that it has a ref
+ * added. */
+static TpAccount *
+individual_is_user (FolksIndividual *individual)
+{
+  GList *personas, *l;
+
+  /* FIXME: This should move into libfolks when libfolks grows a way of
+   * determining "self". (bgo#627402) */
+  personas = folks_individual_get_personas (individual);
+  for (l = personas; l != NULL; l = l->next)
+    {
+      FolksPersona *persona = FOLKS_PERSONA (l->data);
+
+      if (TPF_IS_PERSONA (persona))
+        {
+          TpContact *tp_contact;
+          EmpathyContact *contact;
+
+          /* Get the contact */
+          tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
+          contact = empathy_contact_dup_from_tp_contact (tp_contact);
+          empathy_contact_set_persona (contact, persona);
+
+          /* Determine if the contact is the user */
+          if (empathy_contact_is_user (contact))
+            {
+              g_object_unref (contact);
+              return g_object_ref (empathy_contact_get_account (contact));
+            }
+
+          g_object_unref (contact);
+        }
+    }
+
+  return NULL;
+}
+
+static void
+set_nickname_cb (TpAccount *account,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+
+  if (tp_account_set_nickname_finish (account, result, &error) == FALSE)
+    {
+      DEBUG ("Failed to set Account.Nickname: %s", error->message);
+      g_error_free (error);
+    }
+}
+
+static gboolean
+entry_alias_focus_event_cb (GtkEditable *editable,
+    GdkEventFocus *event,
+    EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+
+  if (priv->individual != NULL)
+    {
+      const gchar *alias;
+      TpAccount *account;
+
+      alias = gtk_entry_get_text (GTK_ENTRY (editable));
+      account = individual_is_user (priv->individual);
+
+      if (account != NULL)
+        {
+          DEBUG ("Set Account.Nickname to %s", alias);
+          tp_account_set_nickname_async (account, alias,
+              (GAsyncReadyCallback) set_nickname_cb, NULL);
+          g_object_unref (account);
+        }
+      else
+        {
+          folks_alias_set_alias (FOLKS_ALIAS (priv->individual), alias);
+        }
+    }
+
+  return FALSE;
+}
+
+static void
+favourite_toggled_cb (GtkToggleButton *button,
+    EmpathyIndividualWidget *self)
+{
+  gboolean active = gtk_toggle_button_get_active (button);
+  folks_favourite_set_is_favourite (
+      FOLKS_FAVOURITE (GET_PRIV (self)->individual), active);
+}
+
+static void
+notify_avatar_cb (gpointer folks_object,
+    GParamSpec *pspec,
+    EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  EmpathyAvatar *avatar = NULL;
+  GObject *table;
+  GtkWidget *avatar_widget;
+
+  if (FOLKS_IS_INDIVIDUAL (folks_object))
+    {
+      avatar = individual_dup_avatar (FOLKS_INDIVIDUAL (folks_object));
+      table = G_OBJECT (priv->individual_table);
+    }
+  else if (FOLKS_IS_PERSONA (folks_object))
+    {
+      avatar = persona_dup_avatar (FOLKS_PERSONA (folks_object));
+      table = g_hash_table_lookup (priv->persona_tables, folks_object);
+    }
+  else
+    {
+      g_assert_not_reached ();
+    }
+
+  if (table == NULL)
+    return;
+
+  avatar_widget = g_object_get_data (table, "avatar-widget");
+  empathy_avatar_image_set (EMPATHY_AVATAR_IMAGE (avatar_widget), avatar);
+
+  if (avatar != NULL)
+    empathy_avatar_unref (avatar);
+}
+
+static void
+notify_alias_cb (gpointer folks_object,
+    GParamSpec *pspec,
+    EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GObject *table;
+  GtkWidget *alias_widget;
+
+  if (FOLKS_IS_INDIVIDUAL (folks_object))
+    table = G_OBJECT (priv->individual_table);
+  else if (FOLKS_IS_PERSONA (folks_object))
+    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+  else
+    g_assert_not_reached ();
+
+  if (table == NULL)
+    return;
+
+  alias_widget = g_object_get_data (table, "alias-widget");
+
+  if (GTK_IS_ENTRY (alias_widget))
+    {
+      gtk_entry_set_text (GTK_ENTRY (alias_widget),
+          folks_alias_get_alias (FOLKS_ALIAS (folks_object)));
+    }
+  else
+    {
+      gtk_label_set_label (GTK_LABEL (alias_widget),
+          folks_alias_get_alias (FOLKS_ALIAS (folks_object)));
+    }
+}
+
+static void
+notify_presence_cb (gpointer folks_object,
+    GParamSpec *pspec,
+    EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GObject *table;
+  GtkWidget *status_label, *state_image;
+  const gchar *message;
+  gchar *markup_text = NULL;
+
+  if (FOLKS_IS_INDIVIDUAL (folks_object))
+    table = G_OBJECT (priv->individual_table);
+  else if (FOLKS_IS_PERSONA (folks_object))
+    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+  else
+    g_assert_not_reached ();
+
+  if (table == NULL)
+    return;
+
+  status_label = g_object_get_data (table, "status-label");
+  state_image = g_object_get_data (table, "state-image");
+
+  /* FIXME: Default messages should be moved into libfolks (bgo#627403) */
+  message = folks_presence_get_presence_message (FOLKS_PRESENCE (folks_object));
+  if (EMP_STR_EMPTY (message))
+    {
+      message = empathy_presence_get_default_message (
+          folks_presence_get_presence_type (FOLKS_PRESENCE (folks_object)));
+    }
+
+  if (message != NULL)
+    markup_text = empathy_add_link_markup (message);
+  gtk_label_set_markup (GTK_LABEL (status_label), markup_text);
+  g_free (markup_text);
+
+  gtk_image_set_from_icon_name (GTK_IMAGE (state_image),
+      empathy_icon_name_for_presence (
+          folks_presence_get_presence_type (FOLKS_PRESENCE (folks_object))),
+      GTK_ICON_SIZE_BUTTON);
+  gtk_widget_show (state_image);
+}
+
+static void
+notify_is_favourite_cb (gpointer folks_object,
+    GParamSpec *pspec,
+    EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GObject *table;
+  GtkWidget *favourite_widget;
+
+  if (FOLKS_IS_INDIVIDUAL (folks_object))
+    table = G_OBJECT (priv->individual_table);
+  else if (FOLKS_IS_PERSONA (folks_object))
+    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+  else
+    g_assert_not_reached ();
+
+  if (table == NULL)
+    return;
+
+  favourite_widget = g_object_get_data (table, "favourite-widget");
+
+  if (GTK_IS_TOGGLE_BUTTON (favourite_widget))
+    {
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (favourite_widget),
+          folks_favourite_get_is_favourite (FOLKS_FAVOURITE (folks_object)));
+    }
+}
+
+static void
+alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
+    GtkTable *table,
+    guint starting_row)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GtkWidget *label, *alias, *image, *avatar, *alignment;
+  guint current_row = starting_row;
+
+  /* Alias */
+  label = gtk_label_new (_("Alias:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_table_attach (table, label, 0, 1, current_row, current_row + 1, GTK_FILL,
+      GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  /* Set up alias label/entry */
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_ALIAS)
+    {
+      alias = gtk_entry_new ();
+
+      g_signal_connect (alias, "focus-out-event",
+          (GCallback) entry_alias_focus_event_cb, self);
+
+      /* Make return activate the window default (the Close button) */
+      gtk_entry_set_activates_default (GTK_ENTRY (alias), TRUE);
+    }
+  else
+    {
+      alias = gtk_label_new (NULL);
+      if (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP))
+        gtk_label_set_selectable (GTK_LABEL (alias), TRUE);
+      gtk_misc_set_alignment (GTK_MISC (alias), 0.0, 0.5);
+    }
+
+  g_object_set_data (G_OBJECT (table), "alias-widget", alias);
+  gtk_table_attach (table, alias, 1, 2, current_row, current_row + 1,
+      GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  gtk_widget_show (alias);
+
+  current_row++;
+
+  /* Presence */
+  priv->hbox_presence = gtk_hbox_new (FALSE, 6);
+
+  /* Presence image */
+  image = gtk_image_new_from_stock (GTK_STOCK_MISSING_IMAGE,
+      GTK_ICON_SIZE_BUTTON);
+  g_object_set_data (G_OBJECT (table), "state-image", image);
+  gtk_box_pack_start (GTK_BOX (priv->hbox_presence), image, FALSE,
+      FALSE, 0);
+  gtk_widget_show (image);
+
+  /* Set up status_label as a KludgeLabel */
+  label = empathy_kludge_label_new ("");
+  gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+
+  gtk_label_set_selectable (GTK_LABEL (label),
+      (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP) ? FALSE : TRUE);
+
+  g_object_set_data (G_OBJECT (table), "status-label", label);
+  gtk_box_pack_start (GTK_BOX (priv->hbox_presence), label, TRUE,
+      TRUE, 0);
+  gtk_widget_show (label);
+
+  gtk_table_attach (table, priv->hbox_presence, 0, 2, current_row,
+      current_row + 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  gtk_widget_show (priv->hbox_presence);
+
+  current_row++;
+
+  /* Set up favourite toggle button */
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+    {
+      GtkWidget *favourite = gtk_check_button_new_with_label (_("Favorite"));
+
+      g_signal_connect (favourite, "toggled",
+          (GCallback) favourite_toggled_cb, self);
+
+      g_object_set_data (G_OBJECT (table), "favourite-widget", favourite);
+      gtk_table_attach (table, favourite, 0, 2, current_row, current_row + 1,
+          GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+      gtk_widget_show (favourite);
+
+      current_row++;
+    }
+
+  /* Set up avatar display */
+  avatar = empathy_avatar_image_new ();
+
+  if (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP))
+    {
+      g_signal_connect (avatar, "popup-menu",
+          (GCallback) avatar_widget_popup_menu_cb, self);
+      g_signal_connect (avatar, "button-press-event",
+          (GCallback) avatar_widget_button_press_event_cb, self);
+    }
+
+  g_object_set_data (G_OBJECT (table), "avatar-widget", avatar);
+
+  alignment = gtk_alignment_new (1.0, 0.0, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (alignment), avatar);
+  gtk_widget_show (avatar);
+
+  gtk_table_attach (table, alignment, 2, 3, 0, current_row + 1,
+      GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 6, 6);
+  gtk_widget_show (alignment);
+}
+
+static void
+update_persona (EmpathyIndividualWidget *self, FolksPersona *persona)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  TpContact *tp_contact;
+  EmpathyContact *contact;
+  TpAccount *account;
+  GtkTable *table;
+  GtkLabel *label;
+  GtkImage *image;
+  const gchar *id;
+
+  table = g_hash_table_lookup (priv->persona_tables, persona);
+
+  g_assert (table != NULL);
+
+  tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
+  contact = empathy_contact_dup_from_tp_contact (tp_contact);
+  empathy_contact_set_persona (contact, persona);
+
+  account = empathy_contact_get_account (contact);
+
+  /* Update account widget */
+  if (account != NULL)
+    {
+      const gchar *name;
+
+      label = g_object_get_data (G_OBJECT (table), "account-label");
+      image = g_object_get_data (G_OBJECT (table), "account-image");
+
+      name = tp_account_get_display_name (account);
+      gtk_label_set_label (label, name);
+
+      name = tp_account_get_icon_name (account);
+      gtk_image_set_from_icon_name (image, name, GTK_ICON_SIZE_MENU);
+    }
+
+  /* Update id widget */
+  label = g_object_get_data (G_OBJECT (table), "id-widget");
+  id = folks_persona_get_display_id (persona);
+  gtk_label_set_label (label, (id != NULL) ? id : "");
+
+  /* Update other widgets */
+  notify_alias_cb (persona, NULL, self);
+  notify_presence_cb (persona, NULL, self);
+  notify_avatar_cb (persona, NULL, self);
+
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+    notify_is_favourite_cb (persona, NULL, self);
+}
+
+static void
+add_persona (EmpathyIndividualWidget *self,
+    FolksPersona *persona)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GtkBox *hbox;
+  GtkTable *table;
+  GtkWidget *label, *account_label, *account_image, *separator;
+  guint current_row = 0;
+
+  if (!TPF_IS_PERSONA (persona))
+    return;
+
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+    table = GTK_TABLE (gtk_table_new (5, 3, FALSE));
+  else
+    table = GTK_TABLE (gtk_table_new (4, 3, FALSE));
+  gtk_table_set_row_spacings (table, 6);
+  gtk_table_set_col_spacings (table, 6);
+
+  /* Account and Identifier */
+  label = gtk_label_new (_("Account:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_table_attach (table, label, 0, 1, current_row, current_row + 1,
+      GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  /* Pack the protocol icon with the account name in an hbox */
+  hbox = GTK_BOX (gtk_hbox_new (FALSE, 6));
+
+  account_label = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (account_label), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (account_label), 0.0, 0.5);
+  gtk_widget_show (account_label);
+
+  account_image = gtk_image_new ();
+  gtk_widget_show (account_image);
+
+  gtk_box_pack_start (hbox, account_image, FALSE, FALSE, 0);
+  gtk_box_pack_start (hbox, account_label, FALSE, TRUE, 0);
+
+  g_object_set_data (G_OBJECT (table), "account-image", account_image);
+  g_object_set_data (G_OBJECT (table), "account-label", account_label);
+  gtk_table_attach (table, GTK_WIDGET (hbox), 1, 2, current_row,
+      current_row + 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  gtk_widget_show (GTK_WIDGET (hbox));
+
+  current_row++;
+
+  /* Translators: Identifier to connect to Instant Messaging network */
+  label = gtk_label_new (_("Identifier:"));
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_table_attach (table, label, 0, 1, current_row, current_row + 1,
+      GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  /* Set up ID label */
+  label = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+
+  g_object_set_data (G_OBJECT (table), "id-widget", label);
+  gtk_table_attach (table, label, 1, 2, current_row, current_row + 1,
+      GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  current_row++;
+
+  alias_presence_avatar_favourite_set_up (self, table, current_row);
+
+  /* Connect to signals and display the table */
+  g_signal_connect (persona, "notify::alias",
+      (GCallback) notify_alias_cb, self);
+  g_signal_connect (persona, "notify::avatar",
+      (GCallback) notify_avatar_cb, self);
+  g_signal_connect (persona, "notify::presence-type",
+      (GCallback) notify_presence_cb, self);
+  g_signal_connect (persona, "notify::presence-message",
+      (GCallback) notify_presence_cb, self);
+
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+    {
+      g_signal_connect (persona, "notify::is-favourite",
+          (GCallback) notify_is_favourite_cb, self);
+    }
+
+  gtk_box_pack_start (GTK_BOX (priv->vbox_individual),
+      GTK_WIDGET (table), FALSE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (table));
+
+  /* Pack a separator after the table */
+  separator = gtk_hseparator_new ();
+  g_object_set_data (G_OBJECT (table), "separator", separator);
+  gtk_box_pack_start (GTK_BOX (priv->vbox_individual), separator, FALSE, FALSE,
+      0);
+  gtk_widget_show (separator);
+
+  g_hash_table_replace (priv->persona_tables, persona, table);
+
+  /* Update the new widgets */
+  update_persona (self, persona);
+}
+
+static void
+remove_persona (EmpathyIndividualWidget *self,
+    FolksPersona *persona)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GtkWidget *separator;
+  GtkTable *table;
+
+  if (!TPF_IS_PERSONA (persona))
+    return;
+
+  table = g_hash_table_lookup (priv->persona_tables, persona);
+  if (table == NULL)
+    return;
+
+  g_signal_handlers_disconnect_by_func (persona, notify_alias_cb, self);
+  g_signal_handlers_disconnect_by_func (persona, notify_avatar_cb, self);
+  g_signal_handlers_disconnect_by_func (persona, notify_presence_cb, self);
+
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+    {
+      g_signal_handlers_disconnect_by_func (persona, notify_is_favourite_cb,
+          self);
+    }
+
+  /* Remove the separator */
+  separator = g_object_get_data (G_OBJECT (table), "separator");
+  if (separator != NULL)
+    gtk_container_remove (GTK_CONTAINER (priv->vbox_individual), separator);
+
+  /* Remove the widget */
+  gtk_container_remove (GTK_CONTAINER (priv->vbox_individual),
+      GTK_WIDGET (table));
+
+  g_hash_table_remove (priv->persona_tables, persona);
+}
+
+static void
+update_individual_table (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+
+  notify_alias_cb (priv->individual, NULL, self);
+  notify_presence_cb (priv->individual, NULL, self);
+  notify_avatar_cb (priv->individual, NULL, self);
+
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+    notify_is_favourite_cb (priv->individual, NULL, self);
+}
+
+static void
+individual_table_set_up (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GtkTable *table;
+  GtkWidget *label;
+  gchar *message;
+  GList *personas, *l;
+  guint num_personas = 0, current_row = 0;
+
+  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+    table = GTK_TABLE (gtk_table_new (4, 3, FALSE));
+  else
+    table = GTK_TABLE (gtk_table_new (3, 3, FALSE));
+  gtk_table_set_row_spacings (table, 6);
+  gtk_table_set_col_spacings (table, 6);
+
+  /* Meta-contacts message displaying how many Telepathy personas we have */
+  personas = folks_individual_get_personas (priv->individual);
+  for (l = personas; l != NULL; l = l->next)
+    {
+      if (TPF_IS_PERSONA (l->data))
+        num_personas++;
+    }
+
+  message = g_strdup_printf (ngettext ("Meta-contact containing %u contact",
+      "Meta-contact containing %u contacts", num_personas), num_personas);
+  label = gtk_label_new (message);
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  g_free (message);
+
+  gtk_table_attach (table, label, 0, 2, current_row, current_row + 1,
+      GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  current_row++;
+
+  alias_presence_avatar_favourite_set_up (self, table, current_row);
+
+  /* Display the table */
+  gtk_box_pack_start (GTK_BOX (priv->vbox_individual), GTK_WIDGET (table),
+      TRUE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (table));
+
+  priv->individual_table = table;
+
+  /* Update the table */
+  update_individual_table (self);
+}
+
+static void
+individual_table_destroy (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+
+  if (priv->individual_table == NULL)
+    return;
+
+  gtk_container_remove (GTK_CONTAINER (priv->vbox_individual),
+      GTK_WIDGET (priv->individual_table));
+  priv->individual_table = NULL;
+}
+
+static void
+notify_personas_cb (FolksIndividual *individual,
+    GParamSpec *pspec,
+    EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  GList *personas, *l, *children, *remove_personas = NULL;
+  GHashTableIter iter;
+  FolksPersona *persona;
+  GtkTable *table;
+  gboolean is_last;
+  guint old_num_personas, new_num_personas;
+
+  personas = folks_individual_get_personas (individual);
+  old_num_personas = g_hash_table_size (priv->persona_tables);
+  new_num_personas = g_list_length (personas);
+
+  /* Remove Personas */
+  g_hash_table_iter_init (&iter, priv->persona_tables);
+  while (g_hash_table_iter_next (&iter, (gpointer *) &persona,
+      (gpointer *) &table))
+    {
+      /* FIXME: This is slow. bgo#626725 */
+      /* Old persona or we were displaying all personas and now just want to
+       * display the individual table.
+       * We can't remove the persona inside this loop, as that would invalidate
+       * the hash table iter. */
+      if (g_list_find (personas, persona) == NULL ||
+          (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS) &&
+           new_num_personas > 1))
+        {
+          remove_personas = g_list_prepend (remove_personas, persona);
+        }
+    }
+
+  for (l = remove_personas; l != NULL; l = l->next)
+    remove_persona (self, FOLKS_PERSONA (l->data));
+  g_list_free (remove_personas);
+
+  individual_table_destroy (self);
+
+  /* If we're !SHOW_PERSONAS and have more than one Persona, we only display
+   * the Individual's alias, avatar and presence, and a label saying
+   * "Meta-contact containing x contacts". (i.e. One table.)
+   * If we're SHOW_PERSONAS or have only one Persona, we display the
+   * alias, avatar, presence, account and identifier for each of the
+   * Individual's Personas. (i.e. One table per Persona.) */
+  if (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS) &&
+      new_num_personas > 1)
+    {
+      individual_table_set_up (self);
+    }
+  else
+    {
+      /* Add Personas */
+      for (l = personas; l != NULL; l = l->next)
+        {
+          persona = FOLKS_PERSONA (l->data);
+
+          if (!TPF_IS_PERSONA (persona))
+            continue;
+
+          /* New persona or we were displaying the individual table and we
+           * now want to display all personas */
+          if ((!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS) &&
+               new_num_personas <= 1) ||
+              g_hash_table_lookup (priv->persona_tables, persona) == NULL)
+            {
+              add_persona (self, persona);
+            }
+        }
+    }
+
+  /* Hide the last separator and show the others */
+  children = gtk_container_get_children (GTK_CONTAINER (priv->vbox_individual));
+  children = g_list_reverse (children);
+  is_last = TRUE;
+
+  for (l = children; l != NULL; l = l->next)
+    {
+      if (GTK_IS_SEPARATOR (l->data))
+        {
+          gtk_widget_set_visible (GTK_WIDGET (l->data), !is_last);
+          is_last = FALSE;
+        }
+    }
+
+  g_list_free (children);
+}
+
+static void
+remove_individual (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  if (priv->individual != NULL)
+    {
+      GList *personas, *l;
+
+      g_signal_handlers_disconnect_by_func (priv->individual,
+          notify_alias_cb, self);
+      g_signal_handlers_disconnect_by_func (priv->individual,
+          notify_presence_cb, self);
+      g_signal_handlers_disconnect_by_func (priv->individual,
+          notify_avatar_cb, self);
+      g_signal_handlers_disconnect_by_func (priv->individual,
+          notify_personas_cb, self);
+
+      if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+        {
+          g_signal_handlers_disconnect_by_func (priv->individual,
+              notify_is_favourite_cb, self);
+        }
+
+      personas = folks_individual_get_personas (priv->individual);
+      for (l = personas; l != NULL; l = l->next)
+        remove_persona (self, FOLKS_PERSONA (l->data));
+
+      if (priv->contact_info_contact != NULL)
+        {
+          g_signal_handlers_disconnect_by_func (priv->contact_info_contact,
+              details_notify_cb, self);
+          g_object_remove_weak_pointer (G_OBJECT (priv->contact_info_contact),
+              (gpointer *) &priv->contact_info_contact);
+          priv->contact_info_contact = NULL;
+        }
+
+      tp_clear_object (&priv->individual);
+    }
+
+  if (priv->details_cancellable != NULL)
+    g_cancellable_cancel (priv->details_cancellable);
+}
+
+static void
+individual_update (EmpathyIndividualWidget *self)
+{
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+
+  /* Connect and get info from new Individual */
+  if (priv->individual != NULL)
+    {
+      g_signal_connect (priv->individual, "notify::alias",
+          (GCallback) notify_alias_cb, self);
+      g_signal_connect (priv->individual, "notify::presence-type",
+          (GCallback) notify_presence_cb, self);
+      g_signal_connect (priv->individual, "notify::presence-message",
+          (GCallback) notify_presence_cb, self);
+      g_signal_connect (priv->individual, "notify::avatar",
+          (GCallback) notify_avatar_cb, self);
+      g_signal_connect (priv->individual, "notify::personas",
+          (GCallback) notify_personas_cb, self);
+
+      if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
+        {
+          g_signal_connect (priv->individual, "notify::is-favourite",
+              (GCallback) notify_is_favourite_cb, self);
+        }
+
+      /* Update individual table */
+      notify_personas_cb (priv->individual, NULL, self);
+    }
+
+  if (priv->individual == NULL)
+    {
+      gtk_widget_hide (priv->vbox_individual);
+    }
+  else if (priv->individual_table != NULL)
+    {
+      /* We only need to update the details for the Individual as a whole */
+      update_individual_table (self);
+      gtk_widget_show (priv->vbox_individual);
+    }
+  else
+    {
+      /* We need to update the details for every Persona in the Individual */
+      GList *personas, *l;
+
+      personas = folks_individual_get_personas (priv->individual);
+      for (l = personas; l != NULL; l = l->next)
+        {
+          if (!TPF_IS_PERSONA (l->data))
+            continue;
+
+          update_persona (self, FOLKS_PERSONA (l->data));
+        }
+
+      gtk_widget_show (priv->vbox_individual);
+    }
+}
+
+static void
 empathy_individual_widget_init (EmpathyIndividualWidget *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+  EmpathyIndividualWidgetPriv *priv;
+  GtkBuilder *gui;
+  GtkWidget *vbox_individual_widget;
+  gchar *filename;
+
+  priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_INDIVIDUAL_WIDGET, EmpathyIndividualWidgetPriv);
+  self->priv = priv;
 
   gtk_orientable_set_orientation (GTK_ORIENTABLE (self),
       GTK_ORIENTATION_VERTICAL);
+
+  filename = empathy_file_lookup ("empathy-individual-widget.ui",
+      "libempathy-gtk");
+  gui = empathy_builder_get_file (filename,
+      "vbox_individual_widget", &vbox_individual_widget,
+      "vbox_individual", &priv->vbox_individual,
+      "vbox_location", &priv->vbox_location,
+      "subvbox_location", &priv->subvbox_location,
+      "label_location", &priv->label_location,
+#ifdef HAVE_LIBCHAMPLAIN
+      "viewport_map", &priv->viewport_map,
+#endif
+      "groups_widget", &priv->groups_widget,
+      "vbox_details", &priv->vbox_details,
+      "table_details", &priv->table_details,
+      "hbox_details_requested", &priv->hbox_details_requested,
+      NULL);
+  g_free (filename);
+
+  priv->table_location = NULL;
+
+  gtk_box_pack_start (GTK_BOX (self), vbox_individual_widget, TRUE, TRUE, 0);
+  gtk_widget_show (vbox_individual_widget);
+
+  priv->persona_tables = g_hash_table_new (NULL, NULL);
+  priv->individual_table = NULL;
+
+  /* Create widgets */
+  details_set_up (self);
+
+  g_object_unref (gui);
 }
 
 static void
@@ -131,11 +1864,19 @@ set_property (GObject *object,
 static void
 dispose (GObject *object)
 {
+  remove_individual (EMPATHY_INDIVIDUAL_WIDGET (object));
+
+  G_OBJECT_CLASS (empathy_individual_widget_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (object);
 
-  tp_clear_object (&priv->individual);
+  g_hash_table_destroy (priv->persona_tables);
 
-  G_OBJECT_CLASS (empathy_individual_widget_parent_class)->dispose (object);
+  G_OBJECT_CLASS (empathy_individual_widget_parent_class)->finalize (object);
 }
 
 static void
@@ -146,6 +1887,7 @@ empathy_individual_widget_class_init (EmpathyIndividualWidgetClass *klass)
   object_class->get_property = get_property;
   object_class->set_property = set_property;
   object_class->dispose = dispose;
+  object_class->finalize = finalize;
 
   /**
    * EmpathyIndividualWidget:individual:
@@ -169,7 +1911,7 @@ empathy_individual_widget_class_init (EmpathyIndividualWidgetClass *klass)
           "Flags",
           "A set of flags which affect the widget's behaviour.",
           EMPATHY_TYPE_INDIVIDUAL_WIDGET_FLAGS,
-          EMPATHY_INDIVIDUAL_WIDGET_EDIT_NONE,
+          EMPATHY_INDIVIDUAL_WIDGET_NONE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
 
   g_type_class_add_private (object_class, sizeof (EmpathyIndividualWidgetPriv));
@@ -192,9 +1934,19 @@ empathy_individual_widget_new (FolksIndividual *individual,
       NULL);
 
   return g_object_new (EMPATHY_TYPE_INDIVIDUAL_WIDGET,
-      "individual", individual, "flags", flags, NULL);
+      "individual", individual,
+      "flags", flags,
+      NULL);
 }
 
+/**
+ * empathy_individual_widget_get_individual:
+ * @self: an #EmpathyIndividualWidget
+ *
+ * Returns the #FolksIndividual being displayed by the widget.
+ *
+ * Return value: the #FolksIndividual being displayed, or %NULL
+ */
 FolksIndividual *
 empathy_individual_widget_get_individual (EmpathyIndividualWidget *self)
 {
@@ -203,55 +1955,41 @@ empathy_individual_widget_get_individual (EmpathyIndividualWidget *self)
   return GET_PRIV (self)->individual;
 }
 
+/**
+ * empathy_individual_widget_set_individual:
+ * @self: an #EmpathyIndividualWidget
+ * @individual: the #FolksIndividual to display, or %NULL
+ *
+ * Set the #FolksIndividual to be displayed by the widget:
+ * #EmpathyIndividualWidget:individual.
+ *
+ * The @individual may be %NULL in order to display nothing in the widget.
+ */
 void
 empathy_individual_widget_set_individual (EmpathyIndividualWidget *self,
     FolksIndividual *individual)
 {
   EmpathyIndividualWidgetPriv *priv;
-  GList *personas = NULL, *l;
 
   g_return_if_fail (EMPATHY_IS_INDIVIDUAL_WIDGET (self));
   g_return_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual));
 
   priv = GET_PRIV (self);
 
+  if (individual == priv->individual)
+    return;
+
   /* Out with the old… */
-  gtk_container_foreach (GTK_CONTAINER (self), (GtkCallback) gtk_widget_destroy,
-      NULL);
-  tp_clear_object (&priv->individual);
+  remove_individual (self);
 
   /* …and in with the new. */
-  priv->individual = individual;
   if (individual != NULL)
-    {
-      g_object_ref (individual);
-      personas = folks_individual_get_personas (individual);
-    }
-
-  for (l = personas; l != NULL; l = l->next)
-    {
-      GtkWidget *contact_widget;
-      TpContact *tp_contact;
-      EmpathyContact *contact;
-      TpfPersona *persona = l->data;
-
-      if (!TPF_IS_PERSONA (persona))
-        continue;
-
-      tp_contact = tpf_persona_get_contact (persona);
-      contact = empathy_contact_dup_from_tp_contact (tp_contact);
-
-      /* Contact info widget */
-      contact_widget = empathy_contact_widget_new (contact, priv->flags);
-      gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
-      gtk_box_pack_start (GTK_BOX (self), contact_widget, TRUE, TRUE, 0);
-      gtk_widget_show (contact_widget);
-
-      g_object_unref (contact);
+    g_object_ref (individual);
+  priv->individual = individual;
 
-      /* If we're not meant to display all of the personas, bail after the first
-       * one. */
-      if (!(priv->flags & EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS))
-        break;
-    }
+  /* Update information for widgets */
+  individual_update (self);
+  groups_update (self);
+  details_update (self);
+  location_update (self);
 }
diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h
index 89066f60d..a968d14f3 100644
--- a/libempathy-gtk/empathy-individual-widget.h
+++ b/libempathy-gtk/empathy-individual-widget.h
@@ -31,40 +31,38 @@ G_BEGIN_DECLS
 
 /**
  * EmpathyIndividualWidgetFlags:
- * @EMPATHY_INDIVIDUAL_WIDGET_EDIT_NONE: Don't show any widgets to edit any
- * details of the individual. This should be the option for widgets that merely
- * display information about an individual.
+ * @EMPATHY_INDIVIDUAL_WIDGET_NONE: Don't show any widgets to edit any
+ * details of the individual, or to display any extended details of the
+ * individual. This should be the option for widgets that merely display basic
+ * information about an individual.
  * @EMPATHY_INDIVIDUAL_WIDGET_EDIT_ALIAS: Show a #GtkEntry allowing changes to
  * the individual's alias.
- * @EMPATHY_INDIVIDUAL_WIDGET_EDIT_AVATAR: Show an #EmpathyAvatarChooser
- * allowing changes to the individual's avatar.
- * @EMPATHY_INDIVIDUAL_WIDGET_EDIT_ACCOUNT: Show an #EmpathyAccountChooser
- * allowing changes to the individual's account.
- * @EMPATHY_INDIVIDUAL_WIDGET_EDIT_ID: Show a #GtkEntry allowing changes to the
- * individual's identifier.
+ * @EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE: Show a checkbutton
+ * allowing changes to the individual's favourite status.
  * @EMPATHY_INDIVIDUAL_WIDGET_EDIT_GROUPS: Show a widget to change the groups
  * the individual is in.
  * @EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP: Make widgets more designed for a
- * tooltip. For example, make widgets not selectable.
+ * tooltip. For example, make labels not selectable.
+ * @EMPATHY_INDIVIDUAL_WIDGET_SHOW_LOCATION: Display the individual's current
+ * location textually or using a map (if compiled with libchamplain support).
+ * @EMPATHY_INDIVIDUAL_WIDGET_SHOW_DETAILS: Fetch and display extended vCard
+ * details of the individual, if the individual has them.
+ * @EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS: List the #FolksPersona<!-- -->s
+ * contained in the individual.
  *
  * Flags used when creating an #EmpathyIndividualWidget to specify which
  * features should be available.
  */
 typedef enum
 {
-  EMPATHY_INDIVIDUAL_WIDGET_EDIT_NONE    = 0,
+  EMPATHY_INDIVIDUAL_WIDGET_NONE = 0,
   EMPATHY_INDIVIDUAL_WIDGET_EDIT_ALIAS   = 1 << 0,
-  EMPATHY_INDIVIDUAL_WIDGET_EDIT_AVATAR  = 1 << 1,
-  EMPATHY_INDIVIDUAL_WIDGET_EDIT_ACCOUNT = 1 << 2,
-  EMPATHY_INDIVIDUAL_WIDGET_EDIT_ID      = 1 << 3,
-  EMPATHY_INDIVIDUAL_WIDGET_EDIT_GROUPS  = 1 << 4,
-  EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP  = 1 << 5,
-  EMPATHY_INDIVIDUAL_WIDGET_SHOW_LOCATION  = 1 << 6,
-  EMPATHY_INDIVIDUAL_WIDGET_NO_SET_ALIAS = 1 << 7,
-  EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE = 1 << 8,
-  EMPATHY_INDIVIDUAL_WIDGET_SHOW_DETAILS = 1 << 9,
-  EMPATHY_INDIVIDUAL_WIDGET_EDIT_DETAILS = 1 << 10,
-  EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS = 1 << 11,
+  EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE = 1 << 1,
+  EMPATHY_INDIVIDUAL_WIDGET_EDIT_GROUPS  = 1 << 2,
+  EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP  = 1 << 3,
+  EMPATHY_INDIVIDUAL_WIDGET_SHOW_LOCATION  = 1 << 4,
+  EMPATHY_INDIVIDUAL_WIDGET_SHOW_DETAILS = 1 << 5,
+  EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS = 1 << 6,
 } EmpathyIndividualWidgetFlags;
 
 #define EMPATHY_TYPE_INDIVIDUAL_WIDGET (empathy_individual_widget_get_type ())
diff --git a/libempathy-gtk/empathy-individual-widget.ui b/libempathy-gtk/empathy-individual-widget.ui
new file mode 100644
index 000000000..d7f482696
--- /dev/null
+++ b/libempathy-gtk/empathy-individual-widget.ui
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkVBox" id="vbox_individual_widget">
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkVBox" id="vbox_individual">
+        <property name="visible">True</property>
+        <property name="spacing">6</property>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox_location">
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="label_location">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">&lt;b&gt;Location&lt;/b&gt; at (date)</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkVBox" id="subvbox_location">
+                <property name="visible">True</property>
+                <property name="spacing">5</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="viewport_map">
+                    <property name="height_request">150</property>
+                    <property name="resize_mode">queue</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="EmpathyGroupsWidget" id="groups_widget"/>
+      <packing>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox_details">
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="label649">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Contact Details</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment30">
+            <property name="visible">True</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkVBox" id="vbox218">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkTable" id="table_details">
+                    <property name="visible">True</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">12</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox_details_requested">
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage" id="image885">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-dialog-info</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label653">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Information requested…</property>
+                        <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d5a1e1808..627720e72 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,6 +42,8 @@ libempathy-gtk/empathy-individual-dialogs.c
 libempathy-gtk/empathy-individual-linker.c
 libempathy-gtk/empathy-individual-menu.c
 libempathy-gtk/empathy-individual-view.c
+libempathy-gtk/empathy-individual-widget.c
+[type: gettext/glade]libempathy-gtk/empathy-individual-widget.ui
 libempathy-gtk/empathy-irc-network-dialog.c
 libempathy-gtk/empathy-linking-dialog.c
 libempathy-gtk/empathy-log-window.c