X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoreidentity.cpp;h=5d2bb2e3475335338f44f155a4e8c8a1fafdde42;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hp=8e6fc596428363dc9bd0f550331fc5d8d0bd29fc;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e;p=quassel.git

diff --git a/src/core/coreidentity.cpp b/src/core/coreidentity.cpp
index 8e6fc596..5d2bb2e3 100644
--- a/src/core/coreidentity.cpp
+++ b/src/core/coreidentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,7 +22,6 @@
 
 #include "signalproxy.h"
 
-INIT_SYNCABLE_OBJECT(CoreIdentity)
 CoreIdentity::CoreIdentity(IdentityId id, QObject *parent)
     : Identity(id, parent)
 #ifdef HAVE_SSL
@@ -77,6 +76,8 @@ void CoreIdentity::synchronize(SignalProxy *proxy)
 void CoreIdentity::setSslKey(const QByteArray &encoded)
 {
     QSslKey key(encoded, QSsl::Rsa);
+    if (key.isNull())
+        key = QSslKey(encoded, QSsl::Ec);
     if (key.isNull())
         key = QSslKey(encoded, QSsl::Dsa);
     setSslKey(key);
@@ -106,7 +107,7 @@ CoreIdentity &CoreIdentity::operator=(const CoreIdentity &identity)
 // ========================================
 //  CoreCertManager
 // ========================================
-INIT_SYNCABLE_OBJECT(CoreCertManager)
+
 CoreCertManager::CoreCertManager(CoreIdentity &identity)
     : CertManager(identity.id()),
     identity(identity)