diff options
Diffstat (limited to 'src/modules/dcc/video.cpp')
| -rw-r--r-- | src/modules/dcc/video.cpp | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp index 7d6bd6833..131ce71dc 100644 --- a/src/modules/dcc/video.cpp +++ b/src/modules/dcc/video.cpp @@ -636,7 +636,7 @@ QPixmap * KviDccVideo::myIconPtr() return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE); } -void KviDccVideo::ownMessage(const QString &text) +void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback) { if(!m_pSlaveThread) { @@ -663,19 +663,23 @@ void KviDccVideo::ownMessage(const QString &text) { KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr()); m_tmpTextDataOut.append(buf.ptr(), buf.len()); - m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED, - m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), - m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications); + if(bUserFeedback) + m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED, + m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), + m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications); } break; case KviCryptEngine::Encoded: { KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr()); m_tmpTextDataOut.append(buf.ptr(), buf.len()); - QString encr = decodeText(encrypted.ptr()); - m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), - m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications); + if(bUserFeedback) + { + QString encr = decodeText(encrypted.ptr()); + m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, + m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), + m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications); + } } break; default: // also case KviCryptEngine::EncryptError @@ -693,9 +697,11 @@ void KviDccVideo::ownMessage(const QString &text) KviStr buf(KviStr::Format,"%s\r\n",d); QString tmp = text.right(text.length() - 1); m_tmpTextDataOut.append(buf.ptr(), buf.len()); - m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), - m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications); + + if(bUserFeedback) + m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, + m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), + m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications); return; } } @@ -703,9 +709,11 @@ void KviDccVideo::ownMessage(const QString &text) #endif KviStr buf(KviStr::Format,"%s\r\n",d); m_tmpTextDataOut.append(buf.ptr(), buf.len()); - m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), - m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications); + + if(bUserFeedback) + m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, + m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), + m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications); } const QString & KviDccVideo::localNick() |