diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2011-12-29 17:20:52 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-01-10 09:52:46 +0100 |
| commit | de1dc1dce8cde4e81986f537317c8da05d3fccee (patch) | |
| tree | 00de17872720f87abb56e379f412b004136e8947 /telepathy-glib/base-media-call-content.c | |
| parent | a5e24b25e63510ee2f5992237841b222e6b98b06 (diff) | |
| download | telepathy-glib-de1dc1dce8cde4e81986f537317c8da05d3fccee.tar.gz | |
Ignore re-settings that change nothing
Diffstat (limited to 'telepathy-glib/base-media-call-content.c')
| -rw-r--r-- | telepathy-glib/base-media-call-content.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c index 27d6306b3..49117fc40 100644 --- a/telepathy-glib/base-media-call-content.c +++ b/telepathy-glib/base-media-call-content.c @@ -710,9 +710,7 @@ _tp_base_media_call_content_ready_to_accept (TpBaseMediaCallContent *self) if (!tp_base_channel_is_requested ( TP_BASE_CHANNEL (_tp_base_call_content_get_channel (bcc))) && tp_base_call_stream_get_local_sending_state ( - TP_BASE_CALL_STREAM (stream)) == TP_SENDING_STATE_PENDING_SEND && - tp_base_media_call_stream_get_sending_state (stream) != - TP_STREAM_FLOW_STATE_STARTED) + TP_BASE_CALL_STREAM (stream)) == TP_SENDING_STATE_PENDING_SEND) { tp_base_media_call_stream_set_sending_state (stream, TP_STREAM_FLOW_STATE_PENDING_START); @@ -762,9 +760,7 @@ _tp_base_media_call_content_remote_accepted (TpBaseMediaCallContent *self) TpSendingState local = tp_base_call_stream_get_local_sending_state ( TP_BASE_CALL_STREAM (stream)); - if (local == TP_SENDING_STATE_SENDING && - (tp_base_media_call_stream_get_sending_state (stream) != - TP_STREAM_FLOW_STATE_STARTED)) + if (local == TP_SENDING_STATE_SENDING) tp_base_media_call_stream_set_sending_state (stream, TP_STREAM_FLOW_STATE_PENDING_START); } |