diff options
author | Ross Burton <ross@openedhand.com> | 2006-06-14 14:39:51 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2006-06-14 14:39:51 +0000 |
commit | db64de230bfa4894f901ae8c63d947a93dc59139 (patch) | |
tree | 8d5065b2c0780b4b9ca22d7fa45de6eee7b5e03f /tools/dbus-monitor.c | |
parent | c07a6249e21947f3831e1d8a98cedb17364e10c5 (diff) |
2006-06-14 Ross Burton <ross@openedhand.com>
* tools/Makefile.am:
* tools/dbus-monitor.c:
Don't use the GLib bindings in dbus-monitor (patch from Ralf
Habacker).
Diffstat (limited to 'tools/dbus-monitor.c')
-rw-r--r-- | tools/dbus-monitor.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index d768cad3..da413fd1 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -23,8 +23,6 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> -#include <dbus/dbus-glib-lowlevel.h> #include "dbus-print-message.h" static DBusHandlerResult @@ -59,7 +57,7 @@ main (int argc, char *argv[]) DBusConnection *connection; DBusError error; DBusBusType type = DBUS_BUS_SESSION; - GMainLoop *loop; + int i = 0, j = 0, numFilters = 0; char **filters = NULL; for (i = 1; i < argc; i++) @@ -85,8 +83,6 @@ main (int argc, char *argv[]) } } - loop = g_main_loop_new (NULL, FALSE); - dbus_error_init (&error); connection = dbus_bus_get (type, &error); if (connection == NULL) @@ -98,8 +94,6 @@ main (int argc, char *argv[]) exit (1); } - dbus_connection_setup_with_g_main (connection, NULL); - if (numFilters) { for (i = 0; i < j; i++) @@ -143,9 +137,8 @@ main (int argc, char *argv[]) fprintf (stderr, "Couldn't add filter!\n"); exit (1); } - - g_main_loop_run (loop); - + while (dbus_connection_read_write_dispatch(connection, -1)) + ; exit (0); lose: fprintf (stderr, "Error: %s\n", error.message); |