[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-68-gebc2b46
X2Go dev team
git-admin at x2go.org
Fri Jan 3 18:05:00 CET 2014
The branch, build-baikal has been updated
via ebc2b466843dec399a96b98b49321849433e8755 (commit)
from 619a267ca99e024c2cbd940d51a694db823b20e6 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
x2goserver/bin/x2gomountdirs | 33 ++++++++++++++++++++++++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ce793ee..5b761ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
Makefile installation.
- Fix new SQLite3 wrapper for db_getmounts Perl call.
- Fix list output in new SQLite3 wrapper.
+ - Detect i18n name of Desktop folder via XDG_DESKTOP_DIR environment
+ variable.
* /debian/control:
+ Package X2Go::Log in separate package: libx2go-log-perl.
+ Package X2Go::Server::DB in separate package: libx2go-server-db-perl.
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index d806a3f..6c7c83e 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -32,6 +32,22 @@ setlogmask( LOG_UPTO(loglevel()) );
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;
@@ -106,6 +122,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);
@@ -267,7 +292,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).
More information about the x2go-commits
mailing list