[X2Go-Commits] [x2godesktopsharing] 02/02: fix for last commit (as it broke X2Go Client)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit 4764a2ab7263f6c794c9a3fb9a9e980e2478d226
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 1 02:44:37 2014 +0100

    fix for last commit (as it broke X2Go Client)
---
 sharetray.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sharetray.cpp b/sharetray.cpp
index ba5f557..712af15 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -376,13 +376,13 @@ QString ShareTray::getSocketAnswer ( QString message )
 	if ( lst.size() !=11 )
 	{
 		qDebug() <<"wrong parameters";
-		return "DENY|wrong number of session parameters";
+		return "DENY wrong number of session parameters";
 	}
 	QStringList params=lst[9].split ( "XSHAD" );
 	if ( params.size() !=3 )
 	{
 		qDebug() <<"wrong parameters";
-		return "DENY|wrong session name";
+		return "DENY wrong session name";
 	}
 	QString client=lst[0];
 	QString user=params[1];
@@ -396,7 +396,7 @@ QString ShareTray::getSocketAnswer ( QString message )
 		proc.start ( "x2gostartagent",lst );
 		if ( !proc.waitForFinished ( 5000 ) )
 		{
-			return "DENY|x2gostartagent timed out";
+			return "DENY x2gostartagent timed out";
 		}
 		else
 		{
@@ -423,7 +423,7 @@ QString ShareTray::getSocketAnswer ( QString message )
 	}
 	trayMessage ( tr ( "Access denied" ),QString (
 	              tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) );
-	return "DENY|access denied";
+	return "DENY access denied user";
 }
 
 void ShareTray::closeSocket ( SimpleLocalSocket* sock )

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git