dbus-monitor: Disable automatic message filtering

diff --git a/test/monitor.c b/test/monitor.c
index eb11eb81d87f7d2a8a9a7fdf5746c0ce8941e5f9..d8005c87a50544c1f4814fbdd0b3306b74954f9a 100644 (file)
--- a/test/monitor.c
+++ b/test/monitor.c
@@ -28,6 +28,8 @@
 
 #include <string.h>
 
+#include "dbus/dbus-connection-internal.h"
+
 #include "test-utils-glib.h"
 
 typedef struct {
@@ -505,7 +507,7 @@ become_monitor (Fixture *f,
   int i;
   dbus_uint32_t zero = 0;
 
-  dbus_connection_set_route_peer_messages (f->monitor, TRUE);
+  _dbus_connection_set_builtin_filters_enabled (f->monitor, FALSE);
 
   if (config == NULL)
     config = f->config;

diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index fcc923eeaf60b43920d4682c62cf9675716f93b7..bd1114885436ac895e2e08860b66f5f87ff10fb0 100644 (file)
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -21,6 +21,7 @@
 
 #include <config.h>
 
+#include "dbus/dbus-connection-internal.h"
 #include "dbus/dbus-internals.h"
 
 #include <stdio.h>
@@ -494,7 +495,7 @@ main (int argc, char *argv[])
   /* Receive o.fd.Peer messages as normal messages, rather than having
    * libdbus handle them internally, which is the wrong thing for
    * a monitor */
-  dbus_connection_set_route_peer_messages (connection, TRUE);
+  _dbus_connection_set_builtin_filters_enabled (connection, FALSE);
 
   if (!dbus_connection_add_filter (connection, filter_func,
                                    _DBUS_INT_TO_POINTER (binary_mode), NULL))