aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-ft-manager.c
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-11-22 00:17:03 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:17:03 +0800
commitbc82fc3c32d04bbef0f1921fe8f534cfac345f8d (patch)
treeccd1880d566b2ed76ed6af29592143251e8b1389 /libempathy-gtk/empathy-ft-manager.c
parent7cb242a20728f515058468cbc3ffab111785f53e (diff)
downloadgsoc2013-empathy-bc82fc3c32d04bbef0f1921fe8f534cfac345f8d.tar
gsoc2013-empathy-bc82fc3c32d04bbef0f1921fe8f534cfac345f8d.tar.gz
gsoc2013-empathy-bc82fc3c32d04bbef0f1921fe8f534cfac345f8d.tar.bz2
gsoc2013-empathy-bc82fc3c32d04bbef0f1921fe8f534cfac345f8d.tar.lz
gsoc2013-empathy-bc82fc3c32d04bbef0f1921fe8f534cfac345f8d.tar.xz
gsoc2013-empathy-bc82fc3c32d04bbef0f1921fe8f534cfac345f8d.tar.zst
gsoc2013-empathy-bc82fc3c32d04bbef0f1921fe8f534cfac345f8d.zip
Added empathy_offer_file function and updated accept_file. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=1788
Diffstat (limited to 'libempathy-gtk/empathy-ft-manager.c')
-rw-r--r--libempathy-gtk/empathy-ft-manager.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-ft-manager.c b/libempathy-gtk/empathy-ft-manager.c
index 5c23ccb5c..c295b53e6 100644
--- a/libempathy-gtk/empathy-ft-manager.c
+++ b/libempathy-gtk/empathy-ft-manager.c
@@ -365,6 +365,8 @@ update_ft_row (EmpathyFTManager *ft_manager,
{
case EMP_FILE_TRANSFER_STATE_REMOTE_PENDING:
case EMP_FILE_TRANSFER_STATE_OPEN:
+ case EMP_FILE_TRANSFER_STATE_ACCEPTED:
+ case EMP_FILE_TRANSFER_STATE_NOT_OFFERED:
if (empathy_tp_file_get_incoming (tp_file))
/* translators: first %s is filename, second %s is the contact name */
first_line_format = _("Receiving \"%s\" from %s");
@@ -374,7 +376,8 @@ update_ft_row (EmpathyFTManager *ft_manager,
first_line = g_strdup_printf (first_line_format, filename, contact_name);
- if (state == EMP_FILE_TRANSFER_STATE_OPEN)
+ if (state == EMP_FILE_TRANSFER_STATE_OPEN
+ || state == EMP_FILE_TRANSFER_STATE_ACCEPTED)
{
gchar *total_size_str;
gchar *transferred_bytes_str;
@@ -1064,7 +1067,7 @@ ft_manager_save_dialog_response_cb (GtkDialog *widget,
filename = g_file_get_basename (file);
empathy_tp_file_set_filename (response_data->tp_file, filename);
- empathy_tp_file_accept (response_data->tp_file);
+ empathy_tp_file_accept (response_data->tp_file, 0);
ft_manager_add_tp_file_to_list (response_data->ft_manager,
response_data->tp_file);