X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.cpp;h=acba205d569e5ed2dbb82185cfb153122e6cc129;hp=6fe0e97506a29347392a47da8d3748d7f40d1057;hb=fe917a13b62d08f6d1abf1b834dcbc31d6ab6b23;hpb=4c83963b1d77f4c2dbae606876be0eee59f53dae

diff --git a/src/core/coreidentity.cpp b/src/core/coreidentity.cpp
index 6fe0e975..acba205d 100644
--- a/src/core/coreidentity.cpp
+++ b/src/core/coreidentity.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  *
@@ -23,33 +23,51 @@
 #include "signalproxy.h"
 
 CoreIdentity::CoreIdentity(IdentityId id, QObject *parent)
-  : Identity(id, parent),
-    _certManager(*this)
+  : Identity(id, parent)
+#ifdef HAVE_SSL
+  , _certManager(*this)
+#endif
 {
+#ifdef HAVE_SSL
   connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
+  connect(&_certManager, SIGNAL(updated(const QVariantMap &)), this, SIGNAL(updated(const QVariantMap &)));
+#endif
 }
 
 CoreIdentity::CoreIdentity(const Identity &other, QObject *parent)
-  : Identity(other, parent),
-    _certManager(*this)
+  : Identity(other, parent)
+#ifdef HAVE_SSL
+  , _certManager(*this)
+#endif
 {
+#ifdef HAVE_SSL
   connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
+  connect(&_certManager, SIGNAL(updated(const QVariantMap &)), this, SIGNAL(updated(const QVariantMap &)));
+#endif
 }
 
 CoreIdentity::CoreIdentity(const CoreIdentity &other, QObject *parent)
-  : Identity(other, parent),
-    _sslKey(other._sslKey),
+  : Identity(other, parent)
+#ifdef HAVE_SSL
+  , _sslKey(other._sslKey),
     _sslCert(other._sslCert),
     _certManager(*this)
+#endif
 {
+#ifdef HAVE_SSL
   connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
+  connect(&_certManager, SIGNAL(updated(const QVariantMap &)), this, SIGNAL(updated(const QVariantMap &)));
+#endif
 }
 
 void CoreIdentity::synchronize(SignalProxy *proxy) {
   proxy->synchronize(this);
+#ifdef HAVE_SSL
   proxy->synchronize(&_certManager);
+#endif
 }
 
+#ifdef HAVE_SSL
 void CoreIdentity::setSslKey(const QByteArray &encoded) {
   QSslKey key(encoded, QSsl::Rsa);
   if(key.isNull())
@@ -60,14 +78,18 @@ void CoreIdentity::setSslKey(const QByteArray &encoded) {
 void CoreIdentity::setSslCert(const QByteArray &encoded) {
   setSslCert(QSslCertificate(encoded));
 }
+#endif
 
 CoreIdentity &CoreIdentity::operator=(const CoreIdentity &identity) {
   Identity::operator=(identity);
+#ifdef HAVE_SSL
   _sslKey = identity._sslKey;
   _sslCert = identity._sslCert;
+#endif
   return *this;
 }
 
+#ifdef HAVE_SSL
 // ========================================
 //  CoreCertManager
 // ========================================
@@ -78,6 +100,10 @@ CoreCertManager::CoreCertManager(CoreIdentity &identity)
   setAllowClientUpdates(true);
 }
 
+void CoreCertManager::setId(IdentityId id) {
+  renameObject(QString::number(id.toInt()));
+}
+
 void CoreCertManager::setSslKey(const QByteArray &encoded) {
   identity.setSslKey(encoded);
   CertManager::setSslKey(encoded);
@@ -87,7 +113,4 @@ void CoreCertManager::setSslCert(const QByteArray &encoded) {
   identity.setSslCert(encoded);
   CertManager::setSslCert(encoded);
 }
-
-void CoreCertManager::setId(IdentityId id) {
-  renameObject(QString::number(id.toInt()));
-}
+#endif //HAVE_SSL