diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-07-07 23:21:43 +0800 |
|---|---|---|
| committer | Travis Reitter <treitter@gmail.com> | 2010-07-22 04:25:09 +0800 |
| commit | b6568db4f81cf4e78e96aa5fe23f020de5ff6557 (patch) | |
| tree | 7f0dd7dbfb45315d5bf16f0db623a98d3fe6f19d /src/empathy-ft-manager.c | |
| parent | a244924636a2a0cde9da06909ac2b1b141ce3b9e (diff) | |
| download | gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.gz gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.bz2 gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.lz gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.xz gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.tar.zst gsoc2013-empathy-b6568db4f81cf4e78e96aa5fe23f020de5ff6557.zip | |
Merge EmpathyContact:name and *_set_alias() to EmpathyContact:alias
The "name" API was a relic of Gossip.
Diffstat (limited to 'src/empathy-ft-manager.c')
| -rw-r--r-- | src/empathy-ft-manager.c | 10 |
1 files changed, 5 insertions, 5 deletions
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); |