From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 14 Jul 2011 17:48:26 +0000 (+0100)
Subject: _dbus_lookup_session_address_launchd: don't define if not used
X-Git-Tag: dbus-1.5.8~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a7da74b0b6dbb87d54353e5ff71217aba4f6745;p=thirdparty%2Fdbus.git

_dbus_lookup_session_address_launchd: don't define if not used

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
---

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 7a1eb27b3..bd1018355 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -3421,10 +3421,10 @@ _dbus_lookup_launchd_socket (DBusString *socket_path,
 #endif
 }
 
+#ifdef DBUS_ENABLE_LAUNCHD
 static dbus_bool_t
 _dbus_lookup_session_address_launchd (DBusString *address, DBusError  *error)
 {
-#ifdef DBUS_ENABLE_LAUNCHD
   dbus_bool_t valid_socket;
   DBusString socket_path;
 
@@ -3466,12 +3466,8 @@ _dbus_lookup_session_address_launchd (DBusString *address, DBusError  *error)
 
   _dbus_string_free(&socket_path);
   return TRUE;
-#else
-  dbus_set_error(error, DBUS_ERROR_NOT_SUPPORTED,
-                "can't lookup session address from launchd; launchd support not compiled in");
-  return FALSE;
-#endif
 }
+#endif
 
 /**
  * Determines the address of the session bus by querying a