Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
KDE:KDE3
klamav
03_no_update_software_config_section.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 03_no_update_software_config_section.patch of Package klamav
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/freshklam.cpp klamav-0.44.new/src/freshklam.cpp --- klamav-0.44/src/freshklam.cpp 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/freshklam.cpp 2008-07-07 13:03:56.000000000 -0400 @@ -113,51 +113,51 @@ KDialog::spacingHint(), "vbox"); //Proxy Widget - QGroupBox *software_group = new QGroupBox(i18n("Software Updates"), this); - vbox->addWidget(software_group); +// QGroupBox *software_group = new QGroupBox(i18n("Software Updates"), this); +// vbox->addWidget(software_group); - QGridLayout *software_layout = new QGridLayout( software_group, 5, 2, KDialog::spacingHint(), - KDialog::spacingHint(), "software_layout"); - software_layout->addRowSpacing(0, software_group->fontMetrics().height()); - software_layout->setColStretch(0, 1); - software_layout->setColStretch(1, 1); +// QGridLayout *software_layout = new QGridLayout( software_group, 5, 2, KDialog::spacingHint(), +// KDialog::spacingHint(), "software_layout"); +// software_layout->addRowSpacing(0, software_group->fontMetrics().height()); +// software_layout->setColStretch(0, 1); +// software_layout->setColStretch(1, 1); //Dazuko - QWidget *dazuko_hlp = new QWidget( software_group ); - software_layout->addMultiCellWidget(dazuko_hlp, 1,2, 0,2); - QGridLayout *dazuko_dir_layout = new QGridLayout(dazuko_hlp,2,2, KDialog::spacingHint() ); - - - clamav_box = new QCheckBox(i18n("Update ClamAV Automatically"), dazuko_hlp); - clamav_box->setMinimumWidth(clamav_box->sizeHint().width()); - dazuko_dir_layout->addWidget(clamav_box,0,0); - - klamav_box = new QCheckBox(i18n("Update KlamAV Automatically"), dazuko_hlp); - klamav_box->setMinimumWidth(klamav_box->sizeHint().width()); - dazuko_dir_layout->addWidget(klamav_box,0,1); +// QWidget *dazuko_hlp = new QWidget( software_group ); +// software_layout->addMultiCellWidget(dazuko_hlp, 1,2, 0,2); +// QGridLayout *dazuko_dir_layout = new QGridLayout(dazuko_hlp,2,2, KDialog::spacingHint() ); + + +// clamav_box = new QCheckBox(i18n("Update ClamAV Automatically"), dazuko_hlp); +// clamav_box->setMinimumWidth(clamav_box->sizeHint().width()); +// dazuko_dir_layout->addWidget(clamav_box,0,0); + +// klamav_box = new QCheckBox(i18n("Update KlamAV Automatically"), dazuko_hlp); +// klamav_box->setMinimumWidth(klamav_box->sizeHint().width()); +// dazuko_dir_layout->addWidget(klamav_box,0,1); - clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp); - dazuko_dir_layout->addWidget(clamav_options,1,0); - clamav_options->setFixedSize(clamav_options->sizeHint()); - connect( clamav_options, SIGNAL( clicked() ), this, - SLOT( checkForNewClamAVNow() ) ); - - klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp); - dazuko_dir_layout->addWidget(klamav_options,1,1); - klamav_options->setFixedSize(klamav_options->sizeHint()); - connect( klamav_options, SIGNAL( clicked() ), this, - SLOT( checkForNewKlamAVNow() ) ); - -#ifdef DISABLE_UPDATES - clamav_box->setEnabled(false); - klamav_box->setEnabled(false); - clamav_options->setEnabled(false); - klamav_options->setEnabled(false); -#endif +// clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp); +// dazuko_dir_layout->addWidget(clamav_options,1,0); +// clamav_options->setFixedSize(clamav_options->sizeHint()); +// connect( clamav_options, SIGNAL( clicked() ), this, +// SLOT( checkForNewClamAVNow() ) ); + +// klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp); +// dazuko_dir_layout->addWidget(klamav_options,1,1); +// klamav_options->setFixedSize(klamav_options->sizeHint()); +// connect( klamav_options, SIGNAL( clicked() ), this, +// SLOT( checkForNewKlamAVNow() ) ); + +//#ifdef DISABLE_UPDATES +// clamav_box->setEnabled(false); +// klamav_box->setEnabled(false); +// clamav_options->setEnabled(false); +// klamav_options->setEnabled(false); +//#endif //Virus Database Directory QGroupBox *group = new QGroupBox(i18n("Virus Database Directory"), this); vbox->addWidget(group); @@ -361,18 +361,18 @@ pos2 = item2.find('\n',pos); QString version = item2.mid((pos+20),pos2 - (pos+20)).stripWhiteSpace(); - if ((clamav_box->isChecked())){ +// if ((clamav_box->isChecked())){ - int result = KMessageBox::warningContinueCancel(this, i18n( "It looks like your version of the ClamAV engine is out of date! ClamAV-%1 is the most recent version of ClamAV available. Would you like to KlamAV to download and compile it for you?").arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version)); + //int result = KMessageBox::warningContinueCancel(this, i18n( "It looks like your version of the ClamAV engine is out of date! ClamAV-%1 is the most recent version of ClamAV available. Would you like to KlamAV to download and compile it for you?").arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version)); - switch (result) { - case 2 : - break; - case 5 : - updater->downloadComponent("clamav",version,"tar.gz"); - } - }else if (!(clamav_box->isChecked())) - KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", QString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version)); +// switch (result) { +// case 2 : +// break; +// case 5 : +// updater->downloadComponent("clamav",version,"tar.gz"); +// } +// }else if (!(clamav_box->isChecked())) +// KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", QString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version)); } @@ -722,20 +722,20 @@ check_combo->setEnabled(false); } - if ((config->readEntry("AutoUpdateClamAV")) == "Yes"){ - clamav_box->setChecked(true); - }else{ - clamav_box->setChecked(false); - } +// if ((config->readEntry("AutoUpdateClamAV")) == "Yes"){ +// clamav_box->setChecked(true); +// }else{ +// clamav_box->setChecked(false); +// } + +// if ((config->readEntry("AutoUpdateKlamAV")) == "Yes"){ +// klamav_box->setChecked(true); +// }else{ +// klamav_box->setChecked(false); +// } - if ((config->readEntry("AutoUpdateKlamAV")) == "Yes"){ - klamav_box->setChecked(true); - }else{ - klamav_box->setChecked(false); - } - - connect( clamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); - connect( klamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); +// connect( clamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); +// connect( klamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); connect( daemon_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); connect( check_combo, SIGNAL(activated(int)), SLOT(handleChecks()) ); @@ -758,17 +758,17 @@ } config->writeEntry("NoOfUpdates", check_combo->currentText()); - if (clamav_box->isChecked()){ - config->writeEntry("AutoUpdateClamAV","Yes"); - }else{ - config->writeEntry("AutoUpdateClamAV","No"); - } - - if (klamav_box->isChecked()){ - config->writeEntry("AutoUpdateKlamAV","Yes"); - }else{ - config->writeEntry("AutoUpdateKlamAV","No"); - } +// if (clamav_box->isChecked()){ +// config->writeEntry("AutoUpdateClamAV","Yes"); +// }else{ +// config->writeEntry("AutoUpdateClamAV","No"); +// } + +// if (klamav_box->isChecked()){ +// config->writeEntry("AutoUpdateKlamAV","Yes"); +// }else{ +// config->writeEntry("AutoUpdateKlamAV","No"); +// } config->sync(); } @@ -923,17 +923,17 @@ } -void Freshklam::checkForNewClamAVNow() -{ - - updater->checkForNewClamAVDirectly(); -} - -void Freshklam::checkForNewKlamAVNow() -{ - - updater->checkForNewKlamAVDirectly(); -} +//void Freshklam::checkForNewClamAVNow() +//{ +// +// updater->checkForNewClamAVDirectly(); +//} + +//void Freshklam::checkForNewKlamAVNow() +//{ +// +// updater->checkForNewKlamAVDirectly(); +//} void Freshklam::checkInternet() //SLOT @@ -963,11 +963,11 @@ Freshklam::resolved( KResolverResults result) // SLOT { - if ((!( result.error() != KResolver::NoError || result.isEmpty() )) - && klamav_box->isChecked()){ - updater->checkForNewKlamAV(); - }else - kdDebug() << "network error or not set to check for new klamav" << endl; +// if ((!( result.error() != KResolver::NoError || result.isEmpty() )) +// && klamav_box->isChecked()){ +// updater->checkForNewKlamAV(); +// }else +// kdDebug() << "network error or not set to check for new klamav" << endl; } @@ -1025,8 +1025,8 @@ void Freshklam::toggleUpgradeButtons(bool state) { - klamav_options->setEnabled(state); - clamav_options->setEnabled(state); +// klamav_options->setEnabled(state); +// clamav_options->setEnabled(state); } diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/freshklam.h klamav-0.44.new/src/freshklam.h --- klamav-0.44/src/freshklam.h 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/freshklam.h 2008-07-07 13:03:56.000000000 -0400 @@ -112,7 +112,7 @@ public slots: void slotSearch(); void slotCancel(); - void checkForNewClamAVNow(); + //void checkForNewClamAVNow(); void getCurrentVersionOfClamAV( ); void toggleUpgradeButtons(bool); private slots: @@ -128,7 +128,7 @@ void clamavInstallationExited(KProcess *arkollonproc);*/ //void newItems( const KFileItemList& ); void resolved(KResolverResults result); - void checkForNewKlamAVNow(); + //void checkForNewKlamAVNow(); void readVersionLine(KProcIO *); /* void parseSFPage(); void parseSFPageHack();*/ diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/klamav.cpp klamav-0.44.new/src/klamav.cpp --- klamav-0.44/src/klamav.cpp 2008-07-06 08:05:42.000000000 -0400 +++ klamav-0.44.new/src/klamav.cpp 2008-07-07 13:03:56.000000000 -0400 @@ -151,7 +151,7 @@ freshklam->slotSearch(); } if (downloadClamAVForWizard) - freshklam->checkForNewClamAVNow(); +// freshklam->checkForNewClamAVNow(); //klamdb->shouldIShow(); CollectionDB::instance()->insertEvent("Launch","KlamAV Launched");
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
