[X2Go-Commits] [python-x2go] 02/02: no xconfig_config_file on non-Windows systems

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 5bf01694a237dc85eab61881fb798e2286af653d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 14 16:26:56 2014 +0200

    no xconfig_config_file on non-Windows systems
---
 x2go/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x2go/client.py b/x2go/client.py
index c1cefb9..7397148 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -301,7 +301,6 @@ class X2GoClient(object):
             _sessions_config_file = os.path.join(self.client_rootdir, _X2GO_SESSIONPROFILES_FILENAME)
             _settings_config_file = os.path.join(self.client_rootdir, _X2GO_SETTINGS_FILENAME)
             _printing_config_file = os.path.join(self.client_rootdir, _X2GO_PRINTING_FILENAME)
-            _xconfig_config_file = os.path.join(self.client_rootdir, _X2GO_XCONFIG_FILENAME)
             self.session_profiles = self.profiles_backend(config_files=[_sessions_config_file], logger=self.logger, broker_url=broker_url, broker_password=broker_password, broker_noauth=broker_noauth)
             self.client_settings = self.settings_backend(config_files=[_settings_config_file], logger=self.logger)
             self.client_printing = self.printing_backend(config_files=[_printing_config_file], client_instance=self, logger=self.logger)
@@ -313,6 +312,7 @@ class X2GoClient(object):
         if _X2GOCLIENT_OS == 'Windows' and start_xserver:
 
             if self.client_rootdir:
+                _xconfig_config_file = os.path.join(self.client_rootdir, _X2GO_XCONFIG_FILENAME)
                 self.client_xconfig = X2GoClientXConfig(config_files=[_xconfig_config_file], logger=self.logger)
             else:
                 self.client_xconfig = X2GoClientXConfig(logger=self.logger)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git