summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2011-09-21 18:32:41 +0100
committerSimon McVittie <smcv@debian.org>2011-09-21 18:32:41 +0100
commit179af6d37b9de89aa652bd19ff7424c9f08b55f0 (patch)
tree0aee07562f29700dc1973ba4fc1048aa547ab0af /tools
parent3ec6cdd0d254d59fa5325753d628de3e9802ea43 (diff)
downloaddbus-179af6d37b9de89aa652bd19ff7424c9f08b55f0.tar.gz
Imported Upstream version 1.5.8upstream/1.5.8
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.in9
-rw-r--r--tools/dbus-monitor.c8
2 files changed, 9 insertions, 8 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 5326a260..064306f6 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -260,6 +260,11 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
RC = @RC@
R_DYNAMIC_LDFLAG = @R_DYNAMIC_LDFLAG@
@@ -335,9 +340,13 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index e187ee4d..a4b54782 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -239,14 +239,6 @@ only_one_type (dbus_bool_t *seen_bus_type,
}
}
-static dbus_bool_t sigint_received = FALSE;
-
-static void
-sigint_handler (int signum)
-{
- sigint_received = TRUE;
-}
-
int
main (int argc, char *argv[])
{