telepathy-farstream: stream: Don' t implicitly convert FsStreamDirection to TpMediaStreamDirection

[Olivier Crête]

Module: telepathy-farstream
Branch: master
Commit: 65acc02e481a482b5fe0aff292668b75b29d26df
URL:    http://cgit.freedesktop.org/telepathy/telepathy-farstream/commit/?id=65acc02e481a482b5fe0aff292668b75b29d26df

Author: Ting-Wei Lan <lantw at src.gnome.org>
Date:   Fri Feb 26 22:44:38 2016 +0800

stream: Don't implicitly convert FsStreamDirection to TpMediaStreamDirection

https://bugs.freedesktop.org/show_bug.cgi?id=94311

---

 telepathy-farstream/stream.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/telepathy-farstream/stream.c b/telepathy-farstream/stream.c
index 1ee9237..6183c67 100644
--- a/telepathy-farstream/stream.c
+++ b/telepathy-farstream/stream.c
@@ -1855,7 +1855,7 @@ set_stream_sending (TpMediaStreamHandler *proxy G_GNUC_UNUSED,
           "direction", current_direction & ~(FS_DIRECTION_SEND),
           NULL);
 
-      tf_stream_free_resource (self, FS_DIRECTION_SEND);
+      tf_stream_free_resource (self, TP_MEDIA_STREAM_DIRECTION_SEND);
 
       self->priv->desired_direction &= ~(FS_DIRECTION_SEND);
     }
@@ -1952,7 +1952,8 @@ set_stream_held (TpMediaStreamHandler *proxy G_GNUC_UNUSED,
     }
   else
     {
-      FsStreamDirection desired_direction = self->priv->desired_direction;
+      TpMediaStreamDirection desired_direction =
+          (TpMediaStreamDirection) self->priv->desired_direction;
 
       if (tf_stream_request_resource (self, desired_direction))
         {