mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows build

Browse Source 
* Reorder openssl header import
* not => !

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-06-08 16:33:17 +02:00 committed by Camila Ayres
parent 7e98a1e802
commit dc41f8a16e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/accountsettings.cpp
View File

@ -483,7 +483,7 @@ void AccountSettings::slotSubfolderContextMenuRequested(const QModelIndex& index
bool isEncrypted = acc->e2e()->isFolderEncrypted(info->_path);
ac = menu.addAction( isEncrypted ? tr("Decrypt") : tr("Encrypt"));
if (not isEncrypted) {
if (!isEncrypted) {
connect(ac, &QAction::triggered, [this, &info] { slotMarkSubfolderEncrpted(info); });
} else {
connect(ac, &QAction::triggered, [this, &info] { slotMarkSubfolderDecrypted(info); });

13
src/libsync/clientsideencryption.cpp
View File

@ -1,3 +1,10 @@
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/engine.h>
#include "clientsideencryption.h"
#include "account.h"
#include "capabilities.h"
@ -6,12 +13,6 @@
#include "theme.h"
#include "creds/abstractcredentials.h"
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/engine.h>
#include <map>
#include <cstdio>

1
src/libsync/clientsideencryption.h
View File

@ -10,7 +10,6 @@
#include <QVector>
#include <QMap>
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include "accountfwd.h"

2
src/libsync/clientsideencryptionjobs.cpp
View File

@ -92,7 +92,7 @@ bool GetFolderEncryptStatusJob::finished()
currFile.clear();
currEncryptedStatus = -1;
}
if (not currFile.isEmpty() && reader.name() == QLatin1String("is-encrypted")) {
if (!currFile.isEmpty() && reader.name() == QLatin1String("is-encrypted")) {
currEncryptedStatus = (bool) reader.readElementText(QXmlStreamReader::SkipChildElements).toInt();
}
}