diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-16 17:11:26 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-16 17:24:59 +0800 |
commit | cb2741bee8b6808953a6afeea90114f123a47982 (patch) | |
tree | e1b0df9a14caf29e7047ec403db51d0752533895 /libempathy-gtk/empathy-individual-widget.c | |
parent | 15761dfafa40dce3e5acb2f9fecc5b808fa11e47 (diff) | |
download | gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.gz gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.bz2 gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.lz gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.xz gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.zst gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.zip |
depends on folks 0.4.0
This is based on Travis's commits from master.
Diffstat (limited to 'libempathy-gtk/empathy-individual-widget.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-widget.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 19d0f81a7..ed5e3be6f 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -435,9 +435,9 @@ groups_update (EmpathyIndividualWidget *self) if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_GROUPS && priv->individual != NULL) { - empathy_groups_widget_set_groupable ( + empathy_groups_widget_set_group_details ( EMPATHY_GROUPS_WIDGET (priv->groups_widget), - FOLKS_GROUPABLE (priv->individual)); + FOLKS_GROUP_DETAILS (priv->individual)); gtk_widget_show (priv->groups_widget); } else @@ -761,8 +761,8 @@ location_update (EmpathyIndividualWidget *self) /* Add a marker to the map */ marker = champlain_marker_new_with_text ( - folks_aliasable_get_alias (FOLKS_ALIASABLE (persona)), NULL, - NULL, NULL); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)), + NULL, NULL, NULL); champlain_base_marker_set_position ( CHAMPLAIN_BASE_MARKER (marker), lat, lon); clutter_container_add (CLUTTER_CONTAINER (layer), marker, NULL); @@ -1058,7 +1058,8 @@ entry_alias_focus_event_cb (GtkEditable *editable, } else { - folks_aliasable_set_alias (FOLKS_ALIASABLE (priv->individual), alias); + folks_alias_details_set_alias (FOLKS_ALIAS_DETAILS (priv->individual), + alias); } } @@ -1070,8 +1071,8 @@ favourite_toggled_cb (GtkToggleButton *button, EmpathyIndividualWidget *self) { gboolean active = gtk_toggle_button_get_active (button); - folks_favouritable_set_is_favourite ( - FOLKS_FAVOURITABLE (GET_PRIV (self)->individual), active); + folks_favourite_details_set_is_favourite ( + FOLKS_FAVOURITE_DETAILS (GET_PRIV (self)->individual), active); } static void @@ -1133,12 +1134,12 @@ notify_alias_cb (gpointer folks_object, if (GTK_IS_ENTRY (alias_widget)) { gtk_entry_set_text (GTK_ENTRY (alias_widget), - folks_aliasable_get_alias (FOLKS_ALIASABLE (folks_object))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (folks_object))); } else { gtk_label_set_label (GTK_LABEL (alias_widget), - folks_aliasable_get_alias (FOLKS_ALIASABLE (folks_object))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (folks_object))); } } @@ -1167,13 +1168,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) @@ -1183,8 +1184,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); } @@ -1213,8 +1214,8 @@ notify_is_favourite_cb (gpointer folks_object, if (GTK_IS_TOGGLE_BUTTON (favourite_widget)) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (favourite_widget), - folks_favouritable_get_is_favourite ( - FOLKS_FAVOURITABLE (folks_object))); + folks_favourite_details_get_is_favourite ( + FOLKS_FAVOURITE_DETAILS (folks_object))); } } |