[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-15-gb5a057b
X2go dev team
git-admin at x2go.org
Fri Feb 17 22:55:45 CET 2012
The branch, master has been updated
via b5a057b8b849d74bae0a1aabc16989ca594a5b6a (commit)
via c4a1ea405879b07d351b6c10da02bb891c02c45b (commit)
via 53a830ca3b3ecde7acab042323f00c988756c47d (commit)
via ce30528b3b0ba6252e6617a835fd0909274a9759 (commit)
from 9d58cdf8b93ba5f041bb643d6b28214493cc8353 (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 b5a057b8b849d74bae0a1aabc16989ca594a5b6a
Author: Milan Knížek <knizek.confy at gmail.com>
Date: Fri Feb 17 22:55:41 2012 +0100
Remove -auth /home/mike/.Xauthority option from x2goagent start-up command line as it breaks .Xauthority path names of GDM and other display managers.
commit c4a1ea405879b07d351b6c10da02bb891c02c45b
Author: Milan Knížek <knizek.confy at gmail.com>
Date: Fri Feb 17 22:50:48 2012 +0100
Remove redundant -S option from x2goagent start-up command line.
commit 53a830ca3b3ecde7acab042323f00c988756c47d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Feb 17 22:45:59 2012 +0100
Do not create desktop icons for rootless (i.e. non-desktop) sessions.
commit ce30528b3b0ba6252e6617a835fd0909274a9759
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Feb 17 22:33:29 2012 +0100
add FIXME to x2gomountdirs
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++++
x2goserver/bin/x2gomountdirs | 7 ++++---
x2goserver/bin/x2gostartagent | 4 ++--
x2goserver/bin/x2goumount-session | 6 +++---
4 files changed, 13 insertions(+), 8 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f0d4be2..1afd5fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.1.0.0):
- 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):
@@ -29,6 +32,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.1.0.0):
- Provide new package x2goserver-fmbindings. Derived from a package draft
provided by Milan Knížek (Thanks!).
+ - Do not create desktop icons for rootless (i.e. non-desktop) sessions.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index c1b4d3a..0b77039 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -264,17 +264,18 @@ for (my $i=0;$i<@dirs;$i++)
}
if (! $printspool && ! $mimeboxspool && ! $useplasmoid )
{
+
my $fname="$ENV{'HOME'}/Desktop";
my $current_desktop = "NONE";
- if (($session =~ m/stDGNOME/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0)
+ if (($session =~ m/_stDGNOME_dp/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0)
{
$current_desktop="-gnome";
}
- elsif (($session =~ m/stDLXDE/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0)
+ elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0)
{
$current_desktop="-lxde";
}
- elsif (system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0)
+ elsif (($session =~ m/_stD.*_dp/) && system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0)
{
$current_desktop="";
}
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 3b802b4..31af841 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 -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+ x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -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 -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+ x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
fi
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 64876d9..d9fcdfe 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -130,15 +130,15 @@ break:
$remote="$ENV{'HOME'}/Desktop/$remote";
my $current_desktop = 'NONE';
- if (($session =~ m/stDGNOME/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0)
+ if (($session =~ m/_stDGNOME_dp/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0)
{
$current_desktop="-gnome";
}
- elsif (($session =~ m/stDLXDE/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0)
+ elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0)
{
$current_desktop="-lxde";
}
- elsif (system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0)
+ elsif (($session =~ m/_st.*_dp/) && system("x2gofeature X2GO_FMBINDINGS >/dev/null") == 0)
{
$current_desktop="";
}
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).
More information about the x2go-commits
mailing list