Revamped a lot of the settings stuff. This should fix the Q_ASSERT that would appear

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

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index b0e2862..7a996d0 100644 (file)
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -107,12 +107,12 @@ QVariantMap Buffer::nickList() const {
 }
 
 QString Buffer::topic() const {
-  // FIXME check if we got a networkInfo() object
+  if(ircChannel()) return ircChannel()->topic();
   return QString();
 }
 
 QString Buffer::ownNick() const {
-  // FIXME check if we got a networkInfo() object
+  // FIXME if(ircChannel()) return ircChannel()->ownNick();
   return QString();
 }
 
@@ -159,12 +159,14 @@ IrcChannel *Buffer::ircChannel() const {
   return _ircChannel;
 }
 
-void Buffer::setIrcChannel(IrcChannel *ircchan) { return;
+void Buffer::setIrcChannel(IrcChannel *ircchan) {
   if(_ircChannel) {
     disconnect(_ircChannel, 0, this, 0);
   }
   _ircChannel = ircchan;
   if(_ircChannel) {
+    emit topicSet(_ircChannel->topic());
+    connect(_ircChannel, SIGNAL(topicSet(QString)), this, SIGNAL(topicSet(QString)));
     connect(_ircChannel, SIGNAL(destroyed()), this, SLOT(setIrcChannel()));
   }
   _nickModel->setIrcChannel(ircChannel());
@@ -172,11 +174,6 @@ void Buffer::setIrcChannel(IrcChannel *ircchan) { return;
 
 // no longer needed
 // back reference:
-// void Buffer::setTopic(QString t) {
-//   _topic = t;
-//   emit topicSet(t);
-//   emit bufferUpdated(this);
-// }
 
 // void Buffer::addNick(QString nick, QVariantMap props) {
 //   if(nick == ownNick()) setActive(true);