[Telepathy-commits] [telepathy-salut/master] change from local-pending to accepted and from not-offererd to to remote pending should have reason requested

[Guillaume Desmottes]

---
 src/salut-file-transfer-channel.c        |    7 ++++---
 tests/twisted/avahi/test-receive-file.py |    4 ++--
 tests/twisted/avahi/test-send-file.py    |    4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/salut-file-transfer-channel.c b/src/salut-file-transfer-channel.c
index 7a5b6a4..b7e3d8a 100644
--- a/src/salut-file-transfer-channel.c
+++ b/src/salut-file-transfer-channel.c
@@ -1106,8 +1106,9 @@ salut_file_transfer_channel_accept_file (SalutSvcChannelTypeFileTransfer *iface,
 
   DEBUG ("local socket %s", self->priv->socket_path);
 
-  salut_file_transfer_channel_set_state (iface, SALUT_FILE_TRANSFER_STATE_ACCEPTED,
-        SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
+  salut_file_transfer_channel_set_state (iface,
+      SALUT_FILE_TRANSFER_STATE_ACCEPTED,
+      SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED);
 
   g_value_init (&out_address, G_TYPE_STRING);
   g_value_set_string (&out_address, self->priv->socket_path);
@@ -1200,7 +1201,7 @@ salut_file_transfer_channel_offer_file (SalutSvcChannelTypeFileTransfer *iface,
 
   salut_file_transfer_channel_set_state (iface,
       SALUT_FILE_TRANSFER_STATE_REMOTE_PENDING,
-      SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
+      SALUT_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED);
 
   salut_svc_channel_type_file_transfer_return_from_offer_file (context,
       &out_address);
diff --git a/tests/twisted/avahi/test-receive-file.py b/tests/twisted/avahi/test-receive-file.py
index ba8f648..f2e75c5 100644
--- a/tests/twisted/avahi/test-receive-file.py
+++ b/tests/twisted/avahi/test-receive-file.py
@@ -35,6 +35,7 @@ FT_STATE_COMPLETED = 6
 FT_STATE_CANCELLED = 7
 
 FT_STATE_CHANGE_REASON_NONE = 0
+FT_STATE_CHANGE_REASON_REQUESTED = 1
 
 FILE_HASH_TYPE_NONE = 0
 FILE_HASH_TYPE_MD5 = 1
@@ -159,8 +160,7 @@ def test(q, bus, conn):
     e = q.expect('dbus-signal', signal='FileTransferStateChanged')
     state, reason = e.args
     assert state == FT_STATE_ACCEPTED
-    # FIXME: shouldn't it be requested?
-    assert reason == FT_STATE_CHANGE_REASON_NONE
+    assert reason == FT_STATE_CHANGE_REASON_REQUESTED
 
     e = q.expect('dbus-signal', signal='FileTransferStateChanged')
     state, reason = e.args
diff --git a/tests/twisted/avahi/test-send-file.py b/tests/twisted/avahi/test-send-file.py
index dce8f42..2a0d68b 100644
--- a/tests/twisted/avahi/test-send-file.py
+++ b/tests/twisted/avahi/test-send-file.py
@@ -33,6 +33,7 @@ FT_STATE_COMPLETED = 6
 FT_STATE_CANCELLED = 7
 
 FT_STATE_CHANGE_REASON_NONE = 0
+FT_STATE_CHANGE_REASON_REQUESTED = 1
 
 FILE_HASH_TYPE_MD5 = 1
 
@@ -154,8 +155,7 @@ def test(q, bus, conn):
 
     state, reason = state_event.args
     assert state == FT_STATE_REMOTE_PENDING
-    # FIXME: shouldn't it REQUESTED ?
-    assert reason == FT_STATE_CHANGE_REASON_NONE
+    assert reason == FT_STATE_CHANGE_REASON_REQUESTED
 
     assert iq_event.iq_type == 'set'
     assert iq_event.connection == incoming
-- 
1.5.6.5