X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fempathy-individual-widget.c;h=215d3218e19ea524af29dfea458fab7f9439782a;hp=e5441748b7b8d45a776fa49044c62cb6d61283ad;hb=006f4b813d176e487e0f720424a6274ad7d726ee;hpb=f63939a4648a0ebd64a2ff1468a72036adadb581

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index e5441748..215d3218 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -42,10 +42,10 @@
 #include <libempathy/empathy-time.h>
 
 #include "empathy-avatar-image.h"
+#include "empathy-contactinfo-utils.h"
 #include "empathy-groups-widget.h"
 #include "empathy-gtk-enum-types.h"
 #include "empathy-individual-widget.h"
-#include "empathy-string-parser.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -80,10 +80,10 @@ typedef struct {
   /* weak pointer to the contact whose contact details we're displaying */
   TpContact *contact;
 
-  /* unowned Persona (borrowed from priv->individual) -> GtkTable child */
-  GHashTable *persona_tables;
+  /* unowned Persona (borrowed from priv->individual) -> GtkGrid child */
+  GHashTable *persona_grids;
   /* Table containing the information for the individual as whole, or NULL */
-  GtkTable *individual_table;
+  GtkGrid *individual_grid;
 
   /* Individual */
   GtkWidget *hbox_presence;
@@ -95,7 +95,7 @@ typedef struct {
   /* Location */
   GtkWidget *vbox_location;
   GtkWidget *subvbox_location;
-  GtkWidget *table_location;
+  GtkWidget *grid_location;
   GtkWidget *label_location;
 #ifdef HAVE_LIBCHAMPLAIN
   GtkWidget *viewport_map;
@@ -111,7 +111,7 @@ typedef struct {
 
   /* Details */
   GtkWidget *vbox_details;
-  GtkWidget *table_details;
+  GtkWidget *grid_details;
   GtkWidget *hbox_details_requested;
   GtkWidget *details_spinner;
   GCancellable *details_cancellable; /* owned */
@@ -141,64 +141,6 @@ details_set_up (EmpathyIndividualWidget *self)
   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);
-}
-
 static void
 client_types_notify_cb (TpContact *contact,
     GParamSpec *pspec,
@@ -207,6 +149,11 @@ client_types_notify_cb (TpContact *contact,
   client_types_update (self);
 }
 
+typedef struct {
+  EmpathyIndividualWidget *widget; /* weak */
+  TpContact *contact; /* owned */
+} DetailsData;
+
 static void
 update_weak_contact (EmpathyIndividualWidget *self)
 {
@@ -266,23 +213,6 @@ update_weak_contact (EmpathyIndividualWidget *self)
     }
 }
 
-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)
@@ -292,12 +222,13 @@ details_update_show (EmpathyIndividualWidget *self,
   guint n_rows = 0;
 
   info = tp_contact_get_contact_info (contact);
-  info = g_list_sort (info, (GCompareFunc) contact_info_field_cmp);
+  info = g_list_sort (info, (GCompareFunc) empathy_contact_info_field_cmp);
   for (l = info; l != NULL; l = l->next)
     {
       TpContactInfoField *field = l->data;
-      InfoFieldData *field_data;
+      gchar *title;
       const gchar *value;
+      EmpathyContactInfoFormatFunc format;
       GtkWidget *w;
 
       if (field->field_value == NULL || field->field_value[0] == NULL)
@@ -305,27 +236,31 @@ details_update_show (EmpathyIndividualWidget *self,
 
       value = field->field_value[0];
 
-      field_data = find_info_field_data (field->field_name);
-      if (field_data == NULL)
+      if (!empathy_contact_info_lookup_field (field->field_name,
+          NULL, &format))
         {
           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);
+      title = empathy_contact_info_field_label (field->field_name,
+          field->parameters);
+      w = gtk_label_new (title);
+      g_free (title);
+      gtk_grid_attach (GTK_GRID (priv->grid_details),
+          w, 0, n_rows, 1, 1);
       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)
+
+      if (format != NULL)
         {
           gchar *markup;
 
-          markup = empathy_add_link_markup (value);
+          markup = format (field->field_value);
           gtk_label_set_markup (GTK_LABEL (w), markup);
           g_free (markup);
         }
@@ -333,8 +268,8 @@ details_update_show (EmpathyIndividualWidget *self,
       gtk_label_set_selectable (GTK_LABEL (w),
           (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP) ? FALSE : TRUE);
 
-      gtk_table_attach_defaults (GTK_TABLE (priv->table_details),
-          w, 1, 2, n_rows, n_rows + 1);
+      gtk_grid_attach (GTK_GRID (priv->grid_details),
+          w, 1, n_rows, 1, 1);
       gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
       gtk_widget_show (w);
 
@@ -353,7 +288,7 @@ details_notify_cb (TpContact *contact,
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
   guint n_rows;
 
-  gtk_container_foreach (GTK_CONTAINER (priv->table_details),
+  gtk_container_foreach (GTK_CONTAINER (priv->grid_details),
       (GtkCallback) gtk_widget_destroy, NULL);
 
   n_rows = details_update_show (self, contact);
@@ -361,7 +296,7 @@ details_notify_cb (TpContact *contact,
   if (n_rows > 0)
     {
       gtk_widget_show (priv->vbox_details);
-      gtk_widget_show (priv->table_details);
+      gtk_widget_show (priv->grid_details);
     }
   else
     {
@@ -373,67 +308,70 @@ details_notify_cb (TpContact *contact,
 }
 
 static void
-details_request_cb (TpContact *contact,
+details_request_cb (GObject *source,
     GAsyncResult *res,
-    DetailsData *data)
+    gpointer user_data)
 {
-  EmpathyIndividualWidget *self = data->widget;
+  EmpathyIndividualWidget *self = user_data;
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  TpContact *contact = (TpContact *) source;
   gboolean hide_widget = FALSE;
   GError *error = NULL;
 
   if (tp_contact_request_contact_info_finish (contact, res, &error) == TRUE)
-    details_notify_cb (contact, NULL, self);
+    {
+      details_notify_cb (contact, NULL, self);
+    }
   else
-    hide_widget = TRUE;
-
-  g_clear_error (&error);
-
-  if (self != NULL)
     {
-      EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+      /* If the request got cancelled it could mean the contact widget is
+       * destroyed, so we should not dereference information */
+      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        {
+            g_error_free (error);
+            return;
+        }
 
-      if (hide_widget == TRUE)
-        gtk_widget_hide (GET_PRIV (self)->vbox_details);
+      hide_widget = TRUE;
+      g_error_free (error);
+    }
 
-      tp_clear_object (&priv->details_cancellable);
+  if (hide_widget == TRUE)
+    gtk_widget_hide (GET_PRIV (self)->vbox_details);
 
-      g_signal_connect (contact, "notify::contact-info",
-          (GCallback) details_notify_cb, self);
-    }
+  tp_clear_object (&priv->details_cancellable);
 
-  details_data_free (data);
+  tp_g_signal_connect_object (contact, "notify::contact-info",
+      (GCallback) details_notify_cb, self, 0);
 }
 
 static void
-details_feature_prepared_cb (TpConnection *connection,
-    GAsyncResult *res,
-    DetailsData *data)
+fetch_contact_information (EmpathyIndividualWidget *self)
 {
-  EmpathyIndividualWidget *self = data->widget;
-  EmpathyIndividualWidgetPriv *priv = NULL;
+  EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
+  TpConnection *connection;
+
+  connection = tp_contact_get_connection (priv->contact);
 
-  if (tp_proxy_prepare_finish (connection, res, NULL) == FALSE || self == NULL)
+  if (!tp_proxy_has_interface_by_id (connection,
+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO))
     {
-      if (self != NULL)
-        gtk_widget_hide (GET_PRIV (self)->vbox_details);
-      details_data_free (data);
+      gtk_widget_hide (GET_PRIV (self)->vbox_details);
       return;
     }
 
-  priv = GET_PRIV (self);
-
   /* 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_widget_hide (priv->grid_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);
+
+      tp_contact_request_contact_info_async (priv->contact,
+          priv->details_cancellable, details_request_cb, self);
     }
 }
 
@@ -452,19 +390,7 @@ details_update (EmpathyIndividualWidget *self)
 
   if (priv->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 (priv->contact);
-
-      /* First, make sure the CONTACT_INFO feature is ready on the connection */
-      connection = tp_contact_get_connection (priv->contact);
-      tp_proxy_prepare_async (connection, features,
-          (GAsyncReadyCallback) details_feature_prepared_cb, data);
+      fetch_contact_information (self);
     }
 }
 
@@ -600,16 +526,20 @@ location_update (EmpathyIndividualWidget *self)
            * 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 isn't fully valid, treat the contact as insufficient */
-          if (location != NULL && g_hash_table_size (location) <= 0)
+          if (tp_contact != NULL)
             {
-              location = NULL;
-              g_clear_object (&contact);
+              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 isn't fully valid, treat the contact as
+               * insufficient */
+              if (location != NULL && g_hash_table_size (location) <= 0)
+                {
+                  location = NULL;
+                  g_clear_object (&contact);
+                }
             }
         }
       g_clear_object (&persona);
@@ -651,12 +581,12 @@ location_update (EmpathyIndividualWidget *self)
     }
 
   /* Prepare the location information table */
-  if (priv->table_location != NULL)
-    gtk_widget_destroy (priv->table_location);
+  if (priv->grid_location != NULL)
+    gtk_widget_destroy (priv->grid_location);
 
-  priv->table_location = gtk_table_new (1, 2, FALSE);
+  priv->grid_location = gtk_grid_new ();
   gtk_box_pack_start (GTK_BOX (priv->subvbox_location),
-      priv->table_location, FALSE, FALSE, 5);
+      priv->grid_location, FALSE, FALSE, 5);
 
 
   for (i = 0; (skey = ordered_geolocation_keys[i]); i++)
@@ -673,8 +603,8 @@ location_update (EmpathyIndividualWidget *self)
 
       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_grid_attach (GTK_GRID (priv->grid_location),
+          label, 0, row, 1, 1);
       gtk_widget_show (label);
 
       if (G_VALUE_TYPE (gvalue) == G_TYPE_DOUBLE)
@@ -698,8 +628,8 @@ location_update (EmpathyIndividualWidget *self)
       if (svalue != NULL)
         {
           label = gtk_label_new (svalue);
-          gtk_table_attach_defaults (GTK_TABLE (priv->table_location),
-              label, 1, 2, row, row + 1);
+          gtk_grid_attach (GTK_GRID (priv->grid_location),
+              label, 1, row, 1, 1);
           gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
           gtk_widget_show (label);
 
@@ -728,7 +658,7 @@ location_update (EmpathyIndividualWidget *self)
   if (row > 0)
     {
       /* We can display some fields */
-      gtk_widget_show (priv->table_location);
+      gtk_widget_show (priv->grid_location);
     }
   else if (display_map == FALSE)
     {
@@ -773,6 +703,9 @@ location_update (EmpathyIndividualWidget *self)
 
               /* Get the contact */
               tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
+              if (tp_contact == NULL)
+                goto while_finish;
+
               contact = empathy_contact_dup_from_tp_contact (tp_contact);
               empathy_contact_set_persona (contact, persona);
 
@@ -882,6 +815,9 @@ persona_dup_avatar (FolksPersona *persona)
     return NULL;
 
   tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
+  if (tp_contact == NULL)
+    return NULL;
+
   contact = empathy_contact_dup_from_tp_contact (tp_contact);
   empathy_contact_set_persona (contact, persona);
 
@@ -1089,16 +1025,19 @@ individual_is_user (FolksIndividual *individual)
       if (TPF_IS_PERSONA (persona))
         {
           TpContact *tp_contact;
-          EmpathyContact *contact;
+          EmpathyContact *contact = NULL;
 
           /* 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);
+          if (tp_contact != NULL)
+            {
+              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))
-            retval = g_object_ref (empathy_contact_get_account (contact));
+              /* Determine if the contact is the user */
+              if (empathy_contact_is_user (contact))
+                retval = g_object_ref (empathy_contact_get_account (contact));
+            }
 
           g_object_unref (contact);
         }
@@ -1171,28 +1110,28 @@ notify_avatar_cb (gpointer folks_object,
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
   EmpathyAvatar *avatar = NULL;
-  GObject *table;
+  GObject *grid;
   GtkWidget *avatar_widget;
 
   if (FOLKS_IS_INDIVIDUAL (folks_object))
     {
       avatar = individual_dup_avatar (FOLKS_INDIVIDUAL (folks_object));
-      table = G_OBJECT (priv->individual_table);
+      grid = G_OBJECT (priv->individual_grid);
     }
   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);
+      grid = g_hash_table_lookup (priv->persona_grids, folks_object);
     }
   else
     {
       g_assert_not_reached ();
     }
 
-  if (table == NULL)
+  if (grid == NULL)
     return;
 
-  avatar_widget = g_object_get_data (table, "avatar-widget");
+  avatar_widget = g_object_get_data (grid, "avatar-widget");
   empathy_avatar_image_set (EMPATHY_AVATAR_IMAGE (avatar_widget), avatar);
 
   if (avatar != NULL)
@@ -1205,20 +1144,20 @@ notify_alias_cb (gpointer folks_object,
     EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GObject *table;
+  GObject *grid;
   GtkWidget *alias_widget;
 
   if (FOLKS_IS_INDIVIDUAL (folks_object))
-    table = G_OBJECT (priv->individual_table);
+    grid = G_OBJECT (priv->individual_grid);
   else if (FOLKS_IS_PERSONA (folks_object))
-    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+    grid = g_hash_table_lookup (priv->persona_grids, folks_object);
   else
     g_assert_not_reached ();
 
-  if (table == NULL)
+  if (grid == NULL)
     return;
 
-  alias_widget = g_object_get_data (table, "alias-widget");
+  alias_widget = g_object_get_data (grid, "alias-widget");
 
   if (GTK_IS_ENTRY (alias_widget))
     {
@@ -1238,23 +1177,23 @@ notify_presence_cb (gpointer folks_object,
     EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GObject *table;
+  GObject *grid;
   GtkWidget *status_label, *state_image;
   const gchar *message;
   gchar *markup_text = NULL;
 
   if (FOLKS_IS_INDIVIDUAL (folks_object))
-    table = G_OBJECT (priv->individual_table);
+    grid = G_OBJECT (priv->individual_grid);
   else if (FOLKS_IS_PERSONA (folks_object))
-    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+    grid = g_hash_table_lookup (priv->persona_grids, folks_object);
   else
     g_assert_not_reached ();
 
-  if (table == NULL)
+  if (grid == NULL)
     return;
 
-  status_label = g_object_get_data (table, "status-label");
-  state_image = g_object_get_data (table, "state-image");
+  status_label = g_object_get_data (grid, "status-label");
+  state_image = g_object_get_data (grid, "state-image");
 
   /* FIXME: Default messages should be moved into libfolks (bgo#627403) */
   message = folks_presence_details_get_presence_message (
@@ -1285,20 +1224,20 @@ notify_is_favourite_cb (gpointer folks_object,
     EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GObject *table;
+  GObject *grid;
   GtkWidget *favourite_widget;
 
   if (FOLKS_IS_INDIVIDUAL (folks_object))
-    table = G_OBJECT (priv->individual_table);
+    grid = G_OBJECT (priv->individual_grid);
   else if (FOLKS_IS_PERSONA (folks_object))
-    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+    grid = g_hash_table_lookup (priv->persona_grids, folks_object);
   else
     g_assert_not_reached ();
 
-  if (table == NULL)
+  if (grid == NULL)
     return;
 
-  favourite_widget = g_object_get_data (table, "favourite-widget");
+  favourite_widget = g_object_get_data (grid, "favourite-widget");
 
   if (GTK_IS_TOGGLE_BUTTON (favourite_widget))
     {
@@ -1310,18 +1249,17 @@ notify_is_favourite_cb (gpointer folks_object,
 
 static void
 alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
-    GtkTable *table,
+    GtkGrid *grid,
     guint starting_row)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GtkWidget *label, *alias, *image, *avatar, *alignment;
+  GtkWidget *label, *alias, *image, *avatar;
   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_grid_attach (grid, label, 0, current_row, 1, 1);
   gtk_widget_show (label);
 
   /* Set up alias label/entry */
@@ -1343,9 +1281,9 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
       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);
+  g_object_set_data (G_OBJECT (grid), "alias-widget", alias);
+  gtk_grid_attach_next_to (grid, alias, label,
+                           GTK_POS_RIGHT, 1, 1);
   gtk_widget_show (alias);
 
   current_row++;
@@ -1356,7 +1294,7 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
   /* 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);
+  g_object_set_data (G_OBJECT (grid), "state-image", image);
   gtk_box_pack_start (GTK_BOX (priv->hbox_presence), image, FALSE,
       FALSE, 0);
   gtk_widget_show (image);
@@ -1369,13 +1307,13 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
   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);
+  g_object_set_data (G_OBJECT (grid), "status-label", label);
+  gtk_box_pack_start (GTK_BOX (priv->hbox_presence), label, FALSE,
+      FALSE, 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_grid_attach (grid, priv->hbox_presence,
+                   0, current_row, 2, 1);
   gtk_widget_show (priv->hbox_presence);
 
   current_row++;
@@ -1388,9 +1326,9 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
       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);
+      g_object_set_data (G_OBJECT (grid), "favourite-widget", favourite);
+      gtk_grid_attach (grid, favourite,
+                       0, current_row, 2, 1);
       gtk_widget_show (favourite);
 
       current_row++;
@@ -1407,15 +1345,18 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
           (GCallback) avatar_widget_button_press_event_cb, self);
     }
 
-  g_object_set_data (G_OBJECT (table), "avatar-widget", avatar);
+  g_object_set_data (G_OBJECT (grid), "avatar-widget", avatar);
+  g_object_set (avatar,
+                "valign", GTK_ALIGN_START,
+                "margin-left", 6,
+                "margin-right", 6,
+                "margin-top", 6,
+                "margin-bottom", 6,
+                NULL);
 
-  alignment = gtk_alignment_new (1.0, 0.0, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (alignment), avatar);
+  gtk_grid_attach (grid, avatar,
+                   2, 0, 1, current_row);
   gtk_widget_show (avatar);
-
-  gtk_table_attach (table, alignment, 2, 3, 0, current_row,
-      GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 6, 6);
-  gtk_widget_show (alignment);
 }
 
 static void
@@ -1425,16 +1366,19 @@ update_persona (EmpathyIndividualWidget *self, FolksPersona *persona)
   TpContact *tp_contact;
   EmpathyContact *contact;
   TpAccount *account;
-  GtkTable *table;
+  GtkGrid *grid;
   GtkLabel *label;
   GtkImage *image;
   const gchar *id;
 
-  table = g_hash_table_lookup (priv->persona_tables, persona);
+  grid = g_hash_table_lookup (priv->persona_grids, persona);
 
-  g_assert (table != NULL);
+  g_assert (grid != NULL);
 
   tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
+  if (tp_contact == NULL)
+    return;
+
   contact = empathy_contact_dup_from_tp_contact (tp_contact);
   empathy_contact_set_persona (contact, persona);
 
@@ -1445,8 +1389,8 @@ update_persona (EmpathyIndividualWidget *self, FolksPersona *persona)
     {
       const gchar *name;
 
-      label = g_object_get_data (G_OBJECT (table), "account-label");
-      image = g_object_get_data (G_OBJECT (table), "account-image");
+      label = g_object_get_data (G_OBJECT (grid), "account-label");
+      image = g_object_get_data (G_OBJECT (grid), "account-image");
 
       name = tp_account_get_display_name (account);
       gtk_label_set_label (label, name);
@@ -1456,7 +1400,7 @@ update_persona (EmpathyIndividualWidget *self, FolksPersona *persona)
     }
 
   /* Update id widget */
-  label = g_object_get_data (G_OBJECT (table), "id-widget");
+  label = g_object_get_data (G_OBJECT (grid), "id-widget");
   id = folks_persona_get_display_id (persona);
   gtk_label_set_label (label, (id != NULL) ? id : "");
 
@@ -1477,7 +1421,7 @@ add_persona (EmpathyIndividualWidget *self,
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
   GtkBox *hbox;
-  GtkTable *table;
+  GtkGrid *grid;
   GtkWidget *label, *account_label, *account_image, *separator;
   guint current_row = 0;
 
@@ -1485,17 +1429,18 @@ add_persona (EmpathyIndividualWidget *self,
     return;
 
   if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
-    table = GTK_TABLE (gtk_table_new (5, 3, FALSE));
+    grid = GTK_GRID (gtk_grid_new ());
   else
-    table = GTK_TABLE (gtk_table_new (4, 3, FALSE));
-  gtk_table_set_row_spacings (table, 6);
-  gtk_table_set_col_spacings (table, 6);
+    grid = GTK_GRID (gtk_grid_new ());
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_row_spacing (grid, 6);
+  gtk_grid_set_column_spacing (grid, 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_grid_attach (grid, label, 0, current_row, 1, 1);
   gtk_widget_show (label);
 
   /* Pack the protocol icon with the account name in an hbox */
@@ -1513,10 +1458,9 @@ add_persona (EmpathyIndividualWidget *self,
   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);
+  g_object_set_data (G_OBJECT (grid), "account-image", account_image);
+  g_object_set_data (G_OBJECT (grid), "account-label", account_label);
+  gtk_grid_attach_next_to (grid, GTK_WIDGET (hbox), label, GTK_POS_RIGHT, 1, 1);
   gtk_widget_show (GTK_WIDGET (hbox));
 
   current_row++;
@@ -1524,8 +1468,7 @@ add_persona (EmpathyIndividualWidget *self,
   /* 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_grid_attach (grid, label, 0, current_row, 1, 1);
   gtk_widget_show (label);
 
   /* Set up ID label */
@@ -1534,16 +1477,15 @@ add_persona (EmpathyIndividualWidget *self,
       (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP) ? FALSE : 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);
+  g_object_set_data (G_OBJECT (grid), "id-widget", label);
+  gtk_grid_attach (grid, label, 1, current_row, 1, 1);
   gtk_widget_show (label);
 
   current_row++;
 
-  alias_presence_avatar_favourite_set_up (self, table, current_row);
+  alias_presence_avatar_favourite_set_up (self, grid, current_row);
 
-  /* Connect to signals and display the table */
+  /* Connect to signals and display the grid */
   g_signal_connect (persona, "notify::alias",
       (GCallback) notify_alias_cb, self);
   g_signal_connect (persona, "notify::avatar",
@@ -1560,17 +1502,17 @@ add_persona (EmpathyIndividualWidget *self,
     }
 
   gtk_box_pack_start (GTK_BOX (priv->vbox_individual),
-      GTK_WIDGET (table), FALSE, TRUE, 0);
-  gtk_widget_show (GTK_WIDGET (table));
+      GTK_WIDGET (grid), FALSE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (grid));
 
-  /* Pack a separator after the table */
+  /* Pack a separator after the grid */
   separator = gtk_hseparator_new ();
-  g_object_set_data (G_OBJECT (table), "separator", separator);
+  g_object_set_data (G_OBJECT (grid), "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);
+  g_hash_table_replace (priv->persona_grids, persona, grid);
 
   /* Update the new widgets */
   update_persona (self, persona);
@@ -1582,13 +1524,13 @@ remove_persona (EmpathyIndividualWidget *self,
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
   GtkWidget *separator;
-  GtkTable *table;
+  GtkGrid *grid;
 
   if (!empathy_folks_persona_is_interesting (persona))
     return;
 
-  table = g_hash_table_lookup (priv->persona_tables, persona);
-  if (table == NULL)
+  grid = g_hash_table_lookup (priv->persona_grids, persona);
+  if (grid == NULL)
     return;
 
   g_signal_handlers_disconnect_by_func (persona, notify_alias_cb, self);
@@ -1602,19 +1544,19 @@ remove_persona (EmpathyIndividualWidget *self,
     }
 
   /* Remove the separator */
-  separator = g_object_get_data (G_OBJECT (table), "separator");
+  separator = g_object_get_data (G_OBJECT (grid), "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));
+      GTK_WIDGET (grid));
 
-  g_hash_table_remove (priv->persona_tables, persona);
+  g_hash_table_remove (priv->persona_grids, persona);
 }
 
 static void
-update_individual_table (EmpathyIndividualWidget *self)
+update_individual_grid (EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
 
@@ -1627,22 +1569,16 @@ update_individual_table (EmpathyIndividualWidget *self)
 }
 
 static void
-individual_table_set_up (EmpathyIndividualWidget *self)
+individual_grid_set_up (EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GtkTable *table;
   guint current_row = 0;
-  guint nb_rows = 2;
-
-  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
-    nb_rows++;
-
-  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP)
-    nb_rows++;
+  GtkGrid *grid;
 
-  table = GTK_TABLE (gtk_table_new (nb_rows, 3, FALSE));
-  gtk_table_set_row_spacings (table, 6);
-  gtk_table_set_col_spacings (table, 6);
+  grid = GTK_GRID (gtk_grid_new ());
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_row_spacing (grid, 6);
+  gtk_grid_set_column_spacing (grid, 6);
 
   /* We only display the number of personas in tooltips */
   if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP)
@@ -1676,37 +1612,36 @@ individual_table_set_up (EmpathyIndividualWidget *self)
       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_grid_attach (grid, label, 0, current_row, 2, 1);
       gtk_widget_show (label);
 
       current_row++;
     }
 
-  alias_presence_avatar_favourite_set_up (self, table, current_row);
+  alias_presence_avatar_favourite_set_up (self, grid, current_row);
 
-  /* Display the table */
-  gtk_box_pack_start (GTK_BOX (priv->vbox_individual), GTK_WIDGET (table),
+  /* Display the grid */
+  gtk_box_pack_start (GTK_BOX (priv->vbox_individual), GTK_WIDGET (grid),
       FALSE, TRUE, 0);
-  gtk_widget_show (GTK_WIDGET (table));
+  gtk_widget_show (GTK_WIDGET (grid));
 
-  priv->individual_table = table;
+  priv->individual_grid = grid;
 
-  /* Update the table */
-  update_individual_table (self);
+  /* Update the grid */
+  update_individual_grid (self);
 }
 
 static void
-individual_table_destroy (EmpathyIndividualWidget *self)
+individual_grid_destroy (EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
 
-  if (priv->individual_table == NULL)
+  if (priv->individual_grid == NULL)
     return;
 
   gtk_container_remove (GTK_CONTAINER (priv->vbox_individual),
-      GTK_WIDGET (priv->individual_table));
-  priv->individual_table = NULL;
+      GTK_WIDGET (priv->individual_grid));
+  priv->individual_grid = NULL;
 }
 
 static void
@@ -1726,10 +1661,10 @@ personas_changed_cb (FolksIndividual *individual,
   /* we'll re-use this iterator throughout */
   iter = gee_iterable_iterator (GEE_ITERABLE (personas));
 
-  /* Note that old_num_personas is the number of persona tables we were
+  /* Note that old_num_personas is the number of persona gridss we were
    * displaying, not the number of Personas which were in the Individual
    * before. */
-  old_num_personas = g_hash_table_size (priv->persona_tables);
+  old_num_personas = g_hash_table_size (priv->persona_grids);
 
   while (gee_iterator_next (iter))
     {
@@ -1743,11 +1678,11 @@ personas_changed_cb (FolksIndividual *individual,
   /*
    * What we display for various conditions:
    *  - "Personas": display the alias, avatar, presence account and identifier
-   *                for each of the Individual's Personas. (i.e. One table per
+   *                for each of the Individual's Personas. (i.e. One grid per
    *                Persona.)
    *  - "Individual": display the alias, avatar and presence for the Individual,
    *                  and a label saying "Meta-contact containing x contacts".
-   *                  (i.e. One table in total.)
+   *                  (i.e. One grid in total.)
    *
    *              | SHOW_PERSONAS | !SHOW_PERSONAS
    * -------------+---------------+---------------
@@ -1760,7 +1695,7 @@ personas_changed_cb (FolksIndividual *individual,
   will_show_personas = show_personas || new_num_personas == 1;
 
   /* If both @added and @removed are NULL, we're being called manually, and we
-   * need to set up the tables for the first time. We do this simply by
+   * need to set up the gridss for the first time. We do this simply by
    * ensuring was_showing_personas and will_show_personas are different so that
    * the code resets the UI.
    */
@@ -1795,10 +1730,10 @@ personas_changed_cb (FolksIndividual *individual,
     {
       gboolean c;
 
-      /* Remove the old Individual table */
-      individual_table_destroy (self);
+      /* Remove the old Individual grid */
+      individual_grid_destroy (self);
 
-      /* Set up all the Persona tables instead */
+      /* Set up all the Persona grids instead */
       for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
         {
           FolksPersona *persona = gee_iterator_get (iter);
@@ -1832,8 +1767,8 @@ personas_changed_cb (FolksIndividual *individual,
           g_clear_object (&iter_changed);
         }
 
-      /* Set up the Individual table instead */
-      individual_table_set_up (self);
+      /* Set up the Individual grid instead */
+      individual_grid_set_up (self);
     }
   g_clear_object (&iter);
 
@@ -1897,7 +1832,7 @@ remove_individual (EmpathyIndividualWidget *self)
           g_clear_object (&persona);
         }
       g_clear_object (&iter);
-      individual_table_destroy (self);
+      individual_grid_destroy (self);
 
       if (priv->contact != NULL)
         remove_weak_contact (self);
@@ -1936,7 +1871,7 @@ individual_update (EmpathyIndividualWidget *self)
               (GCallback) notify_is_favourite_cb, self);
         }
 
-      /* Update individual table */
+      /* Update individual grid */
       personas_changed_cb (priv->individual, NULL, NULL, self);
     }
 
@@ -1944,10 +1879,10 @@ individual_update (EmpathyIndividualWidget *self)
     {
       gtk_widget_hide (priv->vbox_individual);
     }
-  else if (priv->individual_table != NULL)
+  else if (priv->individual_grid != NULL)
     {
       /* We only need to update the details for the Individual as a whole */
-      update_individual_table (self);
+      update_individual_grid (self);
       gtk_widget_show (priv->vbox_individual);
     }
   else
@@ -2002,20 +1937,20 @@ empathy_individual_widget_init (EmpathyIndividualWidget *self)
 #endif
       "groups_widget", &priv->groups_widget,
       "vbox_details", &priv->vbox_details,
-      "table_details", &priv->table_details,
+      "grid_details", &priv->grid_details,
       "hbox_details_requested", &priv->hbox_details_requested,
       "hbox_client_types", &priv->hbox_client_types,
       NULL);
   g_free (filename);
 
-  priv->table_location = NULL;
+  priv->grid_location = NULL;
 
   gtk_box_pack_start (GTK_BOX (self), priv->vbox_individual_widget, TRUE, TRUE,
       0);
   gtk_widget_show (priv->vbox_individual_widget);
 
-  priv->persona_tables = g_hash_table_new (NULL, NULL);
-  priv->individual_table = NULL;
+  priv->persona_grids = g_hash_table_new (NULL, NULL);
+  priv->individual_grid = NULL;
 
   /* Create widgets */
   details_set_up (self);
@@ -2119,7 +2054,7 @@ finalize (GObject *object)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (object);
 
-  g_hash_table_destroy (priv->persona_tables);
+  g_hash_table_destroy (priv->persona_grids);
 
   G_OBJECT_CLASS (empathy_individual_widget_parent_class)->finalize (object);
 }