summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw@src.gnome.org>2016-02-26 14:44:38 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.com>2016-02-26 16:21:44 (GMT)
commit65acc02e481a482b5fe0aff292668b75b29d26df (patch)
treeb819bf6fa937268c64d7ae65a42b82dfe77e3eeb
parent7d6b1d598be05d6b63ca7e8b05fe5bb08d4c8362 (diff)
downloadtelepathy-farstream-65acc02e481a482b5fe0aff292668b75b29d26df.tar.gz
telepathy-farstream-65acc02e481a482b5fe0aff292668b75b29d26df.tar.xz
stream: Don't implicitly convert FsStreamDirection to TpMediaStreamDirection
https://bugs.freedesktop.org/show_bug.cgi?id=94311
-rw-r--r--telepathy-farstream/stream.c5
1 files 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))
{