Removed Klamd and Dazuko/Clamuko/Klamd-related code.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

1 files changed, 3 insertions, 54 deletions

diff --git a/src/klamav.cpp b/src/klamav.cpp
index b104c21..3edb449 100644
--- a/src/klamav.cpp
+++ b/src/klamav.cpp
@@ -4,7 +4,6 @@
 
 #include "klamav.h"
 #include "freshklam.h"
-#include "klamd.h"
 #include "sigtool.h"
 #include "klamscan.h"
 #include "kuarantine.h"
@@ -51,24 +50,18 @@ Klamav::Klamav()
 	connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown()));
 	
 	TDEPopupMenu *conf_menu = _tray->contextMenu();
-    EnableKlamd = new TDEAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable");
-    DisableKlamd = new TDEAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable");
         
 	EnableFreshklam = new TDEAction(i18n("&Enable Auto-Updates"), "klamav", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable");
     DisableFreshklam = new TDEAction(i18n("&Disable Auto-Updates"),"klamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable");
 
 	EnableFreshklam->plug(conf_menu);
 	DisableFreshklam->plug(conf_menu);
-	EnableKlamd->plug(conf_menu);
-	DisableKlamd->plug(conf_menu);
 	
 	TQToolTip::add( _tray, i18n( "KlamAV - Virus Protection for KDE" ) );
 	_tray->show();
 	
 	DisableFreshklam->setEnabled(FALSE);
 	EnableFreshklam->setEnabled(TRUE);
-	DisableKlamd->setEnabled(FALSE);
-	EnableKlamd->setEnabled(TRUE);
 
         TDEConfig* config = TDEGlobal::config();
         config->setGroup("Freshklam");
@@ -87,13 +80,6 @@ Klamav::Klamav()
 	klamscan = new Klamscan(this);
 	tab->addTab(klamscan, i18n("&Scan"));
 
-	klamd = new Klamd(this);
-	tab->addTab(klamd, i18n("&Auto-Scan"));
-
-	connect(klamd->search_button,SIGNAL(clicked()),SLOT(contextEnable()));
-	connect(klamd->cancel_button,SIGNAL(clicked()),SLOT(contextDisable()));
-
-		
 	freshklam = new Freshklam(this);
 	tab->addTab(freshklam, i18n("&Update"));
 
@@ -126,17 +112,6 @@ Klamav::Klamav()
 	KStdAction::quit(this, SLOT(shuttingDown()), actionCollection());
   
   	if (TDEApplication::kApplication()->isRestored()){
-/*		config = TDEGlobal::config();
-		config->setGroup("Klamd");
-		TQString RunKlamd = config->readEntry("Enabled");
-		
-		if (RunKlamd == "Yes"){
-			_tray->setPixmap(KSystemTray::loadIcon("klamav"));
-			DisableKlamd->setEnabled(TRUE);
-			EnableKlamd->setEnabled(FALSE);
-
-		}
-*/
 		hide();
 	}else{
 		show();
@@ -169,10 +144,10 @@ void  Klamav::shuttingDown(){
 }
 
 bool Klamav::queryClose() {
-	if ((klamd->isKlamdAlive()) || (freshklam->isFreshklamAlive())){
+	if ( freshklam->isFreshklamAlive() ){
         KMessageBox::information (this,i18n("<p>KlamAV will stay open in the system tray. <br><br>"
-        " <b>Remember</b> - you can't close KlamAV while <br> auto-scanning "
-        " and/or auto-updating are still running!</p>"),"KlamAV","dontshow");
+        " <b>Remember</b> - you can't close KlamAV while <br> "
+        " auto-updating is still running!</p>"),"KlamAV","dontshow");
 		hide();
 		return false;
 
@@ -181,37 +156,11 @@ bool Klamav::queryClose() {
 }
 
 
-void Klamav::contextEnable() {
-	
-	klamd->startKlamd();
-	//if (klamd->startKlamd()){
-			//_tray->setPixmap(KSystemTray::loadIcon("klamav"));
-			//EnableKlamd->setEnabled(FALSE);
-			//DisableKlamd->setEnabled(TRUE);
-	//}
-}
-
 void Klamav::clamdStopped() {
 /*	if (freshklam->isFreshklamAlive())
 		_tray->setPixmap(KSystemTray::loadIcon("klamavbwdl"));
 	else*/
 	_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
-	DisableKlamd->setEnabled(FALSE);
-	EnableKlamd->setEnabled(TRUE);
-}
-
-void Klamav::contextDisable() {
-	klamd->slotCancel();
-    resetAutoScan();
-}
-
-void Klamav::resetAutoScan() {
-/*	if (freshklam->isFreshklamAlive())
-		_tray->setPixmap(KSystemTray::loadIcon("klamavbwdl"));
-	else*/
-	_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
-	DisableKlamd->setEnabled(FALSE);
-	EnableKlamd->setEnabled(TRUE);
 }