diff options
22 files changed, 56 insertions, 19 deletions
diff --git a/data/deftheme/Aria-2.0.0/themedata.kvc b/data/deftheme/Aria-2.0.0/themedata.kvc index a241c1347..469f68cd7 100644 --- a/data/deftheme/Aria-2.0.0/themedata.kvc +++ b/data/deftheme/Aria-2.0.0/themedata.kvc @@ -50,6 +50,7 @@ msgtypeVoice=35,3,100,1,1 msgtypeMeInviteUnexcept=200,4,100,1,5 msgtypeUserOp=174,3,100,1,1 msgtypeActionCrypted=337,2,100,1,3 +msgtypeOwnActionCrypted=337,2,100,1,3 mirccolor4=161,0,0,255 iccolor6=0,130,0,255 pixmapUserListViewBackground= @@ -78,6 +79,7 @@ uintGlobalWindowOpacityPercent=100 uintTreeWindowListPixmapAlign=0 msgtypeCTCPRequestIgnored=53,5,100,1,1 msgtypeAction=56,2,100,1,3 +msgtypeOwnAction=56,2,100,1,3 msgtypeQuit=58,13,100,1,2 msgtypeCreationTime=93,14,100,1,1 msgtypeOwnPrivmsgCrypted=100,1,100,1,3 @@ -207,6 +209,7 @@ colorTreeWindowListActiveForeground=244,244,244,255 fontNotifier=Sans%20Serif,10,5,50 msgtypeURL=185,10,100,1,1 msgtypeTopic=42,3,100,1,1 +msgtypeTopicCrypted=42,3,100,1,1 msgtypeDeop=62,3,100,1,1 msgtypeLimit=66,14,100,1,1 msgtypeBan=67,5,100,1,1 diff --git a/data/deftheme/I_O-Black-2.1.9/themedata.kvc b/data/deftheme/I_O-Black-2.1.9/themedata.kvc index 2de577689..9f6a78dde 100644 --- a/data/deftheme/I_O-Black-2.1.9/themedata.kvc +++ b/data/deftheme/I_O-Black-2.1.9/themedata.kvc @@ -50,6 +50,7 @@ msgtypeVoice=35,8,100,1,1 msgtypeMeInviteUnexcept=200,9,100,1,5 msgtypeUserOp=174,8,100,1,1 msgtypeActionCrypted=337,8,100,1,5 +msgtypeOwnActionCrypted=337,8,100,1,5 mirccolor4=230,76,79,255 iccolor6=0,130,0,255 pixmapUserListViewBackground= @@ -78,6 +79,7 @@ uintGlobalWindowOpacityPercent=100 uintTreeWindowListPixmapAlign=0 msgtypeCTCPRequestIgnored=53,6,100,1,1 msgtypeAction=56,8,100,1,5 +msgtypeOwnAction=56,8,100,1,5 msgtypeQuit=58,12,100,1,2 msgtypeCreationTime=93,8,100,1,1 msgtypeOwnPrivmsgCrypted=100,0,100,1,3 @@ -207,6 +209,7 @@ colorTreeWindowListActiveForeground=0,0,0,255 fontNotifier=Monospace,10,5,50 msgtypeURL=185,12,100,1,1 msgtypeTopic=42,6,100,1,5 +msgtypeTopicCrypted=42,6,100,1,5 msgtypeDeop=62,8,100,1,1 msgtypeLimit=66,7,100,1,1 msgtypeBan=67,6,100,1,1 diff --git a/data/deftheme/I_O-Dark-2.1.9/themedata.kvc b/data/deftheme/I_O-Dark-2.1.9/themedata.kvc index a9ec254e6..31b5641bc 100644 --- a/data/deftheme/I_O-Dark-2.1.9/themedata.kvc +++ b/data/deftheme/I_O-Dark-2.1.9/themedata.kvc @@ -50,6 +50,7 @@ msgtypeVoice=35,8,100,1,1 msgtypeMeInviteUnexcept=200,9,100,1,5 msgtypeUserOp=174,8,100,1,1 msgtypeActionCrypted=337,8,100,1,5 +msgtypeOwnActionCrypted=337,8,100,1,5 mirccolor4=230,76,79,255 iccolor6=0,130,0,255 pixmapUserListViewBackground= @@ -78,6 +79,7 @@ uintGlobalWindowOpacityPercent=100 uintTreeWindowListPixmapAlign=0 msgtypeCTCPRequestIgnored=53,6,100,1,1 msgtypeAction=56,8,100,1,5 +msgtypeOwnAction=56,8,100,1,5 msgtypeQuit=58,12,100,1,2 msgtypeCreationTime=93,8,100,1,1 msgtypeOwnPrivmsgCrypted=100,0,100,1,3 @@ -207,6 +209,7 @@ colorTreeWindowListActiveForeground=35,35,35,255 fontNotifier=Monospace,10,5,50 msgtypeURL=185,12,100,1,1 msgtypeTopic=42,6,100,1,5 +msgtypeTopicCrypted=42,6,100,1,5 msgtypeDeop=62,8,100,1,1 msgtypeLimit=66,7,100,1,1 msgtypeBan=67,6,100,1,1 diff --git a/data/deftheme/I_O-Light-2.1.9/themedata.kvc b/data/deftheme/I_O-Light-2.1.9/themedata.kvc index 17ac9ed80..7b5c788e6 100644 --- a/data/deftheme/I_O-Light-2.1.9/themedata.kvc +++ b/data/deftheme/I_O-Light-2.1.9/themedata.kvc @@ -50,6 +50,7 @@ msgtypeVoice=35,7,100,1,1 msgtypeMeInviteUnexcept=200,9,100,1,5 msgtypeUserOp=174,7,100,1,1 msgtypeActionCrypted=337,7,100,1,5 +msgtypeOwnActionCrypted=337,7,100,1,5 mirccolor4=130,0,0,255 iccolor6=0,130,0,255 pixmapUserListViewBackground= @@ -78,6 +79,7 @@ uintGlobalWindowOpacityPercent=100 uintTreeWindowListPixmapAlign=0 msgtypeCTCPRequestIgnored=53,6,100,1,1 msgtypeAction=56,7,100,1,5 +msgtypeOwnAction=56,7,100,1,5 msgtypeQuit=58,12,100,1,2 msgtypeCreationTime=93,12,100,1,1 msgtypeOwnPrivmsgCrypted=100,3,100,1,3 @@ -207,6 +209,7 @@ colorTreeWindowListActiveForeground=244,244,244,255 fontNotifier=Monospace,10,5,50 msgtypeURL=185,11,100,1,1 msgtypeTopic=42,6,100,1,5 +msgtypeTopicCrypted=42,6,100,1,5 msgtypeDeop=62,7,100,1,1 msgtypeLimit=66,10,100,1,1 msgtypeBan=67,6,100,1,1 diff --git a/data/deftheme/MinimalDark-2.0.0/themedata.kvc b/data/deftheme/MinimalDark-2.0.0/themedata.kvc index 73f9b5275..28cd33757 100644 --- a/data/deftheme/MinimalDark-2.0.0/themedata.kvc +++ b/data/deftheme/MinimalDark-2.0.0/themedata.kvc @@ -50,6 +50,7 @@ msgtypeVoice=35,9,100,1,1 msgtypeMeInviteUnexcept=200,9,100,1,5 msgtypeUserOp=174,9,100,1,1 msgtypeActionCrypted=337,9,100,1,3 +msgtypeOwnActionCrypted=337,9,100,1,3 mirccolor4=230,0,0,255 iccolor6=0,130,0,255 pixmapUserListViewBackground= @@ -78,6 +79,7 @@ uintGlobalWindowOpacityPercent=100 uintTreeWindowListPixmapAlign=0 msgtypeCTCPRequestIgnored=53,4,100,1,1 msgtypeAction=56,9,100,1,3 +msgtypeOwnAction=56,9,100,1,3 msgtypeQuit=58,10,100,1,2 msgtypeCreationTime=93,15,100,1,1 msgtypeOwnPrivmsgCrypted=100,0,100,1,3 @@ -207,6 +209,7 @@ colorTreeWindowListActiveForeground=0,0,0,255 fontNotifier=Courier%2010%20Pitch,10,5,50 msgtypeURL=185,11,100,1,1 msgtypeTopic=42,15,100,1,1 +msgtypeTopicCrypted=42,15,100,1,1 msgtypeDeop=62,9,100,1,1 msgtypeLimit=66,15,100,1,1 msgtypeBan=67,4,100,1,1 diff --git a/data/pics/coresmall/kcs_ownaction.png b/data/pics/coresmall/kcs_ownaction.png Binary files differnew file mode 100644 index 000000000..1ddeae2f1 --- /dev/null +++ b/data/pics/coresmall/kcs_ownaction.png diff --git a/data/pics/coresmall/kcs_ownactioncrypted.png b/data/pics/coresmall/kcs_ownactioncrypted.png Binary files differnew file mode 100644 index 000000000..cddfb7fe9 --- /dev/null +++ b/data/pics/coresmall/kcs_ownactioncrypted.png diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index 7a4a65afd..05c30d329 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -420,7 +420,9 @@ static const char * g_szIconNames[KviIconManager::IconCount] = { "newproxy", // 336 "actioncrypted", // 337 "topiccrypted", // 338 - "ctcpcrypted" // 339 + "ctcpcrypted", // 339 + "ownaction", // 340 + "ownactioncrypted" // 341 }; KviIconWidget::KviIconWidget() @@ -1630,6 +1632,12 @@ KviIconManager::SmallIcon KviIconManager::iconName(int iIcon) case 339: return KviIconManager::CtcpCrypted; break; + case 340: + return KviIconManager::OwnAction; + break; + case 341: + return KviIconManager::OwnActionCrypted; + break; case 0: case KviIconManager::IconCount: default: diff --git a/src/kvirc/kernel/KviIconManager.h b/src/kvirc/kernel/KviIconManager.h index 9d2b28ad3..7a64db248 100644 --- a/src/kvirc/kernel/KviIconManager.h +++ b/src/kvirc/kernel/KviIconManager.h @@ -506,7 +506,9 @@ public: ActionCrypted = 337, TopicCrypted = 338, CtcpCrypted = 339, - IconCount = 340 + OwnAction = 340, + OwnActionCrypted = 341, + IconCount = 342 }; /** diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index 31df83585..926560816 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -838,7 +838,10 @@ KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS] = { MSGTYPE_OPTION("ChanURL", __tr_no_lookup("Channel URL"), KviIconManager::Url, KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("MemoServ", __tr_no_lookup("MemoServ message"), KviIconManager::MemoServ, KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("Log", __tr_no_lookup("Log message"), KviIconManager::Log, KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("ActionCrypted", __tr_no_lookup("Encrypted user action"), KviIconManager::ActionCrypted, KVI_MSGTYPE_LEVEL_3) + MSGTYPE_OPTION("ActionCrypted", __tr_no_lookup("Encrypted user action"), KviIconManager::ActionCrypted, KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("OwnAction", __tr_no_lookup("Own action"), KviIconManager::OwnAction, KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("OwnActionCrypted", __tr_no_lookup("Own encrypted action"), KviIconManager::OwnActionCrypted, KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("TopicCrypted", __tr_no_lookup("Encrypted topic message"), KviIconManager::TopicCrypted, KVI_MSGTYPE_LEVEL_3), }; static const char * options_section_table[KVI_NUM_OPTION_SECT_FLAGS] = { diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h index 0c53a5f9a..0944891b1 100644 --- a/src/kvirc/kernel/KviOptions.h +++ b/src/kvirc/kernel/KviOptions.h @@ -632,7 +632,7 @@ namespace KviIdentdOutputMode #define KVI_MSGTYPE_OPTIONS_PREFIX "msgtype" #define KVI_MSGTYPE_OPTIONS_PREFIX_LEN 7 -#define KVI_NUM_MSGTYPE_OPTIONS 146 +#define KVI_NUM_MSGTYPE_OPTIONS 149 #define KVI_MIRCCOLOR_OPTIONS_PREFIX "mirccolor" #define KVI_MIRCCOLOR_OPTIONS_PREFIX_LEN 9 diff --git a/src/kvirc/kernel/kvi_out.h b/src/kvirc/kernel/kvi_out.h index 0d66d83e0..c027663b5 100644 --- a/src/kvirc/kernel/kvi_out.h +++ b/src/kvirc/kernel/kvi_out.h @@ -170,7 +170,10 @@ #define KVI_OUT_MEMOSERV 143 #define KVI_OUT_LOG 144 #define KVI_OUT_ACTIONCRYPTED 145 -//#define KVI_NUM_MSGTYPE_OPTIONS 146 +#define KVI_OUT_OWNACTION 146 +#define KVI_OUT_OWNACTIONCRYPTED 147 +#define KVI_OUT_TOPICCRYPTED 148 +//#define KVI_NUM_MSGTYPE_OPTIONS 149 // UPDATE THE TOTAL COUNT IN KviOptions.h !!!! #endif //_KVI_OPTIONS_H_ diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp index a6bf01677..60a130a27 100644 --- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp @@ -1708,7 +1708,7 @@ void KviIrcServerParser::parseLiteralTopic(KviIrcMessage * msg) const char * txtptr; int msgtype; - DECRYPT_IF_NEEDED(chan, msg->safeTrailing(), KVI_OUT_QUERYPRIVMSG, KVI_OUT_QUERYPRIVMSGCRYPTED, szBuffer, txtptr, msgtype) + DECRYPT_IF_NEEDED(chan, msg->safeTrailing(), KVI_OUT_TOPIC, KVI_OUT_TOPICCRYPTED, szBuffer, txtptr, msgtype) QString szTopic = chan->decodeText(txtptr); @@ -1740,7 +1740,7 @@ void KviIrcServerParser::parseLiteralTopic(KviIrcMessage * msg) if(!msg->haltOutput()) { - chan->output(KVI_OUT_TOPIC, + chan->output(msgtype, __tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has changed topic to \"%Q%c\""), &szNick, &szUser, &szHost, &szTopic, KviControlCodes::Reset); } diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp index a53e4df67..025ab8b55 100644 --- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp @@ -607,14 +607,14 @@ void KviIrcServerParser::parseNumericTopic(KviIrcMessage * msg) const char * txtptr; int msgtype; - DECRYPT_IF_NEEDED(chan, msg->safeTrailing(), KVI_OUT_QUERYPRIVMSG, KVI_OUT_QUERYPRIVMSGCRYPTED, szBuffer, txtptr, msgtype) + DECRYPT_IF_NEEDED(chan, msg->safeTrailing(), KVI_OUT_TOPIC, KVI_OUT_TOPICCRYPTED, szBuffer, txtptr, msgtype) QString szTopic = chan->decodeText(txtptr); chan->topicWidget()->setTopic(szTopic); chan->topicWidget()->setTopicSetBy(__tr2qs("(unknown)")); if(KVI_OPTION_BOOL(KviOption_boolEchoNumericTopic) && !msg->haltOutput()) - chan->output(KVI_OUT_TOPIC, __tr2qs("Channel topic is: %Q"), &szTopic); + chan->output(msgtype, __tr2qs("Channel topic is: %Q"), &szTopic); } else { diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp index c2a229f15..0feab15e0 100644 --- a/src/kvirc/ui/KviChannelWindow.cpp +++ b/src/kvirc/ui/KviChannelWindow.cpp @@ -1369,7 +1369,7 @@ void KviChannelWindow::ownAction(const QString & szBuffer) if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c", name.data(), 0x01, szEncrypted.ptr(), 0x01)) return; - output(KVI_OUT_ACTIONCRYPTED, "\r!nc\r%Q\r %Q", &szMyName, &szTmpBuffer); + output(KVI_OUT_OWNACTIONCRYPTED, "\r!nc\r%Q\r %Q", &szMyName, &szTmpBuffer); } break; case KviCryptEngine::Encoded: @@ -1380,7 +1380,7 @@ void KviChannelWindow::ownAction(const QString & szBuffer) // ugly, but we must redecode here QString szRedecoded = decodeText(szEncrypted.ptr()); - output(KVI_OUT_ACTIONCRYPTED, "\r!nc\r%Q\r %Q", &szMyName, &szRedecoded); + output(KVI_OUT_OWNACTIONCRYPTED, "\r!nc\r%Q\r %Q", &szMyName, &szRedecoded); } break; default: @@ -1474,7 +1474,7 @@ void KviChannelWindow::ownAction(const QString & szBuffer) szBuf += connection()->currentNickName(); szBuf += "\r "; szBuf += szTmp.data(); - outputMessage(KVI_OUT_ACTION, szBuf); + outputMessage(KVI_OUT_OWNACTION, szBuf); userAction(connection()->currentNickName(), KVI_USERACTION_ACTION); } else @@ -1497,7 +1497,7 @@ void KviChannelWindow::ownAction(const QString & szBuffer) szBuf += connection()->currentNickName(); szBuf += "\r "; szBuf += szTmpBuffer; - outputMessage(KVI_OUT_ACTION, szBuf); + outputMessage(KVI_OUT_OWNACTION, szBuf); userAction(connection()->currentNickName(), KVI_USERACTION_ACTION); } } diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp index 0d8aefcd6..bbf4303a5 100644 --- a/src/kvirc/ui/KviIrcView.cpp +++ b/src/kvirc/ui/KviIrcView.cpp @@ -758,6 +758,8 @@ bool KviIrcView::messageShouldGoToMessageView(int iMsgType) case KVI_OUT_CHANNELNOTICECRYPTED: case KVI_OUT_ACTION: case KVI_OUT_ACTIONCRYPTED: + case KVI_OUT_OWNACTION: + case KVI_OUT_OWNACTIONCRYPTED: case KVI_OUT_OWNPRIVMSG: case KVI_OUT_OWNPRIVMSGCRYPTED: case KVI_OUT_HIGHLIGHT: diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp index 808e9dc3d..9057844f8 100644 --- a/src/kvirc/ui/KviIrcView_getTextLine.cpp +++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp @@ -1097,6 +1097,8 @@ check_emoticon_char: case KVI_OUT_CHANPRIVMSG: case KVI_OUT_ACTION: case KVI_OUT_ACTIONCRYPTED: + case KVI_OUT_OWNACTION: + case KVI_OUT_OWNACTIONCRYPTED: case KVI_OUT_OWNPRIVMSG: case KVI_OUT_QUERYPRIVMSG: case KVI_OUT_QUERYPRIVMSGCRYPTED: diff --git a/src/kvirc/ui/KviIrcView_loghandling.cpp b/src/kvirc/ui/KviIrcView_loghandling.cpp index 209873ce8..08dd79644 100644 --- a/src/kvirc/ui/KviIrcView_loghandling.cpp +++ b/src/kvirc/ui/KviIrcView_loghandling.cpp @@ -150,6 +150,8 @@ const QString & KviIrcView::lastMessageText() case KVI_OUT_CHANNELNOTICECRYPTED: case KVI_OUT_ACTION: case KVI_OUT_ACTIONCRYPTED: + case KVI_OUT_OWNACTION: + case KVI_OUT_OWNACTIONCRYPTED: case KVI_OUT_OWNPRIVMSG: case KVI_OUT_OWNPRIVMSGCRYPTED: case KVI_OUT_HIGHLIGHT: diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp index e45023604..f64b3bc00 100644 --- a/src/kvirc/ui/KviQueryWindow.cpp +++ b/src/kvirc/ui/KviQueryWindow.cpp @@ -752,7 +752,7 @@ void KviQueryWindow::ownAction(const QString & szBuffer) if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c", name.data(), 0x01, szEncrypted.ptr(), 0x01)) return; - output(KVI_OUT_ACTIONCRYPTED, "\r!nc\r%Q\r %Q", &szMyName, &szTmpBuffer); + output(KVI_OUT_OWNACTIONCRYPTED, "\r!nc\r%Q\r %Q", &szMyName, &szTmpBuffer); } break; case KviCryptEngine::Encoded: @@ -763,7 +763,7 @@ void KviQueryWindow::ownAction(const QString & szBuffer) // ugly, but we must redecode here QString szRedecoded = decodeText(szEncrypted.ptr()); - output(KVI_OUT_ACTIONCRYPTED, "\r!nc\r%Q\r %Q", &szMyName, &szRedecoded); + output(KVI_OUT_OWNACTIONCRYPTED, "\r!nc\r%Q\r %Q", &szMyName, &szRedecoded); } break; default: // also case KviCryptEngine::EncryptError @@ -789,6 +789,6 @@ void KviQueryWindow::ownAction(const QString & szBuffer) if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c", name.data(), 0x01, data.data(), 0x01)) return; - output(KVI_OUT_ACTION, "\r!nc\r%Q\r %Q", &szMyName, &szTmpBuffer); + output(KVI_OUT_OWNACTION, "\r!nc\r%Q\r %Q", &szMyName, &szTmpBuffer); m_pUserListView->userAction(szMyName, KVI_USERACTION_ACTION); } diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp index 19389dab0..b89d04b09 100644 --- a/src/modules/dcc/DccCanvasWindow.cpp +++ b/src/modules/dcc/DccCanvasWindow.cpp @@ -177,7 +177,7 @@ void DccCanvasWindow::ownAction(const char * text) { KviCString buf(KviCString::Format, "%cACTION %s%c\r\n", text); // m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - output(KVI_OUT_ACTION, "%Q %s", &(m_pDescriptor->szLocalNick), text); + output(KVI_OUT_OWNACTION, "%Q %s", &(m_pDescriptor->szLocalNick), text); } bool DccCanvasWindow::event(QEvent * e) diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp index 1af5aa314..f3142d893 100644 --- a/src/modules/dcc/DccChatWindow.cpp +++ b/src/modules/dcc/DccChatWindow.cpp @@ -407,7 +407,7 @@ void DccChatWindow::ownAction(const QString & text) return; KviCString buf(KviCString::Format, "%cACTION %s%c\r\n", 0x01, d, 0x01); m_pSlaveThread->sendRawData(buf.ptr(), buf.len()); - output(KVI_OUT_ACTION, "%Q %Q", &(m_pDescriptor->szLocalNick), &szTmpBuffer); + output(KVI_OUT_OWNACTION, "%Q %Q", &(m_pDescriptor->szLocalNick), &szTmpBuffer); } else { diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp index ea19273fb..0e9246146 100644 --- a/src/modules/dcc/DccVideoWindow.cpp +++ b/src/modules/dcc/DccVideoWindow.cpp @@ -792,7 +792,7 @@ void DccVideoWindow::ownAction(const QString & text) return; KviCString buf(KviCString::Format, "%cACTION %s%c\r\n", 0x01, d, 0x01); m_tmpTextDataOut.append(buf.ptr(), buf.len()); - output(KVI_OUT_ACTION, "%Q %Q", &(m_pDescriptor->szLocalNick), &szTmpBuffer); + output(KVI_OUT_OWNACTION, "%Q %Q", &(m_pDescriptor->szLocalNick), &szTmpBuffer); } else { |
