diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2008-11-22 00:18:41 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-11-22 00:18:41 +0800 |
| commit | 4ecbf2073d6637b4a7adaf3470107042147fe72a (patch) | |
| tree | f741c619890849d46c6119689144decf9cb11b59 /libempathy-gtk | |
| parent | e5d8ce41314a671135d02a305de5826659d0fcd6 (diff) | |
| download | gsoc2013-empathy-4ecbf2073d6637b4a7adaf3470107042147fe72a.tar gsoc2013-empathy-4ecbf2073d6637b4a7adaf3470107042147fe72a.tar.gz gsoc2013-empathy-4ecbf2073d6637b4a7adaf3470107042147fe72a.tar.bz2 gsoc2013-empathy-4ecbf2073d6637b4a7adaf3470107042147fe72a.tar.lz gsoc2013-empathy-4ecbf2073d6637b4a7adaf3470107042147fe72a.tar.xz gsoc2013-empathy-4ecbf2073d6637b4a7adaf3470107042147fe72a.tar.zst gsoc2013-empathy-4ecbf2073d6637b4a7adaf3470107042147fe72a.zip | |
Made ft_manager_update_ft_row handle Local_Pending slightly nicer. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1814
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-ft-manager.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-ft-manager.c b/libempathy-gtk/empathy-ft-manager.c index a3b59616f..80be6417f 100644 --- a/libempathy-gtk/empathy-ft-manager.c +++ b/libempathy-gtk/empathy-ft-manager.c @@ -257,14 +257,9 @@ ft_manager_update_ft_row (EmpathyFTManager *ft_manager, state = empathy_tp_file_get_state (tp_file); reason = empathy_tp_file_get_state_change_reason (tp_file); - /* The state is changed asynchronously, so we can get local pending - * transfers just before their state is changed to open. - * Just treat them as open file transfers. */ - if (state == EMP_FILE_TRANSFER_STATE_LOCAL_PENDING) - state = EMP_FILE_TRANSFER_STATE_OPEN; - switch (state) { + case EMP_FILE_TRANSFER_STATE_LOCAL_PENDING: case EMP_FILE_TRANSFER_STATE_REMOTE_PENDING: case EMP_FILE_TRANSFER_STATE_OPEN: case EMP_FILE_TRANSFER_STATE_ACCEPTED: @@ -279,7 +274,8 @@ ft_manager_update_ft_row (EmpathyFTManager *ft_manager, first_line = g_strdup_printf (first_line_format, filename, contact_name); if (state == EMP_FILE_TRANSFER_STATE_OPEN - || state == EMP_FILE_TRANSFER_STATE_ACCEPTED) + || state == EMP_FILE_TRANSFER_STATE_ACCEPTED + || state == EMP_FILE_TRANSFER_STATE_LOCAL_PENDING) { gchar *total_size_str; gchar *transferred_bytes_str; |