diff options
Diffstat (limited to 'bus/config-parser.c')
| -rw-r--r-- | bus/config-parser.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index f9432555..c636707f 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3271,11 +3271,12 @@ test_default_session_servicedirs (void) DBusList *dirs; DBusList *link; DBusString progs; - const char *common_progs; int i; #ifdef DBUS_WIN + const char *common_progs; char buffer[1024]; + if (_dbus_get_install_root(buffer, sizeof(buffer))) { strcat(buffer,DBUS_DATADIR); @@ -3289,8 +3290,9 @@ test_default_session_servicedirs (void) if (!_dbus_string_init (&progs)) _dbus_assert_not_reached ("OOM allocating progs"); - common_progs = _dbus_getenv ("CommonProgramFiles"); #ifndef DBUS_UNIX + common_progs = _dbus_getenv ("CommonProgramFiles"); + if (common_progs) { if (!_dbus_string_append (&progs, common_progs)) @@ -3411,7 +3413,9 @@ test_default_system_servicedirs (void) DBusList *dirs; DBusList *link; DBusString progs; +#ifndef DBUS_UNIX const char *common_progs; +#endif int i; /* On Unix we don't actually use this variable, but it's easier to handle the @@ -3419,8 +3423,9 @@ test_default_system_servicedirs (void) if (!_dbus_string_init (&progs)) _dbus_assert_not_reached ("OOM allocating progs"); - common_progs = _dbus_getenv ("CommonProgramFiles"); #ifndef DBUS_UNIX + common_progs = _dbus_getenv ("CommonProgramFiles"); + if (common_progs) { if (!_dbus_string_append (&progs, common_progs)) |