+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
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
};
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);
}
test_service_dir_matches[1] = _dbus_string_get_const_data(&progs);
}
+#endif
dirs = NULL;
printf ("Testing retrieving the default session service directories\n");