From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 9 Feb 2010 07:37:50 +0000 (+0100)
Subject: fixed bug on win32 not been able to use session bus with --config-file option
X-Git-Tag: dbus-1.3.1~120^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=523e01827eac49ec30afa173d31cdeee4be6381a;p=thirdparty%2Fdbus.git

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.
---

diff --git a/bus/main.c b/bus/main.c
index 50f47dc32..8f238968d 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -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));