Bug 628121 — Should pick an online persona when starting a chat

Change the EmpathyIndividualMenu and EmpathyIndividualView code for starting
chats with Individuals to choose the most available Persona to chat to, rather
than just the first available one. Helps: bgo#628121

1 files changed, 27 insertions, 1 deletions

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 1c8dd21cf..f8822bc81 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -903,8 +903,10 @@ individual_view_row_activated (GtkTreeView *view,
   EmpathyIndividualViewPriv *priv = GET_PRIV (view);
   FolksIndividual *individual;
   EmpathyContact *contact = NULL;
+  FolksPresenceType best_presence = FOLKS_PRESENCE_TYPE_UNSET;
   GtkTreeModel *model;
   GtkTreeIter iter;
+  GList *personas, *l;
 
   if (!(priv->individual_features & EMPATHY_INDIVIDUAL_FEATURE_CHAT))
     return;
@@ -917,7 +919,31 @@ individual_view_row_activated (GtkTreeView *view,
   if (individual == NULL)
     return;
 
-  contact = empathy_contact_dup_from_folks_individual (individual);
+  /* Determine which Persona to chat to, by choosing the most available one. */
+  personas = folks_individual_get_personas (individual);
+  for (l = personas; l != NULL; l = l->next)
+    {
+      FolksPresenceType presence;
+
+      if (!TPF_IS_PERSONA (l->data))
+        continue;
+
+      /* Only choose the contact if it has a higher presence than our current
+       * best choice of contact. */
+      presence = folks_presence_get_presence_type (FOLKS_PRESENCE (l->data));
+      if (folks_presence_typecmp (presence, best_presence) > 0)
+        {
+          TpContact *tp_contact;
+
+          tp_clear_object (&contact);
+          tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data));
+          contact = empathy_contact_dup_from_tp_contact (tp_contact);
+          empathy_contact_set_persona (contact, FOLKS_PERSONA (l->data));
+
+          best_presence = presence;
+        }
+    }
+
   if (contact != NULL)
     {
       DEBUG ("Starting a chat");