From b6568db4f81cf4e78e96aa5fe23f020de5ff6557 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 7 Jul 2010 16:21:43 +0100 Subject: Merge EmpathyContact:name and *_set_alias() to EmpathyContact:alias The "name" API was a relic of Gossip. --- src/empathy-call-window.c | 8 ++++---- src/empathy-chat-window.c | 2 +- src/empathy-event-manager.c | 20 ++++++++++---------- src/empathy-ft-manager.c | 10 +++++----- src/empathy-map-view.c | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index e607b2ef7..ffdcb5c71 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1244,7 +1244,7 @@ set_window_title (EmpathyCallWindow *self) /* translators: Call is a noun and %s is the contact name. This string * is used in the window title */ tmp = g_strdup_printf (_("Call with %s"), - empathy_contact_get_name (priv->contact)); + empathy_contact_get_alias (priv->contact)); gtk_window_set_title (GTK_WINDOW (self), tmp); g_free (tmp); } @@ -2215,19 +2215,19 @@ media_stream_error_to_txt (EmpathyCallWindow *self, return g_strdup_printf ( _("%s's software does not understand any of the audio formats " "supported by your computer"), - empathy_contact_get_name (priv->contact)); + empathy_contact_get_alias (priv->contact)); else return g_strdup_printf ( _("%s's software does not understand any of the video formats " "supported by your computer"), - empathy_contact_get_name (priv->contact)); + empathy_contact_get_alias (priv->contact)); case TP_MEDIA_STREAM_ERROR_CONNECTION_FAILED: return g_strdup_printf ( _("Can't establish a connection to %s. " "One of you might be on a network that does not allow " "direct connections."), - empathy_contact_get_name (priv->contact)); + empathy_contact_get_alias (priv->contact)); case TP_MEDIA_STREAM_ERROR_NETWORK_ERROR: return g_strdup (_("There was a failure on the network")); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index c4ce8b26e..8c2eed6b1 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1281,7 +1281,7 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window, } sender = empathy_message_get_sender (message); - header = empathy_contact_get_name (sender); + header = empathy_contact_get_alias (sender); body = empathy_message_get_body (message); escaped = g_markup_escape_text (body, -1); has_x_canonical_append = empathy_notify_manager_has_capability ( diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index bf3a48a8a..3f4281fbf 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -476,10 +476,10 @@ event_channel_process_voip_func (EventPriv *event) GTK_MESSAGE_DIALOG (dialog), video ? _("%s is video calling you. Do you want to answer?"): _("%s is calling you. Do you want to answer?"), - empathy_contact_get_name (event->approval->contact)); + empathy_contact_get_alias (event->approval->contact)); title = g_strdup_printf (_("Incoming call from %s"), - empathy_contact_get_name (event->approval->contact)); + empathy_contact_get_alias (event->approval->contact)); gtk_window_set_title (GTK_WINDOW (dialog), title); g_free (title); @@ -540,7 +540,7 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat, event = event_lookup_by_approval (approval->manager, approval); sender = empathy_message_get_sender (message); - header = empathy_contact_get_name (sender); + header = empathy_contact_get_alias (sender); msg = empathy_message_get_body (message); channel = empathy_tp_chat_get_channel (tp_chat); @@ -621,7 +621,7 @@ event_manager_media_channel_got_contact (EventManagerApproval *approval) header = g_strdup_printf ( video ? _("Incoming video call from %s") :_("Incoming call from %s"), - empathy_contact_get_name (approval->contact)); + empathy_contact_get_alias (approval->contact)); event_manager_add (approval->manager, approval->contact, EMPATHY_EVENT_TYPE_VOIP, @@ -707,7 +707,7 @@ event_room_channel_process_func (EventPriv *event) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("%s is inviting you to join %s"), - empathy_contact_get_name (event->approval->contact), + empathy_contact_get_alias (event->approval->contact), tp_channel_get_identifier (channel)); gtk_dialog_set_default_response (GTK_DIALOG (dialog), @@ -758,7 +758,7 @@ event_manager_muc_invite_got_contact_cb (TpConnection *connection, NULL, NULL, &invite_msg); msg = g_strdup_printf (_("%s invited you to join %s"), - empathy_contact_get_name (approval->contact), + empathy_contact_get_alias (approval->contact), tp_channel_get_identifier (approval->main_channel)); event_manager_add (approval->manager, approval->contact, @@ -785,7 +785,7 @@ event_manager_ft_got_contact_cb (TpConnection *connection, approval->contact = g_object_ref (contact); header = g_strdup_printf (_("Incoming file transfer from %s"), - empathy_contact_get_name (approval->contact)); + empathy_contact_get_alias (approval->contact)); event_manager_add (approval->manager, approval->contact, EMPATHY_EVENT_TYPE_TRANSFER, EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL, @@ -986,7 +986,7 @@ event_manager_pendings_changed_cb (EmpathyContactList *list, } header = g_strdup_printf (_("Subscription requested by %s"), - empathy_contact_get_name (contact)); + empathy_contact_get_alias (contact)); if (!EMP_STR_EMPTY (message)) event_msg = g_strdup_printf (_("\nMessage: %s"), message); @@ -1033,7 +1033,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact, EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNOUT)) { header = g_strdup_printf (_("%s is now offline."), - empathy_contact_get_name (contact)); + empathy_contact_get_alias (contact)); event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL); @@ -1053,7 +1053,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact, EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN)) { header = g_strdup_printf (_("%s is now online."), - empathy_contact_get_name (contact)); + empathy_contact_get_alias (contact)); event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL); diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index 34ac1adac..58edc584e 100644 --- a/src/empathy-ft-manager.c +++ b/src/empathy-ft-manager.c @@ -205,7 +205,7 @@ ft_manager_remove_file_from_model (EmpathyFTManager *manager, g_return_if_fail (row_ref); DEBUG ("Removing file transfer from window: contact=%s, filename=%s", - empathy_contact_get_name (empathy_ft_handler_get_contact (handler)), + empathy_contact_get_alias (empathy_ft_handler_get_contact (handler)), empathy_ft_handler_get_filename (handler)); /* Get the iter from the row_ref */ @@ -296,7 +296,7 @@ ft_manager_format_contact_info (EmpathyFTHandler *handler) char *retval; incoming = empathy_ft_handler_is_incoming (handler); - contact_name = empathy_contact_get_name + contact_name = empathy_contact_get_alias (empathy_ft_handler_get_contact (handler)); filename = empathy_ft_handler_get_filename (handler); @@ -326,7 +326,7 @@ ft_manager_format_error_message (EmpathyFTHandler *handler, contact = empathy_ft_handler_get_contact (handler); if (contact) - contact_name = empathy_contact_get_name (contact); + contact_name = empathy_contact_get_alias (contact); filename = empathy_ft_handler_get_filename (handler); @@ -478,7 +478,7 @@ do_real_transfer_done (EmpathyFTManager *manager, g_return_if_fail (row_ref != NULL); incoming = empathy_ft_handler_is_incoming (handler); - contact_name = empathy_contact_get_name + contact_name = empathy_contact_get_alias (empathy_ft_handler_get_contact (handler)); filename = empathy_ft_handler_get_filename (handler); @@ -857,7 +857,7 @@ ft_manager_stop (EmpathyFTManager *manager) g_return_if_fail (handler != NULL); DEBUG ("Stopping file transfer: contact=%s, filename=%s", - empathy_contact_get_name (empathy_ft_handler_get_contact (handler)), + empathy_contact_get_alias (empathy_ft_handler_get_contact (handler)), empathy_ft_handler_get_filename (handler)); empathy_ft_handler_cancel_transfer (handler); diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c index 2b0b93f7f..2143f19ef 100644 --- a/src/empathy-map-view.c +++ b/src/empathy-map-view.c @@ -227,7 +227,7 @@ map_view_contacts_update_label (ChamplainMarker *marker) contact = g_object_get_data (G_OBJECT (marker), "contact"); location = empathy_contact_get_location (contact); - name = empathy_contact_get_name (contact); + name = empathy_contact_get_alias (contact); gtime = g_hash_table_lookup (location, EMPATHY_LOCATION_TIMESTAMP); if (gtime != NULL) -- cgit v1.2.3