x2goserver.git - master (branch) updated: 3.0.99-2-309-g316bce8 - x2go-commits

25 Sep 2011

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

    fix detection of current desktop(2)

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

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

The diff of changes is:

diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 45a9e0d..da0c2a7 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -265,7 +265,15 @@ for (my $i=0;$i<@dirs;$i++)
 			if (! $printspool && ! $mimeboxspool && ! $useplasmoid)
 			{
 				my $fname="$ENV{'HOME'}/Desktop";
-				my $current_desktop=`echo $session | cut -d"_" -f2 | cut -d"D" -f2-`;
+				my $current_desktop = "";
+				if ($p =~ m/stDGNOME/)
+				{
+					$current_desktop="/GNOME";
+				}
+				elsif ($p =~ m/stDLXDE/)
+				{
+					$current_desktop="/LXDE";
+				}
 
 				my $p=@dirs[$i];
 				$p=~s/\/cygdrive\///g;
@@ -273,19 +281,19 @@ for (my $i=0;$i<@dirs;$i++)
 				$fname="$fname/$p";
 				if ($type eq "dir")
 				{
-					$fname="$fname (sshfs-disk/$current_desktop)";
+					$fname="$fname (sshfs-disk$current_desktop)";
 					syslog('info', "creating desktop icon for @dirs[$i], media type is: client-side folder on harddrive");
 				}
 				else
 				{
 					if ($fname =~ m/CDROM/)
 					{
-						$fname="$fname (sshfs-cdrom/$current_desktop)";
+						$fname="$fname (sshfs-cdrom$current_desktop)";
 						syslog('info', "creating desktop icon for @dirs[$i], media type is: optical disc");
 					}
 					else
 					{
-						$fname="$fname (sshfs-removable/$current_desktop)";
+						$fname="$fname (sshfs-removable$current_desktop)";
 						syslog('info', "creating desktop icon for @dirs[$i], media type is: removable device");
 					}
 					$fname=~s/_ramdrive_mnt_//;
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index c31fa2f..1f5fa0d 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -126,22 +126,32 @@ break:
 		$remote=~s/\//_/g;
 		$remote=(split(":","$remote"))[1];
 		$remote="$ENV{'HOME'}/Desktop/$remote";
-		my $current_desktop=`echo $session | cut -d"_" -f2 | cut -d"D" -f2-`;
-		if ( -e "$remote (sshfs-disk/$current_desktop)")
+
+		my $current_desktop = '';
+		if ($p =~ m/stDGNOME/)
+		{
+			$current_desktop="/GNOME";
+		}
+		elsif ($p =~ m/stDLXDE/)
+		{
+			$current_desktop="/LXDE";
+		}
+
+		if ( -e "$remote (sshfs-disk$current_desktop)")
 		{
-		    syslog('info', "removing desktop icon $remote(sshfs-disk)");
-		    unlink("$remote (sshfs-disk/$current_desktop)");
+		    syslog('info', "removing desktop icon $remote(sshfs-disk$current_desktop)");
+		    unlink("$remote (sshfs-disk$current_desktop)");
 		}
 		$remote=~s/%2framdrive%2fmnt%2f//;
-		if ( -e "$remote (sshfs-removable/$current_desktop)")
+		if ( -e "$remote (sshfs-removable$current_desktop)")
 		{
-			syslog('info', "removing desktop icon $remote(sshfs-removable)");
-			unlink("$remote (sshfs-removable/$current_desktop)");
+			syslog('info', "removing desktop icon $remote(sshfs-removable$current_desktop)");
+			unlink("$remote (sshfs-removable$current_desktop)");
 		}
 		if ( -e "$remote (sshfs-cdrom/$current_desktop)")
 		{
-			syslog('info', "removing desktop icon $remote(sshfs-cdrom)");
-			unlink("$remote (sshfs-cdrom/$current_desktop)");
+			syslog('info', "removing desktop icon $remote (sshfs-cdrom$current_desktop)");
+			unlink("$remote (sshfs-cdrom$current_desktop)");
 		}
 		db_deletemount ($session, @line[1]);
 		rmdir (@line[1]);


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

    