The branch, release/3.1.1.x has been updated via e8c4fc15d16b315d4471243f8dbb33d2eda2f900 (commit) from c7d7bc79b50bd7c5691793218f11ec7375f2dcc8 (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 e8c4fc15d16b315d4471243f8dbb33d2eda2f900 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 17 10:33:35 2012 +0200 Detect i18n name of Desktop folder via XDG_DESKTOP_DIR environment variable. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2goserver/bin/x2gomountdirs | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 512a2f5..bfe149a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,9 @@ x2goserver (3.1.1.5-0~x2go1) UNRELEASED; urgency=low - Remove redundant setting of loglevel in x2gogetapps. - Fix ,,Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME.'' from last release. - + - Detect i18n name of Desktop folder via XDG_DESKTOP_DIR environment + variable. + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 25 Sep 2012 15:03:32 +0200 x2goserver (3.1.1.4-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index d4249ad..a25b0b7 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -33,6 +33,22 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2gomountdirs has been called with options: @ARGV"); +sub source { + my $name = shift; + + open my $fh, "<", $name + or die "could not open $name: $!"; + + while (<$fh>) { + chomp; + my ($k, $v) = split /=/, $_, 2; + $v =~ s/^(['"])(.*)\1/$2/; #' fix highlighter + $v =~ s/\$([a-zA-Z]\w*)/$ENV{$1}/g; + $v =~ s/`(.*?)`/`$1`/ge; #dangerous + $ENV{$k} = $v; + } +} + my $tmp_dir = '/tmp'; my $type=shift; @@ -107,6 +123,15 @@ my $spooldir="$tmp_dir/.x2go-$ENV{'USER'}/spool"; my $mimeboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/mimebox"; my $mimeboxdir="$tmp_dir/.x2go-$ENV{'USER'}/mimebox"; +my $xdg_config; +if ( $ENV{'XDG_CONFIG_HOME'} ) +{ + $xdg_config = $ENV{'XDG_CONFIG_HOME'}; +} else { + $xdg_config = "$ENV{'HOME'}/.config"; +} +source "$xdg_config/user-dirs.dirs"; + if (! -e $mdir) { mkdir($mdir); @@ -268,7 +293,13 @@ for (my $i=0;$i<@dirs;$i++) if (! $printspool && ! $mimeboxspool && ! $useplasmoid ) { - my $fname="$ENV{'HOME'}/Desktop"; + my $fname; + if ( $ENV{'XDG_DESKTOP_DIR'} ) + { + $fname=$ENV{'XDG_DESKTOP_DIR'}; + } else { + $fname="$ENV{'HOME'}/Desktop"; + } 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).