projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5 from Tucos/feat-keyx
[quassel.git]
/
src
/
core
/
coreircchannel.cpp
diff --git
a/src/core/coreircchannel.cpp
b/src/core/coreircchannel.cpp
index
a7e1b6c
..
99d1881
100644
(file)
--- a/
src/core/coreircchannel.cpp
+++ b/
src/core/coreircchannel.cpp
@@
-59,13
+59,6
@@
void CoreIrcChannel::setEncrypted(bool e)
if (topic().isEmpty())
return;
if (topic().isEmpty())
return;
- QByteArray key = qobject_cast<CoreNetwork *>(network())->cipherKey(name());
- if (key.isEmpty())
- return;
-
- if (!cipher()->setKey(key))
- return;
-
QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
setTopic(decodeString(decrypted));
}
QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
setTopic(decodeString(decrypted));
}