projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: Optionally ensure backlog on buffer show
[quassel.git]
/
src
/
client
/
client.cpp
diff --git
a/src/client/client.cpp
b/src/client/client.cpp
index
8ddacb9
..
c409218
100644
(file)
--- a/
src/client/client.cpp
+++ b/
src/client/client.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
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 *
@@
-241,10
+241,8
@@
const Identity* Client::identity(IdentityId id)
void Client::createIdentity(const CertIdentity& id)
{
QVariantMap additional;
void Client::createIdentity(const CertIdentity& id)
{
QVariantMap additional;
-#ifdef HAVE_SSL
additional["KeyPem"] = id.sslKey().toPem();
additional["CertPem"] = id.sslCert().toPem();
additional["KeyPem"] = id.sslKey().toPem();
additional["CertPem"] = id.sslCert().toPem();
-#endif
emit instance()->requestCreateIdentity(id, additional);
}
emit instance()->requestCreateIdentity(id, additional);
}