[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-24-gcc498e9

[X2go dev team]

The branch, master has been updated
       via  cc498e94b2e95ac0c4ef92a01732906065b25e8d (commit)
      from  3650aefe3e6399040a0fff6ccf5d174ab1d3b65d (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 cc498e94b2e95ac0c4ef92a01732906065b25e8d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 21 14:28:50 2012 +0100

    Fix call to x2goterminate-desktopsharing in x2goruncommand.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4b47309..56dde28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
     - For x2gomountdirs / x2goumount-session allow other TMP paths than
       /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp.
     - Place quotations where appropriate into shell scripts.
+    - Fix call to x2goterminate-desktopsharing in x2goruncommand.
   * Let x2goserver package suggest x2goserver-fmbindings.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 13:45:00 +0100
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index a7cbbda..7370c38 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -160,7 +160,7 @@ else
 fi
 
 # stop x2godesktopsharing process gracefully...
-x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate "$X2GO_SESSION" || true
+x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2goterminate-desktopsharing "$X2GO_SESSION" || true
 
 kill -TERM  $X2GO_AGENT_PID
 $X2GO_LIB_PATH/x2gochangestatus 'F' "$X2GO_SESSION"  > /dev/null


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