diff options
Diffstat (limited to 'src/modules/notifier')
| -rw-r--r-- | src/modules/notifier/libkvinotifier.cpp | 4 | ||||
| -rw-r--r-- | src/modules/notifier/notifierwindow.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp index 7a14610ab..24f547f15 100644 --- a/src/modules/notifier/libkvinotifier.cpp +++ b/src/modules/notifier/libkvinotifier.cpp @@ -248,7 +248,7 @@ static bool notifier_kvs_cmd_show(KviKvsModuleCommandCall * c) static bool notifier_kvs_fnc_isEnabled(KviKvsModuleFunctionCall * c) { bool bCheck; - if(KVI_OPTION_BOOL(KviOption_boolForciblyDisableNotifier)) + if(!KVI_OPTION_BOOL(KviOption_boolEnableNotifier)) bCheck=false; else bCheck=g_tNotifierDisabledUntil < kvi_unixTime(); @@ -301,7 +301,7 @@ static bool notifier_module_ctrl(KviModule *,const char *operation,void *param) g_pNotifierWindow = new KviNotifierWindow(); g_pNotifierWindow->addMessage(p->pWindow,p->szIcon,p->szMessage,p->uMessageLifetime); - g_pNotifierWindow->doShow(KVI_OPTION_BOOL(KviOption_boolDisableNotifierFadein)?false:true); + g_pNotifierWindow->doShow(KVI_OPTION_BOOL(KviOption_boolNotifierFading)? true : false); return true; } diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index f2c50b792..8d9d21c87 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -280,7 +280,7 @@ void KviNotifierWindow::computeRect() void KviNotifierWindow::doShow(bool bDoAnimate) { - if(KVI_OPTION_BOOL(KviOption_boolForciblyDisableNotifier))return; + if(!KVI_OPTION_BOOL(KviOption_boolEnableNotifier))return; kvi_time_t tNow = kvi_unixTime(); if(g_tNotifierDisabledUntil > tNow)return; @@ -541,7 +541,7 @@ void KviNotifierWindow::startBlinking() stopBlinkTimer(); m_bBlinkOn = false; - if(!KVI_OPTION_BOOL(KviOption_boolDisableNotifierFlashing)) + if(KVI_OPTION_BOOL(KviOption_boolNotifierFlashing)) { m_pBlinkTimer = new QTimer(); connect(m_pBlinkTimer,SIGNAL(timeout()),this,SLOT(blink())); @@ -1267,7 +1267,7 @@ void KviNotifierWindow::disableUntilKVIrcRestarted() void KviNotifierWindow::disablePermanently() { - KVI_OPTION_BOOL(KviOption_boolForciblyDisableNotifier) = true; + KVI_OPTION_BOOL(KviOption_boolEnableNotifier) = false; hideNow(); } |