aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-ft-manager.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2009-05-18 20:55:01 +0800
committerCosimo Cecchi <cosimoc@gnome.org>2009-06-01 23:53:20 +0800
commit24c1b03b78ee231e78a52ec79eb15e2f41e80338 (patch)
treea9cf50e7307d61c4cafead3f8c2c77f06077d869 /src/empathy-ft-manager.c
parent948f05b5e6b28afbfc0549efe6cc4fd55598738c (diff)
downloadgsoc2013-empathy-24c1b03b78ee231e78a52ec79eb15e2f41e80338.tar
gsoc2013-empathy-24c1b03b78ee231e78a52ec79eb15e2f41e80338.tar.gz
gsoc2013-empathy-24c1b03b78ee231e78a52ec79eb15e2f41e80338.tar.bz2
gsoc2013-empathy-24c1b03b78ee231e78a52ec79eb15e2f41e80338.tar.lz
gsoc2013-empathy-24c1b03b78ee231e78a52ec79eb15e2f41e80338.tar.xz
gsoc2013-empathy-24c1b03b78ee231e78a52ec79eb15e2f41e80338.tar.zst
gsoc2013-empathy-24c1b03b78ee231e78a52ec79eb15e2f41e80338.zip
Set use_hash according to what the CM returns
Set use_hash according to what the CM returns and not what the user would like it to be, so that clients won't be confused about whether they should connect to "hashing-started" after "transfer-done".
Diffstat (limited to 'src/empathy-ft-manager.c')
-rw-r--r--src/empathy-ft-manager.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 858b21208..7b3e88a24 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -491,16 +491,20 @@ ft_handler_transfer_done_cb (EmpathyFTHandler *handler,
EmpathyTpFile *tp_file,
EmpathyFTManager *manager)
{
- DEBUG ("Transfer done");
-
if (empathy_ft_handler_is_incoming (handler) &&
empathy_ft_handler_get_use_hash (handler))
{
- /* connect to the signal */
+ DEBUG ("Transfer done, waiting for hashing-started");
+
+ /* connect to the signal and return early */
g_signal_connect (handler, "hashing-started",
G_CALLBACK (ft_handler_hashing_started_cb), manager);
+
+ return;
}
+ DEBUG ("Transfer done, no hashing");
+
do_real_transfer_done (manager, handler);
}