[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-308-g3b45779

[X2go dev team]

The branch, master has been updated
       via  3b457798ef4564a5579dc74868b77668bb10ed50 (commit)
      from  6284c580079914258d516e9e8571e37b5264abd9 (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 3b457798ef4564a5579dc74868b77668bb10ed50
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 26 01:04:45 2011 +0200

    fix detection of current desktop

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

Summary of changes:
 x2goserver/bin/x2gomountdirs      |    2 +-
 x2goserver/bin/x2goumount-session |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 532e685..45a9e0d 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -265,7 +265,7 @@ for (my $i=0;$i<@dirs;$i++)
 			if (! $printspool && ! $mimeboxspool && ! $useplasmoid)
 			{
 				my $fname="$ENV{'HOME'}/Desktop";
-				my $current_desktop="$ENV{'XDG_CURRENT_DESKTOP'}";
+				my $current_desktop=`echo $session | cut -d"_" -f2 | cut -d"D" -f2-`;
 
 				my $p=@dirs[$i];
 				$p=~s/\/cygdrive\///g;
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 277dc84..c31fa2f 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -126,7 +126,7 @@ break:
 		$remote=~s/\//_/g;
 		$remote=(split(":","$remote"))[1];
 		$remote="$ENV{'HOME'}/Desktop/$remote";
-		$current_desktop="$ENV{'XDG_CURRENT_DESKTOP'}"
+		my $current_desktop=`echo $session | cut -d"_" -f2 | cut -d"D" -f2-`;
 		if ( -e "$remote (sshfs-disk/$current_desktop)")
 		{
 		    syslog('info', "removing desktop icon $remote(sshfs-disk)");


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