From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 21 Oct 2009 18:52:59 +0000 (+0300)
Subject: Don't use DBUS_DIR_SEPARATOR
X-Git-Tag: dbus-1.3.1~159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99371721af2ddead242d6ba0101019794b270a8d;p=thirdparty%2Fdbus.git

Don't use DBUS_DIR_SEPARATOR

I didn't cherry-pick the commit from dbus4win that introduced
DBUS_DIR_SEPARATOR, as I think it just uglifies the code with little
gain. (Forward) slashes work fine on Windows.
---

diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
index 8385340fe..14afc2ef7 100644
--- a/dbus/dbus-nonce.c
+++ b/dbus/dbus-nonce.c
@@ -274,7 +274,7 @@ do_noncefile_create (DBusNonceFile *noncefile,
       }
     if (use_subdir)
       {
-        if (!_dbus_string_append (&noncefile->dir, DBUS_DIR_SEPARATOR "dbus_nonce-")
+        if (!_dbus_string_append (&noncefile->dir, "/dbus_nonce-")
             || !_dbus_string_append (&noncefile->dir, _dbus_string_get_const_data (&randomStr)) )
           {
             dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
@@ -282,7 +282,7 @@ do_noncefile_create (DBusNonceFile *noncefile,
           }
         if (!_dbus_string_init (&noncefile->path)
             || !_dbus_string_copy (&noncefile->dir, 0, &noncefile->path, 0)
-            || !_dbus_string_append (&noncefile->dir, DBUS_DIR_SEPARATOR "nonce"))
+            || !_dbus_string_append (&noncefile->dir, "/nonce"))
           {
             dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
             goto on_error;
@@ -297,7 +297,7 @@ do_noncefile_create (DBusNonceFile *noncefile,
       {
         if (!_dbus_string_init (&noncefile->path)
             || !_dbus_string_copy (&noncefile->dir, 0, &noncefile->path, 0)
-            || !_dbus_string_append (&noncefile->path, DBUS_DIR_SEPARATOR "dbus_nonce-")
+            || !_dbus_string_append (&noncefile->path, "/dbus_nonce-")
             || !_dbus_string_append (&noncefile->path, _dbus_string_get_const_data (&randomStr)))
           {
             dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);