From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 27 Sep 2010 20:21:29 +0000 (+0200)
Subject: Keep unix autolaunch functions in sync.
X-Git-Tag: dbus-1.4.1~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e5121129eb32392ac8dbfa46907697eb72d2738;p=thirdparty%2Fdbus.git

Keep unix autolaunch functions in sync.
---

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 3205bed24..23d4aa742 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -3234,7 +3234,8 @@ _read_subprocess_line_argv (const char *progpath,
  * @returns #TRUE on success, #FALSE if an error happened
  */
 dbus_bool_t
-_dbus_get_autolaunch_address (DBusString *address,
+_dbus_get_autolaunch_address (const char *scope,
+                              DBusString *address,
                               DBusError  *error)
 {
   static char *argv[6];
@@ -3615,10 +3616,11 @@ _dbus_append_keyring_directory_for_credentials (DBusString      *directory,
 }
 
 //PENDING(kdab) docs
-void
-_dbus_daemon_publish_session_bus_address (const char* addr)
+dbus_bool_t
+_dbus_daemon_publish_session_bus_address (const char* addr,
+                                          const char *scope)
 {
-
+  return TRUE;
 }
 
 //PENDING(kdab) docs