From: Alex Richardson <arichardson.kde@gmail.com>
Date: Sat, 16 Apr 2022 16:04:22 +0000 (+0000)
Subject: Fix no-X11 build after d847b5f6ae994c408c166ed51752ed9f550df600
X-Git-Tag: dbus-1.15.0~76^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c1c7e539f17099e6f2b624cdae160fd8138a8fb;p=thirdparty%2Fdbus.git

Fix no-X11 build after d847b5f6ae994c408c166ed51752ed9f550df600

Since that commit the error variable is used in all cases not only the
DBUS_BUILD_X11 #ifdef branches.

Fixes: https://gitlab.freedesktop.org/dbus/dbus/-/issues/392
---

diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 6b9fbe075..5637e4146 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -846,9 +846,7 @@ main (int argc, char **argv)
   dbus_bool_t existing_bus_supported = FALSE;
   DBusString existing_bus;
   const char *error_str;
-#ifdef DBUS_BUILD_X11
   DBusError error = DBUS_ERROR_INIT;
-#endif
 
   exit_with_session = FALSE;
   config_file = NULL;