X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;h=9a1e0a6d1bf8871d99ab5aba26c5a94c53abba84;hp=1d93d64b73dbf38e257c8e879af275dde1f24fd6;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45 diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp index 1d93d64b..9a1e0a6d 100644 --- a/src/client/clientidentity.cpp +++ b/src/client/clientidentity.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -24,28 +24,35 @@ #include "signalproxy.h" CertIdentity::CertIdentity(IdentityId id, QObject *parent) - : Identity(id, parent), - _certManager(0), + : Identity(id, parent) +#ifdef HAVE_SSL + , _certManager(0), _isDirty(false) +#endif { } CertIdentity::CertIdentity(const Identity &other, QObject *parent) - : Identity(other, parent), - _certManager(0), + : Identity(other, parent) +#ifdef HAVE_SSL + , _certManager(0), _isDirty(false) +#endif { } CertIdentity::CertIdentity(const CertIdentity &other, QObject *parent) - : Identity(other, parent), - _certManager(0), + : Identity(other, parent) +#ifdef HAVE_SSL + , _certManager(0), _isDirty(other._isDirty), _sslKey(other._sslKey), _sslCert(other._sslCert) +#endif { } +#ifdef HAVE_SSL void CertIdentity::enableEditSsl(bool enable) { if(!enable || _certManager) return; @@ -97,3 +104,6 @@ void ClientCertManager::setSslKey(const QByteArray &encoded) { void ClientCertManager::setSslCert(const QByteArray &encoded) { _certIdentity->setSslCert(QSslCertificate(encoded)); } + + +#endif // HAVE_SSL