mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 08:47:22 +03:00
Code Issues Projects Releases Packages Wiki Activity

make ssldialog aware of custom configs.

Browse source
This commit is contained in:
Klaas Freitag 2012-06-13 11:36:56 +02:00
parent 5953d36297
commit f0bae07a2c
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mirall/sslerrordialog.cpp
View file

@ -37,7 +37,7 @@ SslErrorDialog::SslErrorDialog(QWidget *parent) :
QList<QSslCertificate> SslErrorDialog::storedCACerts() QList<QSslCertificate> SslErrorDialog::storedCACerts()
{ {
MirallConfigFile cfg; MirallConfigFile cfg( _customConfigHandle );
QSettings settings( cfg.configFile(), QSettings::IniFormat); QSettings settings( cfg.configFile(), QSettings::IniFormat);
QList<QSslCertificate> cacerts = QSslCertificate::fromData(settings.value(QLatin1String("CaCertificates")).toByteArray()); QList<QSslCertificate> cacerts = QSslCertificate::fromData(settings.value(QLatin1String("CaCertificates")).toByteArray());
@ -166,7 +166,8 @@ void SslErrorDialog::accept()
{ {
// Save the contents of _unknownCerts to the settings file. // Save the contents of _unknownCerts to the settings file.
if( trustConnection() && _unknownCerts.count() > 0 ) { if( trustConnection() && _unknownCerts.count() > 0 ) {
MirallConfigFile cfg; MirallConfigFile cfg( _customConfigHandle );
QSettings settings( cfg.configFile(), QSettings::IniFormat); QSettings settings( cfg.configFile(), QSettings::IniFormat);
QByteArray certs = settings.value(QLatin1String("CaCertificates")).toByteArray(); QByteArray certs = settings.value(QLatin1String("CaCertificates")).toByteArray();
@ -190,5 +191,9 @@ void SslErrorDialog::accept()
QDialog::accept(); QDialog::accept();
} }
void SslErrorDialog::setCustomConfigHandle( const QString& handle )
{
_customConfigHandle = handle;
}
} // end namespace } // end namespace

2
src/mirall/sslerrordialog.h
View file

@ -37,6 +37,7 @@ public:
bool trustConnection(); bool trustConnection();
void setCustomConfigHandle( const QString& );
signals: signals:
public slots: public slots:
@ -50,6 +51,7 @@ private:
QString certDiv( QSslCertificate ) const; QString certDiv( QSslCertificate ) const;
QList<QSslCertificate> _unknownCerts; QList<QSslCertificate> _unknownCerts;
QString _customConfigHandle;
}; };
} // end namespace } // end namespace