summaryrefslogtreecommitdiffstats
path: root/src/freshklam.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/freshklam.cpp')
-rw-r--r--src/freshklam.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/freshklam.cpp b/src/freshklam.cpp
index 7f279e2..a00db74 100644
--- a/src/freshklam.cpp
+++ b/src/freshklam.cpp
@@ -5,7 +5,6 @@
#include "freshklam.h"
#include "klamav.h"
-#include "klamd.h"
#include "collectiondb.h"
/*#include "gmanedb.h"*/
#include "klamavconfig.h"
@@ -362,17 +361,7 @@ void Freshklam::slotSearch()
command += pidFileName;
freshklamAlive = TRUE;
}
-
- if (!(TDEApplication::kApplication()->isRestored())){
- if (tdemain->klamd->isKlamdAlive()){
- TQString klamdconf = tdemain->klamd->getKlamdConfFile();
- ////kdDebug() << klamdconf << endl;
- command += " --daemon-notify=";
- command += klamdconf;
- }
- }
-
writeConf();
command += " --config-file=";
command += tempFileName;
@@ -391,11 +380,6 @@ void Freshklam::slotSearch()
connect( childproc, SIGNAL(receivedStdout(TDEProcess *, char *, int)),
SLOT(receivedOutput(TDEProcess *, char *, int)) );
-// if (tdemain->klamd->isKlamdAlive())
-// tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl"));
-// else
-// tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavbwdl"));
-
tdemain->EnableFreshklam->setEnabled(FALSE);
tdemain->DisableFreshklam->setEnabled(TRUE);
@@ -407,10 +391,7 @@ void Freshklam::finish()
cancel_button->setEnabled(false);
enableInputs();
- if (tdemain->klamd->isKlamdAlive())
- tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
- else
- tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
+ tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
buf += '\n';
processOutput();