X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreircchannel.cpp;h=4f2f4f31dec448f40700545a8d64f1daf9ea63f1;hp=9db3c1a299ba423a57197761fb885f480b7a742f;hb=40601ae070413b727a68e35e5b8c619176c661b1;hpb=f6b9eeda207d42c99fc3e9085631722cf2ec83dc

diff --git a/src/core/coreircchannel.cpp b/src/core/coreircchannel.cpp
index 9db3c1a2..4f2f4f31 100644
--- a/src/core/coreircchannel.cpp
+++ b/src/core/coreircchannel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,14 +15,56 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreircchannel.h"
+#include "corenetwork.h"
 
 INIT_SYNCABLE_OBJECT(CoreIrcChannel)
 CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
-  : IrcChannel(channelname, network),
+    : IrcChannel(channelname, network),
     _receivedWelcomeMsg(false)
 {
+#ifdef HAVE_QCA2
+    _cipher = 0;
+#endif
 }
+
+
+CoreIrcChannel::~CoreIrcChannel()
+{
+#ifdef HAVE_QCA2
+    delete _cipher;
+#endif
+}
+
+
+#ifdef HAVE_QCA2
+Cipher *CoreIrcChannel::cipher() const
+{
+    if (!_cipher)
+        _cipher = new Cipher();
+
+    return _cipher;
+}
+
+
+void CoreIrcChannel::setEncrypted(bool e)
+{
+    IrcChannel::setEncrypted(e);
+
+    if (!Cipher::neededFeaturesAvailable())
+        return;
+
+    if (e) {
+        if (topic().isEmpty())
+            return;
+
+        QByteArray decrypted = cipher()->decryptTopic(topic().toLatin1());
+        setTopic(decodeString(decrypted));
+    }
+}
+
+
+#endif