X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreircchannel.cpp;h=98995bffed968834d8a9e8fb9e002a01e3c14927;hp=85eb333f68d15f1f9297caf9b808690c32d1c90b;hb=3146ad01b5b29c30adcf0044a52b39aa7e5796d0;hpb=6f0a153a674317d77233139fc50a2985af86e36e

diff --git a/src/core/coreircchannel.cpp b/src/core/coreircchannel.cpp
index 85eb333f..98995bff 100644
--- a/src/core/coreircchannel.cpp
+++ b/src/core/coreircchannel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   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"
@@ -23,43 +23,46 @@
 
 INIT_SYNCABLE_OBJECT(CoreIrcChannel)
 CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
-  : IrcChannel(channelname, network),
+    : IrcChannel(channelname, network),
     _receivedWelcomeMsg(false)
 {
 #ifdef HAVE_QCA2
-  _cipher = 0;
+    _cipher = 0;
 #endif
 }
 
-CoreIrcChannel::~CoreIrcChannel() {
+
+CoreIrcChannel::~CoreIrcChannel()
+{
 #ifdef HAVE_QCA2
-  delete _cipher;
+    delete _cipher;
 #endif
 }
 
+
 #ifdef HAVE_QCA2
-Cipher *CoreIrcChannel::cipher() const {
-  if(!_cipher)
-    _cipher = new Cipher();
+Cipher *CoreIrcChannel::cipher() const
+{
+    if (!_cipher)
+        _cipher = new Cipher();
 
-  return _cipher;
+    return _cipher;
 }
 
-void CoreIrcChannel::setEncrypted(bool e) {
-  if(e) {
-    if(topic().isEmpty())
-      return;
 
-    QByteArray key = qobject_cast<CoreNetwork *>(network())->cipherKey(name());
-    if(key.isEmpty())
-      return;
+void CoreIrcChannel::setEncrypted(bool e)
+{
+    if (!Cipher::neededFeaturesAvailable())
+        return;
 
-    if(!cipher()->setKey(key))
-      return;
+    if (e) {
+        if (topic().isEmpty())
+            return;
 
-    QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
-    setTopic(decodeString(decrypted));
-  }
+        QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
+        setTopic(decodeString(decrypted));
+    }
 }
 
+
 #endif