diff options
author | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-05-15 01:57:25 +0800 |
---|---|---|
committer | Cosimo Cecchi <cosimoc@gnome.org> | 2009-06-01 23:49:57 +0800 |
commit | 997c9dabb5fd8ea6631a37a80576d312b0da56d5 (patch) | |
tree | 31a6f806066fefb3bf61e73122c094b2f00664bd | |
parent | 434bbd9419c2297bad034ea19adafdb1281bf18c (diff) | |
download | gsoc2013-empathy-997c9dabb5fd8ea6631a37a80576d312b0da56d5.tar gsoc2013-empathy-997c9dabb5fd8ea6631a37a80576d312b0da56d5.tar.gz gsoc2013-empathy-997c9dabb5fd8ea6631a37a80576d312b0da56d5.tar.bz2 gsoc2013-empathy-997c9dabb5fd8ea6631a37a80576d312b0da56d5.tar.lz gsoc2013-empathy-997c9dabb5fd8ea6631a37a80576d312b0da56d5.tar.xz gsoc2013-empathy-997c9dabb5fd8ea6631a37a80576d312b0da56d5.tar.zst gsoc2013-empathy-997c9dabb5fd8ea6631a37a80576d312b0da56d5.zip |
Set the right initial value in the UI
Set an initial value for the UI string in case we're not using hash.
-rw-r--r-- | src/empathy-ft-manager.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index a49daabd3..7c1071760 100644 --- a/src/empathy-ft-manager.c +++ b/src/empathy-ft-manager.c @@ -747,8 +747,13 @@ ft_manager_add_handler_to_list (EmpathyFTManager *manager, return; } - /* update the row with the initial values */ - if (empathy_ft_handler_is_incoming (handler)) { + /* update the row with the initial values. + * the only case where we postpone this is in case we're managing + * an outgoing+hashing transfer, as the hashing started signal will + * take care of updating the information. + */ + if (empathy_ft_handler_is_incoming (handler) || + !empathy_ft_handler_get_use_hash (handler)) { first_line = ft_manager_format_contact_info (handler); second_line = _("Waiting for the other participant's response"); message = g_strdup_printf ("%s\n%s", first_line, second_line); @@ -759,7 +764,6 @@ ft_manager_add_handler_to_list (EmpathyFTManager *manager, g_free (message); } - /* hook up the signals and start the transfer */ ft_manager_start_transfer (manager, handler); } |