start(KProcIO::NotifyOnExit,TRUE);
- // ouch
- proc->wait();
- //kdDebug() << "finished " << suCommand << endl;
- if (((bufmv.find("Permission denied"))) != -1){
- KMessageBox::information (this,i18n("Don't have permission to move %1 to the quarantine folder.
").arg(fname));
- }else if (((bufmv.find("No space"))) != -1){
- KMessageBox::information (this,i18n("Don't have enough space to move %1 to the quarantine folder.
").arg(fname));
-
- }else{
- if (recursive_box1->isChecked())
- KMessageBox::queuedMessageBox(0, KMessageBox::Information, i18n("Infected file found:
Filename: %1
Virus found: %2
I'm going to quarantine this file. You can restore it later if you want.
").arg(fname).arg(TQString(virusname).replace("FOUND","")),
- //i18n( "Infected File Found!" ),
- //i18n( "Quarantine" )
- 0);
-
- if (lastQuarItems.contains(object))
- lastQuarItems.remove(object);
- lastQuarItems.prepend(object);
- CollectionDB::instance()->insertEvent("Quarantine",virusname,fname);
- }
- }else{
- //kdDebug() << "rename worked" << endl;
- if (recursive_box1->isChecked())
- KMessageBox::queuedMessageBox(0, KMessageBox::Information, i18n("Infected file found:
Filename: %1
Virus found: %2
I'm going to quarantine this file. You can restore it later if you want.
If the file already exists in the quarantine directory it will be overwritten.
").arg(fname).arg(TQString(virusname).replace("FOUND","")),
- //i18n( "Infected File Found!" ),
- //i18n( "Quarantine" )
- 0);
-
- if (lastQuarItems.contains(object))
- lastQuarItems.remove(object);
- lastQuarItems.prepend(object);
- CollectionDB::instance()->insertEvent("Quarantine",virusname,fname);
- }
- }
-
- config->writeEntry(TQString("Items %1").arg(quarloc), lastQuarItems);
- //config->sync();
-
- //tdemain->kuarantine->refresh();
- //kdDebug() << "finished klamd quar" << endl;
-}
-
-void Klamd::receivedmvOutput(KProcIO *)
-{
- //kdDebug() << "in receivedmvoutput" << endl;
-
- mvbuffer = "";
- proc->readln(mvbuffer);
- bufmv += TQString(mvbuffer);
-}
-
-
-
-int Klamd::runDazuko(bool caller){
-
-
- dazukoLoaded = FALSE;
- TQString lsmodCommand="lsmod";
- lsmodproc = new KProcIO();
- TQString curpath = (TQString) getenv("PATH");
- lsmodproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin");
-
-
- lsmodproc->setUseShell(TRUE);
- *lsmodproc<start(KProcIO::NotifyOnExit,TRUE);
-
- if (!(succ))
- KMessageBox::information (this,i18n( "There was a problem detecting the loaded status of dazuko.") );
- return 1;
-}
-
-void Klamd::lsmodOutput()
-{
- if (!(dazukoLoaded)){
- int result;
- result = KMessageBox::warningContinueCancel(this, i18n( "I need to load a module called 'dazuko' first. This module will allow KlamAV to gain real-time access to files. If you don't want this message to appear in future, put the following command in your initialization scripts: 'modprobe dazuko.o'. You will next be asked for the root password."),
- i18n( "Load Module" ),
- i18n( "Load Module" ),
- i18n( "Delete2" ));
- switch (result) {
- case 2 : KMessageBox::information (this,i18n( "Loading of Module Cancelled.") ); break;
- case 5 : loadDazuko(); break;
- }
-
- }else{
- loadKlamd();
- }
-
-
-}
-
-void Klamd::loadKlamd()
-{
- writeConf();
-
- klamdAlive = TRUE;
-
- //TQString suCommand=TQString("tdesu -t -c '" +clamdcommand+" -c '%1'").arg(tempFileName)+"'";
- TQString suCommand=TQString(clamdcommand+" -c '%1'").arg(tempFileName);
- childproc = new KProcIO();
- childproc->setUseShell(TRUE);
- childproc->setUsePty (KProcIO::Stdout,TRUE);
- TQString curpath = (TQString) getenv("PATH");
- childproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin");
-
- kdDebug() << suCommand << endl;
-
- *childproc<start(KProcIO::NotifyOnExit);
- connect( childproc, SIGNAL(processExited(TDEProcess *)),
- SLOT(childExited()) );
-
- search_button->setEnabled(false);
- cancel_button->setEnabled(true);
-
-/* if (tdemain->freshklam->isFreshklamAlive())
- tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamavdl"));
- else*/
- tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav"));
- tdemain->EnableKlamd->setEnabled(FALSE);
- tdemain->DisableKlamd->setEnabled(TRUE);
- //config = TDEGlobal::config();
- config->setGroup("Klamd");
- config->writeEntry("Enabled", "Yes");
- config->sync();
- disableInputs();
-
- CollectionDB::instance()->insertEvent("Auto-Scan","Scanning Started","");
-
-}
-void Klamd::loadDazuko()
-{
-
-// struct utsname info;
-//
-// if (uname(&info) == -1)
-// {
-// kdError(0) << "uname() failed: errno = " << errno << endl;
-// return;
-// }
-//
-// TQString release = TQString(info.release);
-//
-// //kdDebug() << release << endl;
-// TQString insmodCommand="insmod /lib/modules/" + release + "/dazuko.o";
- TQString insmodCommand="modprobe dazuko";
- //TQString insmodCommand="insmod /opt/kde/bin/dazuko.o";
- KProcIO *insmodproc = new KProcIO();
-
- TQString curpath = (TQString) getenv("PATH");
- insmodproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin");
-
- insmodproc->setUseShell(TRUE);
- *insmodproc<<"tdesu -i klamav"<<"-c"<start(KProcIO::NotifyOnExit);
-}
-
-void Klamd::moduleLoaded()
-{
- runDazuko(false);
-
-}
-
-void Klamd::lsmodCheck()
-{
- if (!(dazukoLoaded)){
- KMessageBox::information (this,i18n( "Dazuko was not loaded successfully. Please check your installation." ));
- }else{
- int result;
- result = KMessageBox::warningContinueCancel(this, i18n( "Module has been loaded. Will now continue to start up real-time scanning."),
- i18n( "Continue" ),
- i18n( "Continue" ),
- i18n( "Delete2" ));
- switch (result) {
- case 2 : break;
- case 5 : loadKlamd();break;
- }
- }
-
-
-}
-
-void Klamd::checkForDazuko()
-{
- TQString item = "";
- int pos;
- pos = lsmodproc->readln(item,TRUE);
- //KMessageBox::information (this,item);
- if (pos != -1) {
- //KMessageBox::information (this,item);
- if ((pos = (item.find("dazuko"))) != -1){
- //KMessageBox::information (this,"found dazuko");
- dazukoLoaded = TRUE;
- lsmodproc->kill();
- }
- lsmodproc->ackRead();
- }
-}
-
-void Klamd::restoreKlamd(){
-
- config = TDEGlobal::config();
- config->setGroup("Klamd");
- TQString RunKlamd = config->readEntry("Enabled");
-
- if (RunKlamd == "Yes"){
- startKlamd();
- }
-
-}
-
-void Klamd::handleChecks(){
-
- //config = TDEGlobal::config();
- config->setGroup("Klamd");
- if (recursive_box->isChecked())
- config->writeEntry("Quarantine","Yes");
- else
- config->writeEntry("Quarantine","No");
-
- if (recursive_box1->isChecked())
- config->writeEntry("Warn","Yes");
- else
- config->writeEntry("Warn","No");
-
- if (recursive_box2->isChecked())
- config->writeEntry("Run Docked","Yes");
- else
- config->writeEntry("Run Docked","No");
-
- config->sync();
-
-}
-
-bool Klamd::isKlamdAlive(){
- if (klamdAlive)
- return true;
- return false;
-
-}
-
-TQString Klamd::getKlamdConfFile(){
- return tempFileName;
-
-}
-
-void Klamd::slotAdvOptions(){
-
-/* config = TDEGlobal::config();
- config->setGroup("Klamd");
- TQString RunKlamd = config->readEntry("Enabled");
-
- KlamdOptions *dialog = new KlamdOptions( this, "settings");
-
-// connect( dialog, SIGNAL(settingsChanged()), SLOT(applySettings()) );
-
-
- dialog->show();
- dialog->raise();
- dialog->setActiveWindow();*/
-
- tdemain->slotConfigKlamav( "Auto-Scan" );
-
-}
-
-void Klamd::disableInputs(){
-
- hlp->setEnabled(false);
- hlp2->setEnabled(false);
- hlp3->setEnabled(false);
-}
-
-void Klamd::enableInputs(){
-
- hlp->setEnabled(true);
- hlp2->setEnabled(true);
- hlp3->setEnabled(true);
-
-}
-
-#include "klamd.moc"
diff --git a/src/klamd.h b/src/klamd.h
deleted file mode 100644
index e909d49..0000000
--- a/src/klamd.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2004 Robert Hogan
- */
-
-#ifndef _KLAMD_H_
-#define _KLAMD_H_
-
-#ifdef HAVE_CONFIG_H
-#include
-#endif
-
-#include
-#include
-#include
-#include
-#include "tdefiletreeview.h"
-
-
-
-class KPrinter;
-class TDEToggleAction;
-class KURL;
-class TQLineEdit;
-class TQComboBox;
-class TQCheckBox;
-class TQListBox;
-class TQPushButton;
-class TQLabel;
-class TDEProcess;
-class TDEConfig;
-class KURLRequester;
-class K3bFileTreeView;
-class KArrowButton;
-class KProcIO;
-class KSystemTray;
-
-class MyListBox : public TQListBox
-{
-
-public:
- MyListBox(TQWidget *parent) : TQListBox(parent) {}
- bool isItemVisible(int id) { return itemVisible(id); }
-};
-
-/**
- * This class serves as the main window for Klamd. It handles the
- * menus, toolbars, and status bars.
- *
- * @short Main window class
- * @author $AUTHOR <$EMAIL>
- * @version $APP_VERSION
- */
-class Klamd : public TQWidget
-{
- Q_OBJECT
-public:
- /**
- * Default Constructor
- */
- Klamd(TQWidget *parent, const char *name=0);
-
- /**
- * Default Destructor
- */
- virtual ~Klamd();
-
- /**
- * Use this method to load whatever file/URL you have
- */
- void setDirName(TQString);
- bool isKlamdAlive();
- TQString getKlamdConfFile();
-
-public slots:
- bool startKlamd();
- void slotCancel();
-
-protected:
- /**
- * Overridden virtuals for TQt drag 'n drop (XDND)
- */
- /*virtual void dragEnterEvent(TQDragEnterEvent *event);
- virtual void dropEvent(TQDropEvent *event);*/
-
-protected:
- /**
- * This function is called when it is time for the app to save its
- * properties for session management purposes.
- */
- //void saveProperties(TDEConfig *);
-
- /**
- * This function is called when this app is restored. The TDEConfig
- * object points to the session management config file that was saved
- * with @ref saveProperties
- */
- //void readProperties(TDEConfig *);
-
-
-public:
-private:
- void setupAccel();
- void setupActions();
-
-private:
- //KlamdView *m_view;
-
- /* KPrinter *m_printer;
- TDEToggleAction *m_toolbarAction;
- TDEToggleAction *m_statusbarAction;*/
-
-
-signals:
- void itemSelected(TQString abs_filename, int line);
-
-
-
-private slots:
- //void dirButtonClicked();
- //void templateActivated(int index);
- void childExited();
- void receivedOutput(KProcIO *);
- //void itemSelected(const TQString&);
- void slotClear();
- void slotAddIncludeDir();
- void slotAddExcludeDir();
- void slotDelIncludeDir();
- void slotDelExcludeDir();
- void writeConf();
- void Quarantine(TQString fname, TQString virusname);
- void restoreKlamd();
- void handleChecks();
- void checkForDazuko();
- void loadDazuko();
- void lsmodOutput();
- void lsmodCheck();
- void moduleLoaded();
- void receivedmvOutput(KProcIO *);
- void slotAdvOptions();
-
- //void patternTextChanged( const TQString &);
-private:
- void processOutput();
- void finish();
- void getout();
- int runDazuko(bool caller);
- void loadKlamd();
- void enableInputs();
- void disableInputs();
- TQLineEdit *template_edit;
- TQComboBox *files_combo, *pattern_combo/*, *dir_combo*/;
- KURLRequester *dir_combo;
- TQCheckBox *recursive_box;
- TQCheckBox *recursive_box1;
- TQCheckBox *recursive_box2;
- TQListBox *resultbox;
- TQLabel *status_label, *matches_label;
- KProcIO *childproc;
- KProcIO *proc;
- KProcIO *lsmodproc;
- TQString buf, bufmv, mvbuffer;
- TDEConfig* config;
- TQStringList lastSearchItems;
- TQStringList lastSearchPaths;
- TQStringList lastQuarItems;
- TQListView* table;
- MyListBox *sessionslb;
- KArrowButton *btnup, *btndown;
- KFileTreeView* m_fileTreeView;
- KFileTreeBranch* treeBranch;
- MyListBox *sessionslb2;
- KArrowButton *btnup2, *btndown2;
- KFileTreeView* m_fileTreeView2;
- KFileTreeBranch* treeBranch2;
- TQString tempFileName;
- TQComboBox *check_combo;
- TQComboBox *check_combo2;
- TQString item2;
- TQStringList includePaths;
- TQStringList excludePaths;
- bool dazukoLoaded;
- bool klamdAlive;
- TQWidget *parent;
- TQString tmpit;
- TQString clamdcommand;
- //TQPushButton *adv_options;
- TQWidget *hlp;
- TQWidget *hlp2;
- TQWidget *hlp3;
-public:
- TQPushButton *search_button, *cancel_button;
-
-
-};
-
-#endif // _Klamd_H_
diff --git a/src/klamdoptions.cpp b/src/klamdoptions.cpp
deleted file mode 100644
index a2b53a5..0000000
--- a/src/klamdoptions.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'klamdoptions.ui'
-**
-** Created: Sun Mar 6 14:20:47 2005
-** by: The User Interface Compiler ($Id: klamdoptions.cpp,v 1.1.1.1 2006/02/03 20:35:02 hoganrobert Exp $)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "klamdoptions.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-const char *check_desc3[] = {
- "1",
- "2",
- "3",
- "4",
- "5",
- 0
-};
-
-/*
- * Constructs a KlamdOptions as a child of 'parent', with the
- * name 'name' and widget flags set to 'f'.
- *
- * The dialog will by default be modeless, unless you set 'modal' to
- * TRUE to construct a modal dialog.
- */
-KlamdOptions::KlamdOptions( TQWidget* parent, const char* name, bool modal, WFlags fl )
- : TQDialog( parent, name, modal, fl )
-{
- if ( !name )
- setName( "KlamdOptions" );
- setModal( TRUE );
-
- OK = new KPushButton( this, "OK" );
- OK->setGeometry( TQRect( 80, 220, 86, 31 ) );
- OK->setDefault( TRUE );
-
- connect( OK, SIGNAL(clicked()),
- SLOT(updateSettings()) );
-
- Cancel = new KPushButton( this, "Cancel" );
- Cancel->setGeometry( TQRect( 180, 220, 86, 31 ) );
- Cancel->setDefault( FALSE );
-
- connect( Cancel, SIGNAL(clicked()),
- SLOT(close()) );
-
- AdvOptions = new KDialog( this, "AdvOptions" );
- AdvOptions->setGeometry( TQRect( 590, 470, 20, 20 ) );
-
- TQWidget* privateLayoutWidget = new TQWidget( this, "layout7" );
- privateLayoutWidget->setGeometry( TQRect( 10, 10, 333, 200 ) );
- layout7 = new TQGridLayout( privateLayoutWidget, 1, 1, 11, 6, "layout7");
-
- Archives = new TQGroupBox( privateLayoutWidget, "Archives" );
-
- MaxSize = new TQComboBox( FALSE, Archives, "MaxSize" );
- MaxSize->insertStrList(check_desc3);
- MaxSize->adjustSize();
-
- MaxSize->setGeometry( TQRect( 170, 20, 40, 21 ) );
-
- ScanArchives = new TQCheckBox( Archives, "ScanArchives" );
- ScanArchives->setGeometry( TQRect( 20, 20, 150, 21 ) );
- connect( ScanArchives, SIGNAL(toggled(bool)),MaxSize,
- SLOT(setEnabled(bool)) );
-
- textLabel1 = new TQLabel( Archives, "textLabel1" );
- textLabel1->setGeometry( TQRect( 230, 20, 70, 21 ) );
-
- layout7->addWidget( Archives, 1, 0 );
-
- ScanFilesWhen = new TQGroupBox( privateLayoutWidget, "ScanFilesWhen" );
-
- TQWidget* privateLayoutWidget_2 = new TQWidget( ScanFilesWhen, "layout6" );
- privateLayoutWidget_2->setGeometry( TQRect( 20, 20, 140, 60 ) );
- layout6 = new TQGridLayout( privateLayoutWidget_2, 1, 1, 11, 6, "layout6");
-
- Created = new TQCheckBox( privateLayoutWidget_2, "Created" );
-
- layout6->addWidget( Created, 0, 0 );
- connect( Created, SIGNAL(clicked()),
- SLOT(warn()) );
-
- Executed = new TQCheckBox( privateLayoutWidget_2, "Executed" );
-
- layout6->addWidget( Executed, 2, 0 );
-
- TQWidget* privateLayoutWidget_3 = new TQWidget( ScanFilesWhen, "layout7" );
- privateLayoutWidget_3->setGeometry( TQRect( 181, 20, 90, 60 ) );
- layout7_2 = new TQGridLayout( privateLayoutWidget_3, 1, 1, 11, 6, "layout7_2");
-
- Opened = new TQCheckBox( privateLayoutWidget_3, "Opened" );
-
- layout7_2->addWidget( Opened, 0, 0 );
-
- Closed = new TQCheckBox( privateLayoutWidget_3, "Closed" );
-
- layout7_2->addWidget( Closed, 1, 0 );
-
- connect( Created, SIGNAL(toggled(bool)),Opened,
- SLOT(setDisabled(bool)) );
- connect( Created, SIGNAL(toggled(bool)),Closed,
- SLOT(setDisabled(bool)) );
-
- layout7->addWidget( ScanFilesWhen, 0, 0 );
- languageChange();
- resize( TQSize(351, 270).expandedTo(minimumSizeHint()) );
- clearWState( WState_Polished );
-
- fetchSettings();
-}
-
-/*
- * Destroys the object and frees any allocated resources
- */
-KlamdOptions::~KlamdOptions()
-{
- // no need to delete child widgets, TQt does it all for us
-}
-
-/*
- * Sets the strings of the subwidgets using the current
- * language.
- */
-void KlamdOptions::languageChange()
-{
- setCaption( tr( "Advanced Options" ) );
- OK->setText( tr( "OK" ) );
- Cancel->setText( tr( "Cancel" ) );
- Archives->setTitle( tr( "Archives" ) );
- ScanArchives->setText( tr( "Scan Archives up to" ) );
- textLabel1->setText( tr( "MB in size" ) );
- ScanFilesWhen->setTitle( tr( "Scan Files When They Are:" ) );
- Created->setText( tr( "Created/Modified" ) );
- Executed->setText( tr( "Executed" ) );
- Opened->setText( tr( "Opened" ) );
- Closed->setText( tr( "Closed" ) );
-}
-
-void KlamdOptions::updateSettings()
-{
- TDEConfig* config = TDEGlobal::config();
- config->setGroup("Klamd");
-
- config->writeEntry("Enabled", "No");
-
- if (Created->isChecked())
- config->writeEntry("Created", "Yes");
- else
- config->writeEntry("Created", "No");
-
- if (Executed->isChecked())
- config->writeEntry("Executed", "Yes");
- else
- config->writeEntry("Executed", "No");
-
- if (Opened->isChecked())
- config->writeEntry("Opened", "Yes");
- else
- config->writeEntry("Opened", "No");
-
- if (Closed->isChecked())
- config->writeEntry("Closed", "Yes");
- else
- config->writeEntry("Closed", "No");
-
- if (ScanArchives->isChecked()){
- config->writeEntry("ScanArchives", "Yes");
- config->writeEntry("MaxSize", MaxSize->currentText());
- }else
- config->writeEntry("ScanArchives", "No");
-
- config->sync();
- close();
-}
-
-void KlamdOptions::fetchSettings()
-{
- config = TDEGlobal::config();
- config->setGroup("Klamd");
-
-
- if (config->readEntry("Executed") == "Yes")
- Executed->setChecked(true);
- else
- Executed->setChecked(false);
-
- if (config->readEntry("Opened") == "Yes")
- Opened->setChecked(true);
- else
- Opened->setChecked(false);
-
- if (config->readEntry("Closed") == "Yes")
- Closed->setChecked(true);
- else
- Closed->setChecked(false);
-
- if (config->readEntry("Created") == "Yes"){
- Created->setChecked(true);
- Opened->setEnabled(false);
- Closed->setEnabled(false);
- }else
- Created->setChecked(false);
-
- if (config->readEntry("ScanArchives") == "Yes"){
- ScanArchives->setChecked(true);
- MaxSize->setEnabled(true);
- MaxSize->setCurrentText(config->readEntry("MaxSize"));
- }else{
- ScanArchives->setChecked(false);
- MaxSize->setEnabled(false);
-
- }
-
-
-}
-
-void KlamdOptions::warn()
-{
-
- if (Created->isChecked()){
- KMessageBox::information (this,i18n("This option allows for faster, more usable auto-scanning. It is experimental, however, and there are some potential security risks. For more information, see http://klamav.sourceforge.net/index.php?content=ka_security_notes
"),"Warning","show");
- }
-
-
-}
-
-#include "klamdoptions.moc"
diff --git a/src/klamdoptions.h b/src/klamdoptions.h
deleted file mode 100644
index 7f5d658..0000000
--- a/src/klamdoptions.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'klamdoptions.ui'
-**
-** Created: Sun Mar 6 14:20:47 2005
-** by: The User Interface Compiler ($Id: klamdoptions.h,v 1.1.1.1 2006/02/03 20:35:04 hoganrobert Exp $)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#ifndef KLAMDOPTIONS_H
-#define KLAMDOPTIONS_H
-
-#include
-#include
-
-class TQVBoxLayout;
-class TQHBoxLayout;
-class TQGridLayout;
-class TQSpacerItem;
-class KPushButton;
-class KDialog;
-class TQGroupBox;
-class TQComboBox;
-class TQCheckBox;
-class TQLabel;
-class TDEConfig;
-
-class KlamdOptions : public TQDialog
-{
- Q_OBJECT
-
-public:
- KlamdOptions( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
- ~KlamdOptions();
-
- KPushButton* OK;
- KPushButton* Cancel;
- KDialog* AdvOptions;
- TQGroupBox* Archives;
- TQComboBox* MaxSize;
- TQCheckBox* ScanArchives;
- TQLabel* textLabel1;
- TQGroupBox* ScanFilesWhen;
- TQCheckBox* Created;
- TQCheckBox* Executed;
- TQCheckBox* Opened;
- TQCheckBox* Closed;
- TDEConfig* config;
-private:
-
- void fetchSettings();
-
-private slots:
- void updateSettings();
- void warn();
-
-protected:
- TQGridLayout* layout7;
- TQGridLayout* layout6;
- TQGridLayout* layout7_2;
-
-protected slots:
- virtual void languageChange();
-
-};
-
-#endif // KLAMDOPTIONS_H
diff --git a/src/klamscan.cpp b/src/klamscan.cpp
index 16de3c8..e0d9419 100644
--- a/src/klamscan.cpp
+++ b/src/klamscan.cpp
@@ -4,7 +4,6 @@
#include "klamscan.h"
#include "klamav.h"
-#include "klamd.h"
#include "klamscanoptions.h"
#include "schedule.h"
#include "directorylist.h"
@@ -379,10 +378,7 @@ void Klamscan::scanURLs(const TQString &urls)
void Klamscan::slotStopScanning(){
- 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"));
////kdDebug() << tabBrowser->currentPage()->name() << endl;
ScanViewer* cur = static_cast(tabBrowser->currentPage());
@@ -408,10 +404,7 @@ void Klamscan::slotStartAgain(){
void Klamscan::slotRemoveTab(){
- 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"));
////kdDebug() << tabBrowser->currentPage()->name() << endl;
if (tabBrowser->currentPageIndex() != 0){
slotStopScanning();
diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp
index c9c60f0..ca2df18 100644
--- a/src/scanviewer.cpp
+++ b/src/scanviewer.cpp
@@ -8,7 +8,6 @@
#include "directorylist.h"
#include "dbviewer.h"
#include "collectiondb.h"
-#include "klamd.h"
#include
#include "klamavconfig.h"
@@ -594,10 +593,7 @@ void ScanViewer::slotCancel()
void ScanViewer::resetSysTray()
{
- 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"));
}
void ScanViewer::childExited()
@@ -750,12 +746,9 @@ void ScanViewer::Quarantine(){
}
}
- if (allQuarantined) {
- if (tdemain->klamd->isKlamdAlive())
- tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_enabled"));
- else
+ if (allQuarantined)
tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
- }else
+ else
tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found"));
config->writeEntry(TQString("Items %1").arg(quarloc), lastQuarItems);
config->sync();