diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-20 10:51:16 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-20 10:51:16 +0100 |
| commit | b40042c598476bc14f578b1d121c14eb9da59c3e (patch) | |
| tree | 94fb05b3fa40a82fc0f05748c02b6977ce5dde4c /src/media-channel.c | |
| parent | 2aff6d0ac4102835c5e125850eef6062011d910d (diff) | |
| parent | 7a0e8d7f6edf24c96857a72af39940b555a1cf8c (diff) | |
| download | telepathy-gabble-b40042c598476bc14f578b1d121c14eb9da59c3e.tar.gz | |
Merge remote-tracking branch 'tester/call1-addcontent-direction' into call1call1
Conflicts:
tests/twisted/jingle/call-dtmf.py
Diffstat (limited to 'src/media-channel.c')
| -rw-r--r-- | src/media-channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/media-channel.c b/src/media-channel.c index d57ed4012..3e2b77f74 100644 --- a/src/media-channel.c +++ b/src/media-channel.c @@ -1760,7 +1760,7 @@ _gabble_media_channel_request_contents (GabbleMediaChannel *chan, c = gabble_jingle_session_add_content (priv->session, media_type == TP_MEDIA_STREAM_TYPE_AUDIO ? JINGLE_MEDIA_TYPE_AUDIO : JINGLE_MEDIA_TYPE_VIDEO, - NULL, content_ns, transport_ns); + JINGLE_CONTENT_SENDERS_BOTH, NULL, content_ns, transport_ns); /* The stream is created in "new-content" callback, and appended to * priv->streams. This is now guaranteed to happen asynchronously (adding |