aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-individual-menu.c48
-rw-r--r--libempathy-gtk/empathy-individual-view.c28
2 files changed, 62 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 6708e15f0..b08b242b3 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -401,8 +401,9 @@ menu_item_set_contact (GtkWidget *item,
}
/**
- * Set the given menu @item to call @activate_callback upon the first valid
- * TpContact associated with @individual whenever @item is activated.
+ * Set the given menu @item to call @activate_callback using the TpContact
+ * (associated with @individual) with the highest availability who is also valid
+ * whenever @item is activated.
*
* @sensitivity_predicate is an optional function to determine whether the menu
* item should be insensitive (if the function returns @FALSE). Otherwise, the
@@ -415,29 +416,50 @@ menu_item_set_first_contact (GtkWidget *item,
SensitivityPredicate sensitivity_predicate)
{
GList *personas, *l;
+ FolksPresenceType best_presence = FOLKS_PRESENCE_TYPE_UNSET;
+ EmpathyContact *best_contact = NULL;
personas = folks_individual_get_personas (individual);
for (l = personas; l != NULL; l = l->next)
{
- TpContact *tp_contact;
- EmpathyContact *contact;
TpfPersona *persona = l->data;
- gboolean contact_valid = TRUE;
+ FolksPresenceType presence;
if (!TPF_IS_PERSONA (persona))
continue;
- tp_contact = tpf_persona_get_contact (persona);
- contact = empathy_contact_dup_from_tp_contact (tp_contact);
+ /* 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;
+ EmpathyContact *contact;
- contact_valid = menu_item_set_contact (item, contact,
- G_CALLBACK (activate_callback), sensitivity_predicate);
+ 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));
- g_object_unref (contact);
+ if (sensitivity_predicate == NULL ||
+ sensitivity_predicate (contact) == TRUE)
+ {
+ tp_clear_object (&best_contact);
+
+ best_presence = presence;
+ best_contact = g_object_ref (contact);
+ }
+
+ g_object_unref (contact);
+ }
+ }
+
+ /* Use the best contact we found */
+ if (best_contact != NULL)
+ {
+ menu_item_set_contact (item, best_contact, G_CALLBACK (activate_callback),
+ sensitivity_predicate);
- /* stop after the first valid match */
- if (contact_valid)
- break;
+ g_object_unref (best_contact);
}
return item;
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");