From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 11 Jun 2010 08:52:43 +0000 (+0200)
Subject: Do not set DBUS_SESSION_BUS_DEFAULT_ADDRESS unconditional in code, it is already... 
X-Git-Tag: dbus-1.3.1~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f48b5a5a19f171fc42ff91c1b259351640fcacc;p=thirdparty%2Fdbus.git

Do not set DBUS_SESSION_BUS_DEFAULT_ADDRESS unconditional in code, it is already defined in build system.
---

diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 93e986f45..dcef7d7ff 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -35,7 +35,9 @@
 
 DBUS_BEGIN_DECLS
 
+#ifndef DBUS_SESSION_BUS_DEFAULT_ADDRESS
 #define DBUS_SESSION_BUS_DEFAULT_ADDRESS	"autolaunch:"
+#endif
 
 void _dbus_warn               (const char *format,
                                ...) _DBUS_GNUC_PRINTF (1, 2);