X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;h=af3541cfcb040e70bf712362918bc013882ca722;hp=1d93d64b73dbf38e257c8e879af275dde1f24fd6;hb=3474e986630907fa2a3f4143012ac2a42796609e;hpb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45

diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp
index 1d93d64b..af3541cf 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  *
@@ -23,29 +23,37 @@
 #include "client.h"
 #include "signalproxy.h"
 
+INIT_SYNCABLE_OBJECT(CertIdentity)
 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;
@@ -53,7 +61,7 @@ void CertIdentity::enableEditSsl(bool enable) {
   _certManager = new ClientCertManager(id(), this);
   if(isValid()) { // this means we are not a newly created Identity but have a proper Id
     Client::signalProxy()->synchronize(_certManager);
-    connect(_certManager, SIGNAL(updated(const QVariantMap &)), this, SLOT(markClean()));
+    connect(_certManager, SIGNAL(updated()), this, SLOT(markClean()));
     connect(_certManager, SIGNAL(initDone()), this, SLOT(markClean()));
   }
 }
@@ -97,3 +105,6 @@ void ClientCertManager::setSslKey(const QByteArray &encoded) {
 void ClientCertManager::setSslCert(const QByteArray &encoded) {
   _certIdentity->setSslCert(QSslCertificate(encoded));
 }
+
+
+#endif // HAVE_SSL