diff options
Diffstat (limited to 'src/client/net/serverconnection.cpp')
| -rw-r--r-- | src/client/net/serverconnection.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp index d79c7c3..b2a6b0d 100644 --- a/src/client/net/serverconnection.cpp +++ b/src/client/net/serverconnection.cpp @@ -1,8 +1,7 @@ #include "serverconnection.h" #include <QtCore> #include <QPixmap> -#include <QApplication> -#include <QDesktopWidget> +#include <QGuiApplication> #include <QHostInfo> #include <unistd.h> #include <cstdlib> @@ -190,9 +189,8 @@ void ServerConnection::handleMsg() int x = _fromServer.getFieldString(_X).toInt(); int y = _fromServer.getFieldString(_Y).toInt(); - // Get rect of primary screen - const QDesktopWidget primary; - const QRect primaryRect = primary.screenGeometry(); + QRect primaryRect = QGuiApplication::primaryScreen()->geometry(); + qDebug() << primaryRect; // Limit requested size so it won't easily leak sensitive information if (x < 32) { x = 32; @@ -206,16 +204,10 @@ void ServerConnection::handleMsg() } QPixmap desktop( - QPixmap::grabWindow( - QApplication::desktop()->winId(), - primaryRect.x(), - primaryRect.y(), - primaryRect.width(), - primaryRect.height() - ).scaled( - x, y, - Qt::KeepAspectRatio, - Qt::SmoothTransformation)); + QGuiApplication::primaryScreen()->grabWindow(0, + primaryRect.x(), primaryRect.y(), primaryRect.width(), primaryRect.height() + ).scaled(x, y, Qt::KeepAspectRatio, Qt::SmoothTransformation + )); QByteArray bytes; QBuffer jpgBuffer(&bytes); jpgBuffer.open(QIODevice::WriteOnly); @@ -365,6 +357,7 @@ void ServerConnection::onVncViewerStartStop(const bool started, const int client */ void ServerConnection::sslErrors(const QList<QSslError> & errors) { + _socket->ignoreSslErrors(); for (QList<QSslError>::const_iterator it = errors.begin(); it != errors.end(); it++) { const QSslError &err = *it; qDebug("Connect SSL: %s", qPrintable(err.errorString())); @@ -375,6 +368,7 @@ void ServerConnection::sslErrors(const QList<QSslError> & errors) if (err.error() == QSslError::CertificateNotYetValid || err.error() == QSslError::CertificateExpired) continue; // Some other SSL error - do not ignore + qDebug() << "FATAL!"; _socket->ignoreSslErrors(QList<QSslError>()); return; } |