x2goserver.git - master (branch) updated: 3.1.1.3-81-gbbef462 - x2go-commits

24 Oct 2012

The branch, master has been updated
       via  bbef4622482874742354e906ecb44b4191d3a3ff (commit)
      from  3e3f94f15c13fe979f5d5a4c2d0de317fb50093b (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 bbef4622482874742354e906ecb44b4191d3a3ff
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Wed Oct 24 15:37:32 2012 +0200

    fix i18n Desktop detection(2)

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

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

The diff of changes is:

diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 164b2d0..b008d1c 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -108,7 +108,7 @@ 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";
 
-source_environment(xdg_config_home(),"/user-dirs.dirs");
+source_environment(xdg_config_home() . "/user-dirs.dirs");
 
 if (! -e $mdir)
 {
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 8389912..704b696 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -23,6 +23,7 @@
 use strict;
 use Sys::Hostname;
 use Sys::Syslog qw( :standard :macros );
+use File::BaseDir qw(xdg_config_home);
 
 use X2Go::Utils qw(source_environment);
 use X2Go::Server::DB qw(db_getdisplay db_getmounts db_deletemount);
@@ -44,7 +45,7 @@ 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");
+source_environment(xdg_config_home() . "/user-dirs.dirs");
 
 if ($only_path)
 {


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

    