diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2011-12-29 18:33:22 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-01-10 09:52:47 +0100 |
| commit | dbe9e55f752f76372190414232c3066b4411cfe7 (patch) | |
| tree | d630408ddc3b80f6907200757834c9f21b29cb31 /telepathy-glib/base-media-call-stream.c | |
| parent | d8ff77603e0e4fe8d9fdff32bcbfce387a4d39ed (diff) | |
| download | telepathy-glib-dbe9e55f752f76372190414232c3066b4411cfe7.tar.gz | |
Call.Stream.I.Media: Make setting the receiving state internal
Diffstat (limited to 'telepathy-glib/base-media-call-stream.c')
| -rw-r--r-- | telepathy-glib/base-media-call-stream.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/telepathy-glib/base-media-call-stream.c b/telepathy-glib/base-media-call-stream.c index 90069b470..6d8347077 100644 --- a/telepathy-glib/base-media-call-stream.c +++ b/telepathy-glib/base-media-call-stream.c @@ -730,7 +730,7 @@ tp_base_media_call_stream_set_sending_state (TpBaseMediaCallStream *self, * * Since: 0.UNRELEASED */ -void +static void tp_base_media_call_stream_set_receiving_state (TpBaseMediaCallStream *self, TpStreamFlowState state) { @@ -823,16 +823,7 @@ tp_base_media_call_stream_get_receiving_state (TpBaseMediaCallStream *self) } void -_tp_base_media_call_stream_start_receiving (TpBaseMediaCallStream *self, - guint contact) -{ - tp_base_media_call_stream_set_receiving_state (self, - TP_STREAM_FLOW_STATE_PENDING_START); -} - -static void -remote_members_changed_cb (TpBaseMediaCallStream *self, GParamSpec *pspec, - gpointer user_data) +tp_base_media_call_stream_update_receiving_state (TpBaseMediaCallStream *self) { TpBaseCallStream *bcs = TP_BASE_CALL_STREAM (self); GHashTable *remote_members = _tp_base_call_stream_borrow_remote_members (bcs); @@ -881,6 +872,13 @@ remote_members_changed_cb (TpBaseMediaCallStream *self, GParamSpec *pspec, } } +static void +remote_members_changed_cb (TpBaseMediaCallStream *self, GParamSpec *pspec, + gpointer user_data) +{ + tp_base_media_call_stream_update_receiving_state (self); +} + static gboolean tp_base_media_call_stream_request_receiving (TpBaseCallStream *bcs, TpHandle contact, gboolean receive, GError **error) @@ -912,7 +910,7 @@ tp_base_media_call_stream_request_receiving (TpBaseCallStream *bcs, G_MAXUINT) g_array_append_val (self->priv->receiving_requests, contact); - _tp_base_media_call_stream_start_receiving (self, contact); + tp_base_media_call_stream_update_receiving_state (self); } else { |