Merge branch 'dbus-1.10'

diff --cc bus/config-parser.c
index b818cd81645ef0324ab2de01cb9793bef948ba61,d9f6042c6be7bad048b327c677b9e2aaa149bfa7..adba69e9ab70e3e7ef6ded4ef4594d98b56901b3
--- 1/bus/config-parser.c
--- 2/bus/config-parser.c
+++ b/bus/config-parser.c
@@@ -3405,30 -3401,36 +3405,30 @@@ test_default_session_servicedirs (void
    DBusList *dirs;
    DBusList *link;
    DBusString progs;
+   DBusString install_root_based;
    int i;
    dbus_bool_t ret = FALSE;
- 
  #ifdef DBUS_WIN
 -  const char *tmp;
    const char *common_progs;
-   DBusString install_root_based;
+ #endif
+ 
+   /* On Unix we don't actually use these, but it's easier to handle the
+    * deallocation if we always allocate them, whether needed or not */
+   if (!_dbus_string_init (&progs) ||
+       !_dbus_string_init (&install_root_based))
+     _dbus_assert_not_reached ("OOM allocating strings");
  
-   if (!_dbus_string_init (&install_root_based) ||
-       !_dbus_string_append (&install_root_based, DBUS_DATADIR) ||
+ #ifdef DBUS_WIN
+   if (!_dbus_string_append (&install_root_based, DBUS_DATADIR) ||
 -      !_dbus_string_append (&install_root_based, "/dbus-1/services"))
++      !_dbus_string_append (&install_root_based, "/dbus-1/services") ||
 +      !_dbus_replace_install_prefix (&install_root_based))
-     _dbus_assert_not_reached ("OOM getting relocated DBUS_DATADIR");
+     goto out;
  
 -  tmp = _dbus_replace_install_prefix (
 -      _dbus_string_get_const_data (&install_root_based));
 -
 -  if (tmp == NULL ||
 -      !_dbus_string_set_length (&install_root_based, 0) ||
 -      !_dbus_string_append (&install_root_based, tmp))
 -    goto out;
 +  _dbus_assert (_dbus_path_is_absolute (&install_root_based));
  
-   test_session_service_dir_matches[0] = _dbus_string_get_const_data (&install_root_based);
+   test_session_service_dir_matches[0] = _dbus_string_get_const_data (
+       &install_root_based);
  
- #endif
- 
-   /* 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");
- 
- #ifndef DBUS_UNIX
    common_progs = _dbus_getenv ("CommonProgramFiles");
  
    if (common_progs) 

diff --cc dbus/dbus-sysdeps-util-win.c
Simple merge

diff --cc dbus/dbus-sysdeps-win.c
Simple merge