[telepathy-mission-control/master] _mcd_dispatcher_enter_state_machine: don't short-cut to running clients if there are no filters
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Sep 9 04:18:43 PDT 2009
If there are no filters, mcd_dispatcher_context_proceed will run the
clients anyway, so we might as well reduce the number of code paths.
---
src/mcd-dispatcher.c | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 01290a6..cac064f 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1608,22 +1608,12 @@ _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher,
context);
}
- if (priv->filters != NULL)
- {
- DEBUG ("entering state machine for context %p", context);
+ DEBUG ("entering state machine for context %p", context);
- sp_timestamp ("invoke internal filters");
+ sp_timestamp ("invoke internal filters");
- mcd_dispatcher_context_ref (context, "CTXREF01");
- mcd_dispatcher_context_proceed (context);
- }
- else
- {
- DEBUG ("No filters found for context %p, "
- "starting the channel handler", context);
-
- mcd_dispatcher_run_clients (context);
- }
+ mcd_dispatcher_context_ref (context, "CTXREF01");
+ mcd_dispatcher_context_proceed (context);
mcd_dispatcher_context_unref (context, "CTXREF11");
}
--
1.5.6.5
More information about the telepathy-commits
mailing list