projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable crashhandler if coredumps are enabled
[quassel.git]
/
src
/
client
/
clientidentity.cpp
diff --git
a/src/client/clientidentity.cpp
b/src/client/clientidentity.cpp
index
1d93d64
..
9a1e0a6
100644
(file)
--- a/
src/client/clientidentity.cpp
+++ b/
src/client/clientidentity.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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)
#include "signalproxy.h"
CertIdentity::CertIdentity(IdentityId id, QObject *parent)
- : Identity(id, parent),
- _certManager(0),
+ : Identity(id, parent)
+#ifdef HAVE_SSL
+ , _certManager(0),
_isDirty(false)
_isDirty(false)
+#endif
{
}
CertIdentity::CertIdentity(const Identity &other, QObject *parent)
{
}
CertIdentity::CertIdentity(const Identity &other, QObject *parent)
- : Identity(other, parent),
- _certManager(0),
+ : Identity(other, parent)
+#ifdef HAVE_SSL
+ , _certManager(0),
_isDirty(false)
_isDirty(false)
+#endif
{
}
CertIdentity::CertIdentity(const CertIdentity &other, QObject *parent)
{
}
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)
_isDirty(other._isDirty),
_sslKey(other._sslKey),
_sslCert(other._sslCert)
+#endif
{
}
{
}
+#ifdef HAVE_SSL
void CertIdentity::enableEditSsl(bool enable) {
if(!enable || _certManager)
return;
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));
}
void ClientCertManager::setSslCert(const QByteArray &encoded) {
_certIdentity->setSslCert(QSslCertificate(encoded));
}
+
+
+#endif // HAVE_SSL