diff options
author | Havoc Pennington <hp@redhat.com> | 2003-08-31 03:25:24 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-08-31 03:25:24 +0000 |
commit | 1dd3f1788f1b4c9af2f4fa744abdb7892d0a14b9 (patch) | |
tree | 9f928baa3e6205394044ce5f0c6f1aa3933bdf4f /tools/dbus-monitor.c | |
parent | 5fd1e389e1c1c12ad4a55c2af6abdc8e7a2f6d41 (diff) |
2003-08-30 Havoc Pennington <hp@pobox.com>
* dbus/dbus-connection.c: purge DBusMessageHandler
* dbus/dbus-message-handler.c: remove DBusMessageHandler, just
use callbacks everywhere
Diffstat (limited to 'tools/dbus-monitor.c')
-rw-r--r-- | tools/dbus-monitor.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index c7293abb..23ee346a 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -30,10 +30,9 @@ #include "dbus-print-message.h" static DBusHandlerResult -handler_func (DBusMessageHandler *handler, - DBusConnection *connection, - DBusMessage *message, - void *user_data) +filter_func (DBusConnection *connection, + DBusMessage *message, + void *user_data) { print_message (message); @@ -58,7 +57,6 @@ main (int argc, char *argv[]) DBusConnection *connection; DBusError error; DBusBusType type = DBUS_BUS_SESSION; - DBusMessageHandler *handler; GMainLoop *loop; int i; @@ -96,8 +94,7 @@ main (int argc, char *argv[]) dbus_connection_setup_with_g_main (connection, NULL); - handler = dbus_message_handler_new (handler_func, NULL, NULL); - dbus_connection_add_filter (connection, handler); + dbus_connection_add_filter (connection, filter_func, NULL, NULL); g_main_loop_run (loop); |