aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/ident
diff options
context:
space:
mode:
authorGravatar Alexey Uzhva2007-04-05 21:19:45 +0000
committerGravatar Alexey Uzhva2007-04-05 21:19:45 +0000
commit8d0460d3e3dfac1557d320103eb76a2b2fd9990f (patch)
treee0eb21e023473f0f58dfd8eb7b96f7df8e70ff1a /src/modules/ident
parentImplemented easy migration from mIRC - loading mIRC servers, personal info an... (diff)
downloadKVIrc-8d0460d3e3dfac1557d320103eb76a2b2fd9990f.tar.gz
KVIrc-8d0460d3e3dfac1557d320103eb76a2b2fd9990f.tar.bz2
KVIrc-8d0460d3e3dfac1557d320103eb76a2b2fd9990f.zip
Added option to configure identd output mode
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@464 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/ident')
-rw-r--r--src/modules/ident/libkviident.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 3e8acef5a..4c3690297 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -81,41 +81,47 @@ KviIdentSentinel::~KviIdentSentinel()
bool KviIdentSentinel::event(QEvent *e)
{
+ if(KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)==KviIdentdOutputMode::Quiet || !g_pActiveWindow)
+ return QObject::event(e);
+
+ KviWindow * pTarget = KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)==KviIdentdOutputMode::ToActiveWindow ?
+ (KviWindow *)g_pActiveWindow : (KviWindow *)g_pApp->activeConsole();
+
if(e->type() == KVI_THREAD_EVENT)
{
if(((KviThreadEvent *)e)->id() == KVI_THREAD_EVENT_DATA)
{
KviIdentMessageData * d = ((KviThreadDataEvent<KviIdentMessageData> *)e)->getData();
- if(g_pActiveWindow)
+ if(pTarget)
{
if(d->szHost.hasData())
{
if(d->szAux.hasData())
{
if(_OUTPUT_PARANOIC)
- g_pActiveWindow->output(KVI_OUT_IDENT,__tr("%s (%s) (%s:%u)"),d->szMessage.ptr(),d->szAux.ptr(),d->szHost.ptr(),d->uPort);
+ pTarget->output(KVI_OUT_IDENT,__tr("%s (%s) (%s:%u)"),d->szMessage.ptr(),d->szAux.ptr(),d->szHost.ptr(),d->uPort);
else
- g_pActiveWindow->output(KVI_OUT_IDENT,__tr("%s (%s)"),d->szMessage.ptr(),d->szAux.ptr());
+ pTarget->output(KVI_OUT_IDENT,__tr("%s (%s)"),d->szMessage.ptr(),d->szAux.ptr());
} else {
if(_OUTPUT_PARANOIC)
- g_pActiveWindow->output(KVI_OUT_IDENT,__tr("%s (%s:%u)"),d->szMessage.ptr(),d->szHost.ptr(),d->uPort);
+ pTarget->output(KVI_OUT_IDENT,__tr("%s (%s:%u)"),d->szMessage.ptr(),d->szHost.ptr(),d->uPort);
else
- g_pActiveWindow->output(KVI_OUT_IDENT,__tr("%s"),d->szMessage.ptr());
+ pTarget->output(KVI_OUT_IDENT,__tr("%s"),d->szMessage.ptr());
}
} else {
- g_pActiveWindow->output(KVI_OUT_IDENT,__tr("[IDENT]: %s"),d->szMessage.ptr());
+ pTarget->output(KVI_OUT_IDENT,__tr("[IDENT]: %s"),d->szMessage.ptr());
}
}
delete d;
} else if(((KviThreadEvent *)e)->id() == KVI_IDENT_THREAD_EVENT_EXITING)
{
if(_OUTPUT_VERBOSE)
- if(g_pActiveWindow)g_pActiveWindow->outputNoFmt(KVI_OUT_IDENT,__tr("Shutting down identd service (spontaneous action)"));
+ if(pTarget)pTarget->outputNoFmt(KVI_OUT_IDENT,__tr("Shutting down identd service (spontaneous action)"));
stopIdentService();
} else if(((KviThreadEvent *)e)->id() == KVI_IDENT_THREAD_EVENT_EXITING_ON_REQUEST)
{
if(_OUTPUT_VERBOSE)
- if(g_pActiveWindow)g_pActiveWindow->outputNoFmt(KVI_OUT_IDENT,__tr("Shutting down identd service (requesetd action)"));
+ if(pTarget)pTarget->outputNoFmt(KVI_OUT_IDENT,__tr("Shutting down identd service (requesetd action)"));
}
return true;