[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-16-gc557ccd

[X2go dev team]

The branch, master has been updated
       via  c557ccdfbfac96bfa63e14d522999a20a7b2c57a (commit)
      from  b5a057b8b849d74bae0a1aabc16989ca594a5b6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c557ccdfbfac96bfa63e14d522999a20a7b2c57a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 17 23:32:40 2012 +0100

    Revert "Remove -auth /home/mike/.Xauthority option from x2goagent start-up command line as it breaks .Xauthority path names of GDM and other display managers."
    
    This reverts commit b5a057b8b849d74bae0a1aabc16989ca594a5b6a.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    2 --
 x2goserver/bin/x2gostartagent |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1afd5fe..39475db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,6 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
     - Fix removal of desktop link on x2goumount-session if local folder of a
       Windows client gets unmounted.
     - Remove redundant -S option from x2goagent start-up command line.
-    - Remove -auth $HOME/.Xauthority option from x2goagent start-up command line
-      as it breaks .Xauthority path names of GDM and other display managers.
 
   [ Sören Plönnigs ]
   * New upstream version (3.1.0.0):
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 31af841..4951c0b 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -240,9 +240,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSIO
 SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
 
 if  [ "$X2GO_STYPE" == "S" ]; then
-	x2goagent $X2GODPIOPTION_  -$SESSION_TYPE -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+	x2goagent $X2GODPIOPTION_  -$SESSION_TYPE -auth ~/.Xauthority -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
 else
-	x2goagent $X2GODPIOPTION_ $XDMCPOPT  -$SESSION_TYPE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+	x2goagent $X2GODPIOPTION_ $XDMCPOPT  -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
 fi
 
 


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).