diff options
| author | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2010-04-01 19:48:55 +0300 |
|---|---|---|
| committer | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2010-04-01 19:48:55 +0300 |
| commit | c1b3f2a471b44bec8d0a102536364ef003de3423 (patch) | |
| tree | 3a549c3e7ac92ad08f3687928f72b1907d1140c5 | |
| parent | a3f6a5a5357469c4efe9ed4cfaff62e70ab50278 (diff) | |
| parent | d88ee28524ae9bf3b751d6005584fda92a391e30 (diff) | |
Merge branch 'tighten-hold'
| -rw-r--r-- | src/sip-media-session.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sip-media-session.c b/src/sip-media-session.c index 7f3893f..73b7482 100644 --- a/src/sip-media-session.c +++ b/src/sip-media-session.c @@ -1342,8 +1342,9 @@ priv_finalize_hold (TpsipMediaSession *self) direction &= hold_mask; direction |= unhold_mask; tpsip_media_stream_set_direction (stream, - direction, - TP_MEDIA_STREAM_PENDING_REMOTE_SEND); + direction, + TP_MEDIA_STREAM_PENDING_REMOTE_SEND + | TP_MEDIA_STREAM_PENDING_LOCAL_SEND); } } } |