From: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Date: Tue, 12 Jul 2011 14:56:43 +0000 (+0100)
Subject: Fix dbus-monitor using eavesdrop=true when no filters are passed
X-Git-Tag: dbus-1.5.6~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f997b0ac485b3cf9c95b0f45c9a49662b15185f1;p=thirdparty%2Fdbus.git

Fix dbus-monitor using eavesdrop=true when no filters are passed

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index ba9f9cc19..e187ee4d0 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -388,22 +388,22 @@ main (int argc, char *argv[])
   else
     {
       dbus_bus_add_match (connection,
-		          "type='signal'",
+		          EAVESDROPPING_RULE ",type='signal'",
 		          &error);
       if (dbus_error_is_set (&error))
         goto lose;
       dbus_bus_add_match (connection,
-		          "type='method_call'",
+		          EAVESDROPPING_RULE ",type='method_call'",
 		          &error);
       if (dbus_error_is_set (&error))
         goto lose;
       dbus_bus_add_match (connection,
-		          "type='method_return'",
+		          EAVESDROPPING_RULE ",type='method_return'",
 		          &error);
       if (dbus_error_is_set (&error))
         goto lose;
       dbus_bus_add_match (connection,
-		          "type='error'",
+		          EAVESDROPPING_RULE ",type='error'",
 		          &error);
       if (dbus_error_is_set (&error))
         goto lose;