empathy r1756 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:15:01 2008
New Revision: 1756
URL: http://svn.gnome.org/viewvc/empathy?rev=1756&view=rev

Log:
Actually use accept and receive file functions. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy/empathy-file.c

Modified: trunk/libempathy/empathy-file.c
==============================================================================
--- trunk/libempathy/empathy-file.c	(original)
+++ trunk/libempathy/empathy-file.c	Fri Nov 21 16:15:01 2008
@@ -728,13 +728,21 @@
   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;