From 1451f946c153fffe85c2a0a9d52446ff21b42fe8 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Wed, 26 Jun 2013 10:21:31 +0800 Subject: dbus-monitor: remove redundant match rules Currently, DBus Specification only consists of four message types, so to monitor all the types of message, no need to match all of them but just left it empty is OK. Signed-off-by: Chengwei Yang Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66107 Reviewed-by: Simon McVittie --- tools/dbus-monitor.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index cf17f642..1aa885f7 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -383,22 +383,7 @@ main (int argc, char *argv[]) else { dbus_bus_add_match (connection, - EAVESDROPPING_RULE ",type='signal'", - &error); - if (dbus_error_is_set (&error)) - goto lose; - dbus_bus_add_match (connection, - EAVESDROPPING_RULE ",type='method_call'", - &error); - if (dbus_error_is_set (&error)) - goto lose; - dbus_bus_add_match (connection, - EAVESDROPPING_RULE ",type='method_return'", - &error); - if (dbus_error_is_set (&error)) - goto lose; - dbus_bus_add_match (connection, - EAVESDROPPING_RULE ",type='error'", + EAVESDROPPING_RULE, &error); if (dbus_error_is_set (&error)) goto lose; -- cgit v1.2.3