aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-individual-widget.c
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2011-01-30 00:16:29 +0800
committerPhilip Withnall <philip.withnall@collabora.co.uk>2011-02-18 07:47:31 +0800
commit753a1862257d4c14fb2475a73ec08aeabdb7d907 (patch)
treebcf78312b1b7954818b929dfac44786e59b247a2 /libempathy-gtk/empathy-individual-widget.c
parentd008f215bc41f4e69ff01879047ec946a4370148 (diff)
downloadgsoc2013-empathy-753a1862257d4c14fb2475a73ec08aeabdb7d907.tar
gsoc2013-empathy-753a1862257d4c14fb2475a73ec08aeabdb7d907.tar.gz
gsoc2013-empathy-753a1862257d4c14fb2475a73ec08aeabdb7d907.tar.bz2
gsoc2013-empathy-753a1862257d4c14fb2475a73ec08aeabdb7d907.tar.lz
gsoc2013-empathy-753a1862257d4c14fb2475a73ec08aeabdb7d907.tar.xz
gsoc2013-empathy-753a1862257d4c14fb2475a73ec08aeabdb7d907.tar.zst
gsoc2013-empathy-753a1862257d4c14fb2475a73ec08aeabdb7d907.zip
Bug 637151 — Hide the user Individual from the contact list
Generalise the mechanism used to determine whether a persona is to be displayed by Empathy to also take into account whether the persona is the user and, if so, whether they're in the contact list. This bumps the libfolks dependency to 0.3.5. Closes: bgo#637151
Diffstat (limited to 'libempathy-gtk/empathy-individual-widget.c')
-rw-r--r--libempathy-gtk/empathy-individual-widget.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 808c33fbc..35e12dbe2 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -238,8 +238,8 @@ update_weak_contact (EmpathyIndividualWidget *self)
if (folks_presence_owner_typecmp (
folks_presence_owner_get_presence_type (presence),
- presence_type) > 0
- && TPF_IS_PERSONA (presence))
+ presence_type) > 0 &&
+ empathy_folks_persona_is_interesting (FOLKS_PERSONA (presence)))
{
presence_type = folks_presence_owner_get_presence_type (presence);
tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data));
@@ -581,7 +581,7 @@ location_update (EmpathyIndividualWidget *self)
{
FolksPersona *persona = FOLKS_PERSONA (l->data);
- if (TPF_IS_PERSONA (persona))
+ if (empathy_folks_persona_is_interesting (persona))
{
TpContact *tp_contact;
@@ -754,7 +754,7 @@ location_update (EmpathyIndividualWidget *self)
{
FolksPersona *persona = FOLKS_PERSONA (l->data);
- if (TPF_IS_PERSONA (persona))
+ if (empathy_folks_persona_is_interesting (persona))
{
gdouble lat = 0.0, lon = 0.0;
ClutterActor *marker;
@@ -877,7 +877,7 @@ persona_dup_avatar (FolksPersona *persona)
EmpathyContact *contact;
EmpathyAvatar *avatar;
- if (!TPF_IS_PERSONA (persona))
+ if (!empathy_folks_persona_is_interesting (persona))
return NULL;
tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
@@ -1472,7 +1472,7 @@ add_persona (EmpathyIndividualWidget *self,
GtkWidget *label, *account_label, *account_image, *separator;
guint current_row = 0;
- if (!TPF_IS_PERSONA (persona))
+ if (!empathy_folks_persona_is_interesting (persona))
return;
if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
@@ -1575,7 +1575,7 @@ remove_persona (EmpathyIndividualWidget *self,
GtkWidget *separator;
GtkTable *table;
- if (!TPF_IS_PERSONA (persona))
+ if (!empathy_folks_persona_is_interesting (persona))
return;
table = g_hash_table_lookup (priv->persona_tables, persona);
@@ -1647,7 +1647,7 @@ individual_table_set_up (EmpathyIndividualWidget *self)
personas = folks_individual_get_personas (priv->individual);
for (l = personas; l != NULL; l = l->next)
{
- if (TPF_IS_PERSONA (l->data))
+ if (empathy_folks_persona_is_interesting (FOLKS_PERSONA (l->data)))
num_personas++;
}
@@ -1714,7 +1714,7 @@ personas_changed_cb (FolksIndividual *individual,
for (l = personas; l != NULL; l = l->next)
{
- if (TPF_IS_PERSONA (l->data))
+ if (empathy_folks_persona_is_interesting (FOLKS_PERSONA (l->data)))
new_num_personas++;
}
@@ -1890,7 +1890,7 @@ individual_update (EmpathyIndividualWidget *self)
personas = folks_individual_get_personas (priv->individual);
for (l = personas; l != NULL; l = l->next)
{
- if (!TPF_IS_PERSONA (l->data))
+ if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (l->data)))
continue;
update_persona (self, FOLKS_PERSONA (l->data));