This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 72e7eec2674e63189a7af8cf7b09eb114d25408a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 16:42:06 2018 +0100 Fix auto-accept and auto-deny based on whitelists and blacklist. Regression fix for Git commit ef3dfac2. --- debian/changelog | 2 ++ sharetray.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 098ba8b..19a176d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium disconnects the remote user. - Don't create empty parameters in .x2godesktopsharing/settings as '<param>=@Invalid()' but really as empty strings. + - Fix auto-accept and auto-deny based on whitelists and blacklist. + Regression fix for Git commit ef3dfac2. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/sharetray.cpp b/sharetray.cpp index 490f4b8..034e4cf 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -485,15 +485,15 @@ int ShareTray::getAccess ( QString remote_user, QString host ) // user preferences always supercede system-wide preferences if ( userWhiteList.contains ( remote_user ) ) - return QMessageBox::Yes; + return QDialog::Accepted; if ( userBlackList.contains ( remote_user ) ) - return QMessageBox::No; + return QDialog::Rejected; // system-wide preferences act as defaults for all users, but can be overriden by the user... if ( systemwideWhiteList.contains ( remote_user ) ) - return QMessageBox::Yes; + return QDialog::Accepted; if ( systemwideBlackList.contains ( remote_user ) ) - return QMessageBox::Yes; + return QDialog::Rejected; AccessWindow ad ( remote_user, host, this ); ad.raise(); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git