diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-01 22:01:27 +0200 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-01 22:01:27 +0200 |
| commit | 82dbe4c49021a9b22e4d3895b609419e6003a351 (patch) | |
| tree | 5d87acccb46266a5b711e37e352d2bbf8a87f9a6 | |
| parent | 12f13047d596201c53d87be8e812fa554645744b (diff) | |
ring-conference-manager: avoid excessive logging by requestron
| -rw-r--r-- | src/ring-conference-manager.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ring-conference-manager.c b/src/ring-conference-manager.c index 1db3a86..f57f99f 100644 --- a/src/ring-conference-manager.c +++ b/src/ring-conference-manager.c @@ -373,10 +373,10 @@ conference_manager_create_channel (TpChannelManager *_self, { RingConferenceManager *self = RING_CONFERENCE_MANAGER (_self); - if (!ring_properties_satisfy (properties, + if (tp_asv_get_initial_members (properties) == NULL || + !ring_properties_satisfy (properties, conference_channel_fixed_properties (), - conference_channel_allowed_properties) || - tp_asv_get_initial_members (properties) == NULL) + conference_channel_allowed_properties)) return FALSE; return conference_requestotron (self, request, properties); @@ -389,10 +389,10 @@ conference_manager_ensure_channel (TpChannelManager *_self, { RingConferenceManager *self = RING_CONFERENCE_MANAGER (_self); - if (!ring_properties_satisfy (properties, + if (tp_asv_get_initial_members (properties) == NULL || + !ring_properties_satisfy (properties, conference_channel_fixed_properties (), - conference_channel_allowed_properties) || - tp_asv_get_initial_members (properties) == NULL) + conference_channel_allowed_properties)) return FALSE; return conference_requestotron (self, request, properties); |