diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2010-06-17 15:14:22 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2010-06-17 15:14:22 +0100 |
| commit | a44d08711c64e7ae807d2b4f181cefa848e2aa32 (patch) | |
| tree | 6b1150ff5d6026798d71c761d20d3636857742d0 /dbus/dbus-sysdeps.c | |
| parent | d9f9c2518dbf7c728588442b68916ec6c8b1f91f (diff) | |
| download | dbus-a44d08711c64e7ae807d2b4f181cefa848e2aa32.tar.gz | |
Revert "Bug 28460 - Refactored dbus configuration access."
This reverts commit 6f9077ee870ad02119facf83d1293301b4535c3b, which
broke the build on Unix (see previous patch) and introduced a bunch of
warnings.
Diffstat (limited to 'dbus/dbus-sysdeps.c')
| -rw-r--r-- | dbus/dbus-sysdeps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index ea3a9566..bab516de 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -23,7 +23,6 @@ */ #include <config.h> -#include "dbus-config.h" #include "dbus-internals.h" #include "dbus-sysdeps.h" #include "dbus-threads.h" @@ -84,7 +83,7 @@ _dbus_abort (void) _dbus_print_backtrace (); - s = _dbus_config_block_on_abort (); + s = _dbus_getenv ("DBUS_BLOCK_ON_ABORT"); if (s && *s) { /* don't use _dbus_warn here since it can _dbus_abort() */ |