[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.0-38-g1b1fc7f
X2Go dev team
git-admin at x2go.org
Wed Sep 11 12:06:56 CEST 2013
The branch, build-main has been updated
via 1b1fc7f252485d4043d3090eb568ef68e9978a0e (commit)
from 7996b7bf565ba8dd982909db914f984c441d1943 (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 | 1 +
onmainwindow.cpp | 23 +++++++++++++++++++----
2 files changed, 20 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7ab91a9..3bcc547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
resolution. (Fixes: #151).
- Wait for x2gocmdexitmessage to return before closing in hidden mode.
- Support for published applications in X2Go Plugin
+ - Support for "shadow" mode in X2Go Plugin
[ Mike Gabriel ]
* New upstream version (4.0.1.1):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index fc735ab..e1af9c6 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -71,6 +71,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
acceptRsa=false;
cardStarted=false;
cardReady=false;
+ shadowSession=false;
proxyRunning=false;
// useSshAgent=false;
closeEventSent=false;
@@ -1674,7 +1675,8 @@ void ONMainWindow::slotClosePass()
void ONMainWindow::slotPassEnter()
{
- shadowSession=false;
+ if(!embedMode)
+ shadowSession=false;
#if defined ( Q_OS_WIN ) || defined (Q_OS_DARWIN )
QString disp=getXDisplay();
if ( disp==QString::null )
@@ -3113,6 +3115,7 @@ void ONMainWindow::slotSessEnter()
void ONMainWindow::continueNormalSession()
{
x2goDebug<<"Continue normal x2go session";
+
if (brokerMode)
{
slotListSessions(true,QString::null,0);
@@ -3279,7 +3282,8 @@ bool ONMainWindow::startSession ( const QString& sid )
user=getCurrentUname();
runRemoteCommand=true;
- shadowSession=false;
+ if(!embedMode)
+ shadowSession=false;
applications.clear();
removeAppsFromTray();
@@ -3733,6 +3737,12 @@ void ONMainWindow::startNewSession()
else
{
command=config.command;
+ if ( command=="SHADOW" )
+ {
+ shadowSession=true;
+ runRemoteCommand=false;
+ }
+
rootless= config.rootless;
host=config.server;
startEmbedded=false;
@@ -3784,7 +3794,6 @@ void ONMainWindow::startNewSession()
delete st;
}
-
if ( shadowSession )
{
runRemoteCommand=false;
@@ -9909,7 +9918,7 @@ void ONMainWindow::setEmbedSessionActionsEnabled ( bool enable )
{
act_shareFolder->setEnabled ( enable );
if(!enable)
- act_showApps->setVisible(enable);
+ act_showApps->setVisible(enable);
act_suspend->setEnabled ( enable );
act_terminate->setEnabled ( enable );
act_embedContol->setEnabled ( enable );
@@ -10009,6 +10018,12 @@ void ONMainWindow::processCfgLine ( QString line )
if ( lst[0]=="command" )
{
config.command=lst[1];
+ if ( config.command=="SHADOW" )
+ {
+ shadowSession=true;
+ runRemoteCommand=false;
+ }
+
return;
}
if ( lst[0]=="server" )
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
More information about the x2go-commits
mailing list