[telepathy-mission-control/telepathy-mission-control-5.2] McdDispatcher: when selecting a Handler for requested channels, use their real properties if possible

[Simon McVittie]

When we have the properties of the actual channel, we should use those,
rather than relying on the incomplete set of properties that were
requested.
---
 src/mcd-dispatcher.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index f40f191..2d9d83c 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -538,11 +538,13 @@ match_filters (McdChannel *channel, GList *filters)
     guint best_quality = 0;
 
     status = mcd_channel_get_status (channel);
-    channel_properties =
-        (status == MCD_CHANNEL_STATUS_REQUEST ||
-         status == MCD_CHANNEL_STATUS_REQUESTED) ?
-        _mcd_channel_get_requested_properties (channel) :
-        _mcd_channel_get_immutable_properties (channel);
+
+    channel_properties = _mcd_channel_get_immutable_properties (channel);
+
+    if (channel_properties == NULL)
+    {
+        channel_properties = _mcd_channel_get_requested_properties (channel);
+    }
 
     for (list = filters; list != NULL; list = list->next)
     {
-- 
1.5.6.5