The branch, master has been updated via 3e3f94f15c13fe979f5d5a4c2d0de317fb50093b (commit) from 68eff2694eb623ef230403f3e16b9c0e74c28af7 (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 3e3f94f15c13fe979f5d5a4c2d0de317fb50093b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 24 12:31:23 2012 +0200 fix missing i18n desktop code in x2goumount-session ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2goumount-session | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 7da17a0..8389912 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -24,6 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); +use X2Go::Utils qw(source_environment); use X2Go::Server::DB qw(db_getdisplay db_getmounts db_deletemount); use X2Go::Log qw(loglevel); @@ -43,6 +44,8 @@ my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media"; my $spooldir="$tmp_dir/.x2go-$ENV{'USER'}/spool"; my $mimeboxdir="$tmp_dir/.x2go-$ENV{'USER'}/mimebox"; +source_environment(xdg_config_home(),"/user-dirs.dirs"); + if ($only_path) { $only_path=~s/\/ramdrive\/mnt\///; @@ -154,7 +157,14 @@ break: $remote=~s/ /_/g; $remote=~s/\\040/_/g; $remote=(split(":","$remote"))[1]; - $remote="$ENV{'HOME'}/Desktop/$remote"; + my $desktopdir; + if ( $ENV{'XDG_DESKTOP_DIR'} ) + { + $desktopdir="$ENV{'XDG_DESKTOP_DIR'}"; + } else { + $desktopdir="$ENV{'HOME'}/Desktop"; + } + $remote="$desktopdir/$remote"; my $current_desktop = 'NONE'; if (($session =~ m/_stDGNOME_dp/) && system("x2gofeature X2GO_GNOMEBINDINGS >/dev/null") == 0) 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).