@ -346,52 +346,51 @@ void Klamav::firstRunWizard() {
TQString homepath = getenv ( " HOME " ) ;
TQString defaultdb = homepath + " /.klamav/database " ;
TQString defaultquar = homepath + " /.klamav/quarantine " ;
if ( wizard . exec ( ) ! = TQDialog : : Rejected ) {
TDEConfig * config = TDEGlobal : : config ( ) ;
// Execute wizard
wizard . exec ( ) ;
config - > setGroup ( " Freshklam " ) ;
// These are run after the wizard is finished
TDEConfig * config = TDEGlobal : : config ( ) ;
config - > setGroup ( " Freshklam " ) ;
TQString wizardDBPath = wizard . databasePath ( ) . path ( - 1 ) ;
TQString wizardTQRPath = wizard . quarantinePath ( ) . path ( - 1 ) ;
/* kdDebug() << wizard.databasePath() << endl;
kdDebug ( ) < < wizard . defaultDatabasePath ( ) < < endl ; */
//Configure Database Path
TQStringList lastDownloadPaths ;
if ( ( wizardDBPath ! = " " ) & & ( TQDir : : cleanDirPath ( wizardDBPath ) ! = defaultdb ) ) {
lastDownloadPaths . prepend ( TQString ( " %1 " ) . arg ( wizardDBPath ) ) ;
checkDir ( wizardDBPath ) ;
} else {
lastDownloadPaths . prepend ( TQString ( " %1 " ) . arg ( wizard . defaultDatabasePath ( ) ) ) ;
createDefaultKlamAVDir ( " database " ) ;
}
config - > writeEntry ( " lastDownloadPaths " , lastDownloadPaths ) ;
config - > sync ( ) ;
//Configure Quarantine Path
TQStringList lastQuarLocations ;
TQString wizardDBPath = wizard . databasePath ( ) . path ( - 1 ) ;
TQString wizardTQRPath = wizard . quarantinePath ( ) . path ( - 1 ) ;
//Configure Database Path
TQStringList lastDownloadPaths ;
if ( ( wizardDBPath ! = " " ) & & ( TQDir : : cleanDirPath ( wizardDBPath ) ! = defaultdb ) ) {
lastDownloadPaths . prepend ( TQString ( " %1 " ) . arg ( wizardDBPath ) ) ;
checkDir ( wizardDBPath ) ;
} else {
lastDownloadPaths . prepend ( TQString ( " %1 " ) . arg ( wizard . defaultDatabasePath ( ) ) ) ;
createDefaultKlamAVDir ( " database " ) ;
}
config - > writeEntry ( " lastDownloadPaths " , lastDownloadPaths ) ;
config - > sync ( ) ;
//Configure Quarantine Path
TQStringList lastQuarLocations ;
config - > setGroup ( " Kuarantine " ) ;
config - > setGroup ( " Kuarantine " ) ;
/* kdDebug() << wizard.quarantinePath() << endl;
kdDebug ( ) < < wizard . defaultQuarantinePath ( ) < < endl ;
kdDebug ( ) < < defaultquar < < endl ; */
if ( ( wizardTQRPath ! = " " ) & & ( TQDir : : cleanDirPath ( wizardTQRPath ) ! = defaultquar ) ) {
lastQuarLocations . prepend ( TQString ( " %1 " ) . arg ( wizardTQRPath ) ) ;
checkDir ( wizardTQRPath ) ;
} else {
lastQuarLocations . prepend ( TQString ( " %1 " ) . arg ( wizard . defaultQuarantinePath ( ) ) ) ;
createDefaultKlamAVDir ( " quarantine " ) ;
}
config - > writeEntry ( " KuarantineLocations " , lastQuarLocations ) ;
config - > sync ( ) ;
if ( wizard . downloadDatabase ( ) ) {
kdDebug ( ) < < " downloading database " < < endl ;
downloadDBForWizard = true ;
}
if ( ( wizardTQRPath ! = " " ) & & ( TQDir : : cleanDirPath ( wizardTQRPath ) ! = defaultquar ) ) {
lastQuarLocations . prepend ( TQString ( " %1 " ) . arg ( wizardTQRPath ) ) ;
checkDir ( wizardTQRPath ) ;
} else {
lastQuarLocations . prepend ( TQString ( " %1 " ) . arg ( wizard . defaultQuarantinePath ( ) ) ) ;
createDefaultKlamAVDir ( " quarantine " ) ;
}
config - > writeEntry ( " KuarantineLocations " , lastQuarLocations ) ;
config - > sync ( ) ;
if ( wizard . downloadDatabase ( ) ) {
kdDebug ( ) < < " downloading database " < < endl ;
downloadDBForWizard = true ;
}
}
void Klamav : : createDefaultKlamAVDir ( TQString type ) {