Reenabled Activity levels

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

diff --git a/src/client/client.cpp b/src/client/client.cpp
index cedc042..de43a0b 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -150,9 +150,6 @@ Buffer *Client::buffer(BufferInfo id) {
   if(!buff) {
     Client *client = Client::instance();
     buff = new Buffer(id, client);
-
-    connect(buff, SIGNAL(userInput(BufferInfo, QString)),
-           client, SLOT(userInput(BufferInfo, QString)));
     connect(buff, SIGNAL(destroyed()),
            client, SLOT(bufferDestroyed()));
     client->_buffers[id.uid()] = buff;
@@ -243,17 +240,8 @@ void Client::coreIdentityRemoved(IdentityId id) {
 }
 
 /***  ***/
-
-void Client::fakeInput(BufferId bufferUid, QString message) {
-  Buffer *buff = buffer(bufferUid);
-  if(!buff)
-    qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message;
-  else
-    emit instance()->sendInput(buff->bufferInfo(), message);
-}
-
-void Client::fakeInput(BufferInfo bufferInfo, QString message) {
-  fakeInput(bufferInfo, message);
+void Client::userInput(BufferInfo bufferInfo, QString message) {
+  emit instance()->sendInput(bufferInfo, message);
 }
 
 /*** core connection stuff ***/
@@ -416,17 +404,8 @@ void Client::networkDestroyed() {
 
 void Client::recvMessage(const Message &msg) {
   Buffer *b = buffer(msg.buffer());
-
-//   Buffer::ActivityLevel level = Buffer::OtherActivity;
-//   if(msg.type() == Message::Plain || msg.type() == Message::Notice){
-//     level |= Buffer::NewMessage;
-//   }
-//   if(msg.flags() & Message::Highlight){
-//     level |= Buffer::Highlight;
-//   }
-//   emit bufferActivity(level, b);
-
   b->appendMsg(msg);
+  networkModel()->updateBufferActivity(msg);
 }
 
 void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
@@ -438,6 +417,7 @@ void Client::recvBacklogData(BufferInfo id, QVariantList msgs, bool /*done*/) {
   foreach(QVariant v, msgs) {
     Message msg = v.value<Message>();
     b->prependMsg(msg);
+    // networkModel()->updateBufferActivity(msg);
     if(!layoutQueue.contains(b)) layoutQueue.append(b);
   }
   if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();
@@ -458,7 +438,3 @@ AbstractUiMsg *Client::layoutMsg(const Message &msg) {
   return instance()->mainUi->layoutMsg(msg);
 }
 
-void Client::userInput(BufferInfo id, QString msg) {
-  emit sendInput(id, msg);
-}
-