diff options
author | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-12-23 09:22:59 +0800 |
---|---|---|
committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-02-01 08:16:21 +0800 |
commit | 41f5717611c6bb3236ae78a187fd5753bbd9ccf3 (patch) | |
tree | 2f10febc234021ae4e2bfab27f7f228b057003e9 /libempathy-gtk/empathy-individual-widget.c | |
parent | dfffa71d1d33714b331faaac367110716d56c72c (diff) | |
download | gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.gz gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.bz2 gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.lz gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.xz gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.zst gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.zip |
Adjust for FolksHasPresence -> FolksPresenceOwner
Fixes bgo#637847.
Diffstat (limited to 'libempathy-gtk/empathy-individual-widget.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-widget.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 44e7f9572..2f7899b2b 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -220,20 +220,20 @@ update_weak_contact (EmpathyIndividualWidget *self) personas = folks_individual_get_personas (priv->individual); for (l = personas; l != NULL; l = l->next) { - FolksHasPresence *presence; + FolksPresenceOwner *presence; /* We only want personas which implement FolksPresence */ - if (!FOLKS_IS_HAS_PRESENCE (l->data)) + if (!FOLKS_IS_PRESENCE_OWNER (l->data)) continue; - presence = FOLKS_HAS_PRESENCE (l->data); + presence = FOLKS_PRESENCE_OWNER (l->data); - if (folks_has_presence_typecmp ( - folks_has_presence_get_presence_type (presence), + if (folks_presence_owner_typecmp ( + folks_presence_owner_get_presence_type (presence), presence_type) > 0 && TPF_IS_PERSONA (presence)) { - presence_type = folks_has_presence_get_presence_type (presence); + presence_type = folks_presence_owner_get_presence_type (presence); tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data)); } } @@ -1248,13 +1248,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_has_presence_get_presence_message ( - FOLKS_HAS_PRESENCE (folks_object)); + message = folks_presence_owner_get_presence_message ( + FOLKS_PRESENCE_OWNER (folks_object)); if (EMP_STR_EMPTY (message)) { message = empathy_presence_get_default_message ( - folks_has_presence_get_presence_type ( - FOLKS_HAS_PRESENCE (folks_object))); + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (folks_object))); } if (message != NULL) @@ -1264,8 +1264,8 @@ notify_presence_cb (gpointer folks_object, gtk_image_set_from_icon_name (GTK_IMAGE (state_image), empathy_icon_name_for_presence ( - folks_has_presence_get_presence_type ( - FOLKS_HAS_PRESENCE (folks_object))), + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (folks_object))), GTK_ICON_SIZE_BUTTON); gtk_widget_show (state_image); } |