[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-79-g68eff26

[X2Go dev team]

The branch, master has been updated
       via  68eff2694eb623ef230403f3e16b9c0e74c28af7 (commit)
      from  a47324e0a6338d4589bdaa8f009cd099f80ae614 (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 68eff2694eb623ef230403f3e16b9c0e74c28af7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 24 12:26:44 2012 +0200

    fix environment sourcing

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

Summary of changes:
 X2Go/Utils.pm                |    2 +-
 x2goserver/bin/x2gomountdirs |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm
index 86ba0d7..18442a8 100644
--- a/X2Go/Utils.pm
+++ b/X2Go/Utils.pm
@@ -35,7 +35,7 @@ X2Go::Utils Perl package.
 use strict;
 use base 'Exporter';
 
-OUR @EXPORT = ('source_environment');
+our @EXPORT = ('source_environment');
 
 sub source_environment {
     my $name = shift;
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index f6ca8f5..164b2d0 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 xdg_config_home(),"/user-dirs.dirs";
+source_environment(xdg_config_home(),"/user-dirs.dirs");
 
 if (! -e $mdir)
 {


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