X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=44373b604506df2b7abdb42b692f360de02cf748;hp=fcb879ea49ef5616985d5375a355152b9ce62167;hb=b55d0de3c731948432ddb2851fe728c4edff374c;hpb=641905d97d6858e3adb59bebf177b6964dd9066a

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index fcb879ea..44373b60 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -317,15 +317,16 @@ void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &
 
 void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo)
+  networkConnection()->disconnectFromIrc(true, msg);
+}
 
+void UserInputHandler::issueQuit(const QString &reason) {
   QString quitReason;
-  if(msg.isEmpty())
+  if(reason.isEmpty())
     quitReason = networkConnection()->identity()->quitReason();
   else
-    quitReason = msg;
-
+    quitReason = reason;
   emit putCmd("QUIT", serverEncode(quitReason));
-  networkConnection()->disconnectFromIrc();
 }
 
 void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) {
@@ -343,13 +344,11 @@ void UserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &ms
 
 void UserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg) {
   if(bufferInfo.bufferName().isEmpty()) return;
-  if(!msg.isEmpty()) {
-    QList<QByteArray> params;
-    params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), msg);
-    emit putCmd("TOPIC", params);
-  } else {
-    emit networkConnection()->putRawLine("TOPIC " + serverEncode(bufferInfo.bufferName()) + " :");
-  }
+  QList<QByteArray> params;
+  params << serverEncode(bufferInfo.bufferName());
+  if(!msg.isEmpty())
+    params << channelEncode(bufferInfo.bufferName(), msg);
+  emit putCmd("TOPIC", params);
 }
 
 void UserInputHandler::handleVoice(const BufferInfo &bufferInfo, const QString &msg) {