From 36eb0b9dec61bd0040161535f27fc4bbbd4511ca Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Thu, 10 Mar 2011 21:12:13 -0800 Subject: Adjust for Folks Aliasable -> AliasDetails rename Helps bgo#644470 - Empathy needs to catch up with Folks interface name change (API/ABI breaks) --- libempathy-gtk/empathy-individual-dialogs.c | 4 ++-- .../empathy-individual-information-dialog.c | 2 +- libempathy-gtk/empathy-individual-store.c | 26 ++++++++++++---------- libempathy-gtk/empathy-individual-view.c | 8 ++++--- libempathy-gtk/empathy-individual-widget.c | 11 ++++----- libempathy-gtk/empathy-linking-dialog.c | 2 +- libempathy-gtk/empathy-persona-store.c | 14 ++++++------ libempathy/empathy-contact.c | 4 ++-- libempathy/empathy-individual-manager.c | 2 +- 9 files changed, 39 insertions(+), 34 deletions(-) diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 67ec22164..b5f41db13 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -196,7 +196,7 @@ empathy_block_individual_dialog_show (GtkWindow *parent, dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, _("Block %s?"), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); /* build a list of personas that support blocking */ personas = folks_individual_get_personas (individual); @@ -237,7 +237,7 @@ empathy_block_individual_dialog_show (GtkWindow *parent, g_string_append_printf (text, _("Are you sure you want to block '%s' from contacting you again?"), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); if (npersonas_blocked > 0) g_string_append_printf (text, "\n\n%s\n%s", diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c index fcbec1228..e14293d45 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.c +++ b/libempathy-gtk/empathy-individual-information-dialog.c @@ -180,7 +180,7 @@ individual_information_dialog_set_individual ( /* Update the UI */ gtk_window_set_title (GTK_WINDOW (dialog), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); empathy_individual_widget_set_individual ( EMPATHY_INDIVIDUAL_WIDGET (priv->individual_widget), individual); set_label_visibility (dialog); diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index cf7d6865e..4fa259c3e 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -204,7 +204,7 @@ add_individual_to_store (GtkTreeStore *self, gtk_tree_store_insert_with_values (self, iter, parent, 0, EMPATHY_INDIVIDUAL_STORE_COL_NAME, - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, individual, EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE, EMPATHY_INDIVIDUAL_STORE_COL_IS_SEPARATOR, FALSE, @@ -422,7 +422,8 @@ individual_store_add_individual (EmpathyIndividualStore *self, priv = GET_PRIV (self); - if (EMP_STR_EMPTY (folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)))) + if (EMP_STR_EMPTY (folks_alias_details_get_alias ( + FOLKS_ALIAS_DETAILS (individual)))) return; if (priv->show_groups) @@ -558,7 +559,7 @@ individual_store_contact_active_new (EmpathyIndividualStore *self, ShowActiveData *data; DEBUG ("Individual'%s' now active, and %s be removed", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), remove_ ? "WILL" : "WILL NOT"); data = g_slice_new0 (ShowActiveData); @@ -603,12 +604,13 @@ individual_store_contact_active_cb (ShowActiveData *data) if (data->remove) { DEBUG ("Individual'%s' active timeout, removing item", - folks_aliasable_get_alias (FOLKS_ALIASABLE (data->individual))); + folks_alias_details_get_alias ( + FOLKS_ALIAS_DETAILS (data->individual))); individual_store_remove_individual (data->self, data->individual); } DEBUG ("Individual'%s' no longer active", - folks_aliasable_get_alias (FOLKS_ALIASABLE (data->individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (data->individual))); individual_store_contact_set_active (data->self, data->individual, FALSE, TRUE); @@ -637,7 +639,7 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual, if (error != NULL) { DEBUG ("failed to retrieve pixbuf for individual %s: %s", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), error->message); g_clear_error (&error); } @@ -712,7 +714,7 @@ individual_store_contact_update (EmpathyIndividualStore *self, if (!in_list) { DEBUG ("Individual'%s' in list:NO, should be:YES", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); individual_store_add_individual (self, individual); @@ -726,7 +728,7 @@ individual_store_contact_update (EmpathyIndividualStore *self, else { DEBUG ("Individual'%s' in list:YES, should be:YES", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); /* Get online state before. */ if (iters && g_list_length (iters) > 0) @@ -795,7 +797,7 @@ individual_store_contact_update (EmpathyIndividualStore *self, EMPATHY_INDIVIDUAL_STORE_COL_ICON_STATUS, pixbuf_status, EMPATHY_INDIVIDUAL_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar, EMPATHY_INDIVIDUAL_STORE_COL_NAME, - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE, folks_presence_owner_get_presence_type ( FOLKS_PRESENCE_OWNER (individual)), @@ -841,7 +843,7 @@ individual_store_individual_updated_cb (FolksIndividual *individual, EmpathyIndividualStore *self) { DEBUG ("Individual'%s' updated, checking roster is in sync...", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); individual_store_contact_update (self, individual); } @@ -1392,8 +1394,8 @@ individual_store_contact_sort (FolksIndividual *individual_a, /* alias */ ret_val = g_utf8_collate ( - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual_a)), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual_b))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual_a)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual_b))); if (ret_val != 0) goto out; diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 2c1f3b76d..9bad850d3 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -1712,7 +1712,7 @@ individual_view_is_visible_individual (EmpathyIndividualView *self, return (priv->show_offline || is_online || is_favorite); /* check alias name */ - str = folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)); + str = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)); if (empathy_live_search_match (live, str)) return TRUE; @@ -2436,7 +2436,8 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem, text = g_strdup_printf ( _("Do you really want to remove the contact '%s'?"), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias ( + FOLKS_ALIAS_DETAILS (individual))); } else { @@ -2446,7 +2447,8 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem, _("Do you really want to remove the linked contact '%s'? " "Note that this will remove all the contacts which make up " "this linked contact."), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias ( + FOLKS_ALIAS_DETAILS (individual))); } diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 51e6a534e..c2956b149 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -791,8 +791,8 @@ location_update (EmpathyIndividualWidget *self) /* Add a marker to the map */ marker = champlain_label_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_location_set_location (CHAMPLAIN_LOCATION (marker), lat, lon); champlain_marker_layer_add_marker (layer, @@ -1132,7 +1132,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); } } @@ -1207,12 +1208,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))); } } diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c index 35328a3d7..7e11b91cd 100644 --- a/libempathy-gtk/empathy-linking-dialog.c +++ b/libempathy-gtk/empathy-linking-dialog.c @@ -181,7 +181,7 @@ linking_response_cb (EmpathyLinkingDialog *self, dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Unlink linked contacts '%s'?"), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("Are you sure you want to unlink these linked contacts? This will " "completely split the linked contacts into separate contacts.")); diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c index d89ae9eb3..6e9aa746f 100644 --- a/libempathy-gtk/empathy-persona-store.c +++ b/libempathy-gtk/empathy-persona-store.c @@ -142,7 +142,7 @@ persona_active_new (EmpathyPersonaStore *self, ShowActiveData *data; DEBUG ("Contact:'%s' now active, and %s be removed", - folks_aliasable_get_alias (FOLKS_ALIASABLE (persona)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)), remove_ ? "WILL" : "WILL NOT"); data = g_slice_new0 (ShowActiveData); @@ -213,7 +213,7 @@ static gboolean persona_active_cb (ShowActiveData *data) { const gchar *alias = - folks_aliasable_get_alias (FOLKS_ALIASABLE (data->persona)); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (data->persona)); if (data->remove) { @@ -235,7 +235,7 @@ persona_updated_cb (FolksPersona *persona, EmpathyPersonaStore *self) { DEBUG ("Contact:'%s' updated, checking roster is in sync...", - folks_aliasable_get_alias (FOLKS_ALIASABLE (persona))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona))); update_persona (self, persona); } @@ -289,7 +289,7 @@ add_persona (EmpathyPersonaStore *self, priv = GET_PRIV (self); - alias = folks_aliasable_get_alias (FOLKS_ALIASABLE (persona)); + alias = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)); if (EMP_STR_EMPTY (alias)) return; @@ -408,7 +408,7 @@ update_persona (EmpathyPersonaStore *self, const gchar *alias; path = find_persona (self, persona); - alias = folks_aliasable_get_alias (FOLKS_ALIASABLE (persona)); + alias = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)); if (path == NULL) { @@ -563,8 +563,8 @@ sort_personas (FolksPersona *persona_a, /* alias */ ret_val = g_utf8_collate ( - folks_aliasable_get_alias (FOLKS_ALIASABLE (persona_a)), - folks_aliasable_get_alias (FOLKS_ALIASABLE (persona_b))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona_a)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona_b))); if (ret_val != 0) goto out; diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 73539b406..3218e298f 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -729,12 +729,12 @@ empathy_contact_set_alias (EmpathyContact *contact, /* Set the alias on the persona if possible */ persona = empathy_contact_get_persona (contact); - if (persona != NULL && FOLKS_IS_ALIASABLE (persona)) + if (persona != NULL && FOLKS_IS_ALIAS_DETAILS (persona)) { DEBUG ("Setting alias for contact %s to %s", empathy_contact_get_id (contact), alias); - folks_aliasable_set_alias (FOLKS_ALIASABLE (persona), alias); + folks_alias_details_set_alias (FOLKS_ALIAS_DETAILS (persona), alias); } if (tp_strdiff (alias, priv->alias)) diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index 137d00f1f..8217d3cc6 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -479,7 +479,7 @@ empathy_individual_manager_remove (EmpathyIndividualManager *self, DEBUG ("removing individual %s (%s)", folks_individual_get_id (individual), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); folks_individual_aggregator_remove_individual (priv->aggregator, individual, aggregator_remove_individual_cb, self); -- cgit v1.2.3