cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index df30c89..ac0432f 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2020 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -241,10 +241,8 @@ const Identity* Client::identity(IdentityId id)
 void Client::createIdentity(const CertIdentity& id)
 {
     QVariantMap additional;
-#ifdef HAVE_SSL
     additional["KeyPem"] = id.sslKey().toPem();
     additional["CertPem"] = id.sslCert().toPem();
-#endif
     emit instance()->requestCreateIdentity(id, additional);
 }
 
@@ -604,7 +602,7 @@ void Client::purgeKnownBufferIds()
 void Client::bufferRemoved(BufferId bufferId)
 {
     // select a sane buffer (status buffer)
-    /* we have to manually select a buffer because otherwise inconsitent changes
+    /* we have to manually select a buffer because otherwise inconsistent changes
      * to the model might occur:
      * the result of a buffer removal triggers a change in the selection model.
      * the newly selected buffer might be a channel that hasn't been selected yet