[X2Go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.0.1.2-11-g05b2d0b
X2Go dev team
git-admin at x2go.org
Sat Jun 8 01:13:22 CEST 2013
The branch, build-main has been updated
via 05b2d0b00809da05a1e9f30ea4b1fdb71612a861 (commit)
from 3f8822957798a3b61415f9bf358fd08266144854 (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:
sharetray.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/sharetray.cpp b/sharetray.cpp
index 4bdca29..5563e2d 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -257,8 +257,8 @@ QString ShareTray::getSocketAnswer ( QString message )
}
QString client=lst[0];
QString user=params[1];
- QString remote_user=params[10];
- if ( getAccess ( user, client ) ==QMessageBox::Yes )
+ QString remote_user=lst[10];
+ if ( getAccess ( remote_user, client ) ==QMessageBox::Yes )
{
trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) );
//start agent
@@ -280,7 +280,7 @@ QString ShareTray::getSocketAnswer ( QString message )
pid=lines[2];
qDebug() <<"agent pid: "<<pid;
AccessAction *act=new AccessAction (
- pid,user,client,
+ pid,remote_user,client,
QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ),
this );
menu->insertAction ( menu->actions() [0],act );
@@ -323,21 +323,21 @@ void ShareTray::slotCloseConnection ( AccessAction* action )
}
-int ShareTray::getAccess ( QString user, QString host )
+int ShareTray::getAccess ( QString remote_user, QString host )
{
- if ( whiteList.contains ( user ) )
+ if ( whiteList.contains ( remote_user ) )
return QMessageBox::Yes;
- if ( blackList.contains ( user ) )
+ if ( blackList.contains ( remote_user ) )
return QMessageBox::No;
- MessageBox m ( user, host, this );
+ MessageBox m ( remote_user, host, this );
m.activateWindow();
m.raise();
int res=m.exec();
if ( m.isChecked() &&res==QMessageBox::Yes )
- whiteList<<user;
+ whiteList<<remote_user;
if ( m.isChecked() &&res==QMessageBox::No )
- blackList<<user;
+ blackList<<remote_user;
actBlack->setEnabled ( blackList.size() >0 );
actWhite->setEnabled ( whiteList.size() >0 );
return res;
hooks/post-receive
--
x2godesktopsharing.git (Desktop Sharing for X2Go)
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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).
More information about the x2go-commits
mailing list