diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-24 18:40:31 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-24 18:40:31 +0000 |
| commit | 31a1b24c933c16f026e9e842f80273b484b44e36 (patch) | |
| tree | c8f12678adfc4c6d6deb539e9c34bcd221377b8f /bus | |
| parent | d9e1959dcfd643bb7b096eba07e326c1093a2ba3 (diff) | |
| parent | 7848abe6c2b90b66fbf1fd7e582324b28766b8de (diff) | |
Merge branch 'dbus-1.4'
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/config-parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index dd941e35..9808d732 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3253,10 +3253,10 @@ process_test_equiv_subdir (const DBusString *test_base_dir, static const char *test_session_service_dir_matches[] = { #ifdef DBUS_UNIX + "/testhome/foo/.testlocal/testshare/dbus-1/services", "/testusr/testlocal/testshare/dbus-1/services", "/testusr/testshare/dbus-1/services", DBUS_DATADIR"/dbus-1/services", - "/testhome/foo/.testlocal/testshare/dbus-1/services", #endif /* will be filled in test_default_session_servicedirs() */ #ifdef DBUS_WIN |