[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99.10-13-g53a830c

[X2Go dev team]

The branch, build-main has been updated
       via  53a830ca3b3ecde7acab042323f00c988756c47d (commit)
      from  ce30528b3b0ba6252e6617a835fd0909274a9759 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    1 +
 x2goserver/bin/x2gomountdirs      |    9 +++------
 x2goserver/bin/x2goumount-session |    6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f0d4be2..2687793 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,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 de538bc..0b77039 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -265,20 +265,17 @@ for (my $i=0;$i<@dirs;$i++)
 			if (! $printspool && ! $mimeboxspool && ! $useplasmoid )
 			{
 
-				### FIXME: Do we really want to create desktop icons for rootless sessions???
-				###        For desktop sessions this is great, but for rootless session???
-
 				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/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).