summaryrefslogtreecommitdiff
path: root/telepathy-farstream
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2011-12-08 19:08:48 -0500
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2011-12-08 19:08:48 -0500
commit1521a274b53bb7015421c312caaad335923cabe8 (patch)
tree9b976c6f32663af89954525e9db60cf105b6dea5 /telepathy-farstream
parent5dfab41ba7ae0ff0298fe28bbecb55e31c469f1b (diff)
downloadtelepathy-farstream-1521a274b53bb7015421c312caaad335923cabe8.tar.gz
Fix previous patch to compile with current code generator
Diffstat (limited to 'telepathy-farstream')
-rw-r--r--telepathy-farstream/call-stream.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index 7706f11..f7257d6 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -424,7 +424,6 @@ tf_call_stream_add_remote_candidates (TfCallStream *self,
{
GList *fscandidates = NULL;
guint i;
- GError *error = NULL;
/* No candidates to add, ignore. This could either be caused by the CM
* accidentally emitting an empty RemoteCandidatesAdded or when there are no
@@ -480,15 +479,15 @@ tf_call_stream_add_remote_candidates (TfCallStream *self,
switch (self->transport_type)
{
- case TP_STREAM_TRANSPORT_TYPE_RAW_UDP:
- case TP_STREAM_TRANSPORT_TYPE_SHM:
- case TP_STREAM_TRANSPORT_TYPE_MULTICAST:
+ case TF_FUTURE_STREAM_TRANSPORT_TYPE_RAW_UDP:
+ case TF_FUTURE_STREAM_TRANSPORT_TYPE_SHM:
+ case TF_FUTURE_STREAM_TRANSPORT_TYPE_MULTICAST:
ret = fs_stream_force_remote_candidates (self->fsstream,
fscandidates, &error);
break;
- case TP_STREAM_TRANSPORT_TYPE_ICE:
- case TP_STREAM_TRANSPORT_TYPE_GTALK_P2P:
- case TP_STREAM_TRANSPORT_TYPE_WLM_2009:
+ case TF_FUTURE_STREAM_TRANSPORT_TYPE_ICE:
+ case TF_FUTURE_STREAM_TRANSPORT_TYPE_GTALK_P2P:
+ case TF_FUTURE_STREAM_TRANSPORT_TYPE_WLM_2009:
ret = fs_stream_add_remote_candidates (self->fsstream, fscandidates,
&error);
break;