From 82dbe4c49021a9b22e4d3895b609419e6003a351 Mon Sep 17 00:00:00 2001 From: Pekka Pessi Date: Tue, 1 Feb 2011 22:01:27 +0200 Subject: ring-conference-manager: avoid excessive logging by requestron --- src/ring-conference-manager.c | 12 ++++++------ 1 file 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); -- cgit v1.2.3