diff options
author | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-03-11 14:07:44 +0800 |
---|---|---|
committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-03-15 02:46:52 +0800 |
commit | 492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef (patch) | |
tree | 61a73414fcf25255d9d37ede52026556b306379b /libempathy-gtk/empathy-individual-widget.c | |
parent | abf8b17d703c071f4fe91c09bac97c09314a2dc0 (diff) | |
download | gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.gz gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.bz2 gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.lz gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.xz gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.zst gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.zip |
Adjust for Folks PresenceOwner -> PresenceDetails rename
Fixes bgo#644470 - Empathy needs to catch up with Folks interface name change
(API/ABI breaks)
Diffstat (limited to 'libempathy-gtk/empathy-individual-widget.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-widget.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 2f5d8faf4..ebad685be 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -228,20 +228,21 @@ update_weak_contact (EmpathyIndividualWidget *self) personas = folks_individual_get_personas (priv->individual); for (l = personas; l != NULL; l = l->next) { - FolksPresenceOwner *presence; + FolksPresenceDetails *presence; /* We only want personas which implement FolksPresence */ - if (!FOLKS_IS_PRESENCE_OWNER (l->data)) + if (!FOLKS_IS_PRESENCE_DETAILS (l->data)) continue; - presence = FOLKS_PRESENCE_OWNER (l->data); + presence = FOLKS_PRESENCE_DETAILS (l->data); - if (folks_presence_owner_typecmp ( - folks_presence_owner_get_presence_type (presence), + if (folks_presence_details_typecmp ( + folks_presence_details_get_presence_type (presence), presence_type) > 0 && empathy_folks_persona_is_interesting (FOLKS_PERSONA (presence))) { - presence_type = folks_presence_owner_get_presence_type (presence); + presence_type = folks_presence_details_get_presence_type ( + presence); tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data)); } } @@ -1242,13 +1243,13 @@ notify_presence_cb (gpointer folks_object, state_image = g_object_get_data (table, "state-image"); /* FIXME: Default messages should be moved into libfolks (bgo#627403) */ - message = folks_presence_owner_get_presence_message ( - FOLKS_PRESENCE_OWNER (folks_object)); + message = folks_presence_details_get_presence_message ( + FOLKS_PRESENCE_DETAILS (folks_object)); if (EMP_STR_EMPTY (message)) { message = empathy_presence_get_default_message ( - folks_presence_owner_get_presence_type ( - FOLKS_PRESENCE_OWNER (folks_object))); + folks_presence_details_get_presence_type ( + FOLKS_PRESENCE_DETAILS (folks_object))); } if (message != NULL) @@ -1258,8 +1259,8 @@ notify_presence_cb (gpointer folks_object, gtk_image_set_from_icon_name (GTK_IMAGE (state_image), empathy_icon_name_for_presence ( - folks_presence_owner_get_presence_type ( - FOLKS_PRESENCE_OWNER (folks_object))), + folks_presence_details_get_presence_type ( + FOLKS_PRESENCE_DETAILS (folks_object))), GTK_ICON_SIZE_BUTTON); gtk_widget_show (state_image); } |