From 6e09b2b2639253549f890702cb811c10cc0d5167 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 15 Sep 2010 15:23:14 +0100 Subject: Port Empathy to use FolksAliasable and FolksGroupable FolksAliasable is the new name for FolksAlias, and FolksGroupable is the new name for FolksGroups. --- libempathy-gtk/empathy-individual-widget.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libempathy-gtk/empathy-individual-widget.c') diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 36cea8a5e..06675876d 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -437,7 +437,7 @@ groups_update (EmpathyIndividualWidget *self) { empathy_groups_widget_set_groupable ( EMPATHY_GROUPS_WIDGET (priv->groups_widget), - FOLKS_GROUPS (priv->individual)); + FOLKS_GROUPABLE (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_alias_get_alias (FOLKS_ALIAS (persona)), NULL, NULL, - NULL); + folks_aliasable_get_alias (FOLKS_ALIASABLE (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,7 @@ entry_alias_focus_event_cb (GtkEditable *editable, } else { - folks_alias_set_alias (FOLKS_ALIAS (priv->individual), alias); + folks_aliasable_set_alias (FOLKS_ALIASABLE (priv->individual), alias); } } @@ -1133,12 +1133,12 @@ notify_alias_cb (gpointer folks_object, if (GTK_IS_ENTRY (alias_widget)) { gtk_entry_set_text (GTK_ENTRY (alias_widget), - folks_alias_get_alias (FOLKS_ALIAS (folks_object))); + folks_aliasable_get_alias (FOLKS_ALIASABLE (folks_object))); } else { gtk_label_set_label (GTK_LABEL (alias_widget), - folks_alias_get_alias (FOLKS_ALIAS (folks_object))); + folks_aliasable_get_alias (FOLKS_ALIASABLE (folks_object))); } } -- cgit v1.2.3