aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-11-22 00:15:01 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:15:01 +0800
commit924b52e5d45d8dcaa1c22c27bdb53acd7156c012 (patch)
treefb0948272dd90ae6e7dadd688f9ccf1ebb40d1a6
parent02fd95152f9b9cbd647a3b0e439585502f4b8892 (diff)
downloadgsoc2013-empathy-924b52e5d45d8dcaa1c22c27bdb53acd7156c012.tar
gsoc2013-empathy-924b52e5d45d8dcaa1c22c27bdb53acd7156c012.tar.gz
gsoc2013-empathy-924b52e5d45d8dcaa1c22c27bdb53acd7156c012.tar.bz2
gsoc2013-empathy-924b52e5d45d8dcaa1c22c27bdb53acd7156c012.tar.lz
gsoc2013-empathy-924b52e5d45d8dcaa1c22c27bdb53acd7156c012.tar.xz
gsoc2013-empathy-924b52e5d45d8dcaa1c22c27bdb53acd7156c012.tar.zst
gsoc2013-empathy-924b52e5d45d8dcaa1c22c27bdb53acd7156c012.zip
Actually use accept and receive file functions. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=1756
-rw-r--r--libempathy/empathy-file.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/libempathy/empathy-file.c b/libempathy/empathy-file.c
index bec3a9b6c..e2e13951f 100644
--- a/libempathy/empathy-file.c
+++ b/libempathy/empathy-file.c
@@ -728,13 +728,21 @@ file_state_changed_cb (DBusGProxy *file_iface,
if (state == EMP_FILE_TRANSFER_STATE_OPEN)
priv->start_time = get_time_msec ();
- DEBUG ("state = %u, direction = %u, in_stream = %s",
- state, priv->direction, priv->in_stream ? "present" : "not present");
+ DEBUG ("state = %u, direction = %u, in_stream = %s, out_stream = %s",
+ state, priv->direction,
+ priv->in_stream ? "present" : "not present",
+ priv->out_stream ? "present" : "not present");
if (state == EMP_FILE_TRANSFER_STATE_OPEN &&
priv->direction == EMP_FILE_TRANSFER_DIRECTION_OUTGOING &&
priv->in_stream)
send_file (file);
+ else if (state == EMP_FILE_TRANSFER_STATE_OPEN &&
+ priv->direction == EMP_FILE_TRANSFER_DIRECTION_INCOMING &&
+ priv->out_stream)
+ {
+ receive_file (file);
+ }
priv->state = state;
priv->state_change_reason = reason;