projects
/
platform
/
upstream
/
dbus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e61875
)
Keep unix autolaunch functions in sync.
author
Ralf Habacker
<ralf.habacker@freenet.de>
Mon, 27 Sep 2010 20:21:29 +0000
(22:21 +0200)
committer
Ralf Habacker
<ralf.habacker@freenet.de>
Mon, 27 Sep 2010 20:23:31 +0000
(22:23 +0200)
dbus/dbus-sysdeps-unix.c
patch
|
blob
|
history
diff --git
a/dbus/dbus-sysdeps-unix.c
b/dbus/dbus-sysdeps-unix.c
index
3205bed
..
23d4aa7
100644
(file)
--- 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