mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-02-15 13:50:36 +01:00
fixed bug on win32 not been able to use session bus with --config-file option
Internal setup of session bus type was bound to the presence of the --session command line parameter which prevents to use the --config-file parameter for session bus setup.
This commit is contained in:
parent
27a46ea9cb
commit
523e01827e
1 changed files with 3 additions and 1 deletions
|
|
@ -298,7 +298,6 @@ main (int argc, char **argv)
|
|||
}
|
||||
else if (strcmp (arg, "--session") == 0)
|
||||
{
|
||||
is_session_bus = TRUE;
|
||||
check_two_config_files (&config_file, "session");
|
||||
|
||||
if (!_dbus_append_session_config_file (&config_file))
|
||||
|
|
@ -455,6 +454,9 @@ main (int argc, char **argv)
|
|||
exit (1);
|
||||
}
|
||||
|
||||
is_session_bus = bus_context_get_type(context) != NULL
|
||||
&& strcmp(bus_context_get_type(context),"session") == 0;
|
||||
|
||||
if (is_session_bus)
|
||||
_dbus_daemon_publish_session_bus_address (bus_context_get_address (context));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue