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-internals.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-internals.c')
| -rw-r--r-- | dbus/dbus-internals.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index 5edc92c4..1ab6731a 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -22,7 +22,6 @@ */ #include <config.h> -#include "dbus-config.h" #include "dbus-internals.h" #include "dbus-protocol.h" #include "dbus-marshal-basic.h" @@ -208,7 +207,7 @@ init_warnings(void) if (!warn_initted) { const char *s; - s = _dbus_config_fatal_warnings (); + s = _dbus_getenv ("DBUS_FATAL_WARNINGS"); if (s && *s) { if (*s == '0') @@ -314,7 +313,7 @@ _dbus_verbose_init (void) { if (!verbose_initted) { - const char *p = _dbus_config_verbose (); + const char *p = _dbus_getenv ("DBUS_VERBOSE"); verbose = p != NULL && *p == '1'; verbose_initted = TRUE; #ifdef DBUS_USE_OUTPUT_DEBUG_STRING @@ -1004,7 +1003,7 @@ _dbus_test_oom_handling (const char *description, _dbus_verbose ("\n=================\n%s: about %d mallocs total\n=================\n", description, approx_mallocs); - setting = _dbus_config_test_malloc_failures (); + setting = _dbus_getenv ("DBUS_TEST_MALLOC_FAILURES"); if (setting != NULL) { DBusString str; |