[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.6-3-gadd9364

[X2go dev team]

The branch, master has been updated
       via  add936413c185eeee07d97bbbde731628cb0f152 (commit)
      from  3472dd0d3d822d586bd8fdd630d5bb0c4e0269d0 (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 add936413c185eeee07d97bbbde731628cb0f152
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 13 03:11:51 2011 +0200

    Do not create desktop links for shared folders when running KDE/Plasma. Users are recommended to use the X2go Plasma widget.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 79ddb32..3babc52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x2goserver (3.0.99.7-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.0.99.7):
     - Move x2golistmounts script from x2goserver-extensions to x2goserver
       core.
+    - Do not create desktop links for shared folders when running KDE/Plasma.
+      Users are recommended to use the X2go Plasma widget.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 12 Oct 2011 13:17:38 +0200
 
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 7f926df..c6b5cc8 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -262,7 +262,7 @@ for (my $i=0;$i<@dirs;$i++)
 					$useplasmoid=1;
 				}
 			}
-			if (! $printspool && ! $mimeboxspool && ! $useplasmoid)
+			if (! $printspool && ! $mimeboxspool && ! $useplasmoid && ! ($session =~ m/stDKDE/))
 			{
 				my $fname="$ENV{'HOME'}/Desktop";
 				my $current_desktop = "";


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