The branch, master has been updated via f79c6fa8bb9ad21529f116b0ce3e039683aadcca (commit) from b8c2618c8f1efaf4ea3aa320538577c7481a54af (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 f79c6fa8bb9ad21529f116b0ce3e039683aadcca Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 26 00:24:54 2011 +0200 Change of Desktop icons for shared folders. This change is needed for parallel installation of x2gognomebindings and x2golxdebindings. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gomountdirs | 8 +++++--- x2goserver/bin/x2goumount-session | 13 +++++++------ 3 files changed, 14 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f284e08..110ebda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -91,6 +91,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low x2godesktopsharing (>=3.0.1.3) for it to work. * Clean session dir ~/.x2go/C-<session_id> after session terminates, if not running in debug mode. + * Change of Desktop icons for shared folders. This change is needed for + parallel installation of x2gognomebindings and x2golxdebindings. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 451e328..532e685 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -265,25 +265,27 @@ for (my $i=0;$i<@dirs;$i++) if (! $printspool && ! $mimeboxspool && ! $useplasmoid) { my $fname="$ENV{'HOME'}/Desktop"; + my $current_desktop="$ENV{'XDG_CURRENT_DESKTOP'}"; + my $p=@dirs[$i]; $p=~s/\/cygdrive\///g; $p=~s/\//_/g; $fname="$fname/$p"; if ($type eq "dir") { - $fname="$fname(sshfs-disk)"; + $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)"; + $fname="$fname (sshfs-cdrom/$current_desktop)"; syslog('info', "creating desktop icon for @dirs[$i], media type is: optical disc"); } else { - $fname="$fname(sshfs-removable)"; + $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 45a4f96..277dc84 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -126,21 +126,22 @@ break: $remote=~s/\//_/g; $remote=(split(":","$remote"))[1]; $remote="$ENV{'HOME'}/Desktop/$remote"; - if ( -e "$remote(sshfs-disk)") + $current_desktop="$ENV{'XDG_CURRENT_DESKTOP'}" + if ( -e "$remote (sshfs-disk/$current_desktop)") { syslog('info', "removing desktop icon $remote(sshfs-disk)"); - unlink("$remote(sshfs-disk)"); + unlink("$remote (sshfs-disk/$current_desktop)"); } $remote=~s/%2framdrive%2fmnt%2f//; - if ( -e "$remote(sshfs-removable)") + if ( -e "$remote (sshfs-removable/$current_desktop)") { syslog('info', "removing desktop icon $remote(sshfs-removable)"); - unlink("$remote(sshfs-removable)"); + unlink("$remote (sshfs-removable/$current_desktop)"); } - if ( -e "$remote(sshfs-cdrom)") + if ( -e "$remote (sshfs-cdrom/$current_desktop)") { syslog('info', "removing desktop icon $remote(sshfs-cdrom)"); - unlink("$remote(sshfs-cdrom)"); + 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).