fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-24 04:10:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

* bus/config-parser.c (test_service_dir_matches): fixed ordering for unix.

Browse source 
* bus/config-parser.c (test_default_session_servicedirs): made allocation  of _progs platform independent.
This commit is contained in:
Ralf Habacker 2007-05-24 08:07:28 +00:00
parent ae68ad2ab9
commit 5bd59d4a6c
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-05-24 Simon McVittie <simon.mcvittie@collabora.co.uk>
* bus/config-parser.c (test_service_dir_matches): fixed ordering for unix.
* bus/config-parser.c (test_default_session_servicedirs): made allocation
of _progs platform independent.
2007-05-23 Havoc Pennington <hp@redhat.com>
* bus/Makefile.am (install-data-hook): create session.d

18
bus/config-parser.c
View file

@ -3077,12 +3077,14 @@ process_test_equiv_subdir (const DBusString *test_base_dir,
static const char *test_service_dir_matches[] =
{
DBUS_DATADIR"/dbus-1/services",
#ifdef DBUS_UNIX
"/testusr/testlocal/testshare/dbus-1/services",
"/testusr/testshare/dbus-1/services",
"/testhome/foo/.testlocal/testshare/dbus-1/services",
#endif
#endif
DBUS_DATADIR"/dbus-1/services",
#ifdef DBUS_UNIX
"/testhome/foo/.testlocal/testshare/dbus-1/services",
#endif
NULL
};
@ -3095,12 +3097,15 @@ test_default_session_servicedirs (void)
const char *common_progs;
int i;
/* On Unix we don't actually use this variable, but it's easier to handle the
* deallocation if we always allocate it, whether needed or not */
if (!_dbus_string_init (&progs))
_dbus_assert_not_reached ("OOM allocating progs");
common_progs = _dbus_getenv ("CommonProgramFiles");
#ifndef DBUS_UNIX
if (common_progs)
{
if (!_dbus_string_init (&progs))
return FALSE;
if (!_dbus_string_append (&progs, common_progs))
{
_dbus_string_free (&progs);
@ -3114,6 +3119,7 @@ test_default_session_servicedirs (void)
}
test_service_dir_matches[1] = _dbus_string_get_const_data(&progs);
}
#endif
dirs = NULL;
printf ("Testing retrieving the default session service directories\n");