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).
+
+2006-06-14 Ross Burton <ross@openedhand.com>
+
* tools/dbus-print-message.c:
Also print the object path when outputting signals or method calls.
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION
if HAVE_GLIB
-GLIB_TOOLS=dbus-monitor
nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
libdbus_glibdir = $(includedir)/dbus-1.0/dbus
BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
-else
-GLIB_TOOLS=
endif
if HAVE_GTK
DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
endif
-bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
+bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
dbus_send_SOURCES= \
dbus-print-message.c \
dbus-viewer.c
dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
-dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
+dbus_monitor_LDADD= $(top_builddir)/dbus/libdbus-1.la
dbus_launch_LDADD= $(DBUS_X_LIBS)
dbus_viewer_LDADD= $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_LIBS)
#include <stdlib.h>
#include <string.h>
-#include <glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
#include "dbus-print-message.h"
static DBusHandlerResult
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++)
}
}
- loop = g_main_loop_new (NULL, FALSE);
-
dbus_error_init (&error);
connection = dbus_bus_get (type, &error);
if (connection == NULL)
exit (1);
}
- dbus_connection_setup_with_g_main (connection, NULL);
-
if (numFilters)
{
for (i = 0; i < j; i++)
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);