fix the fix

1 files changed, 0 insertions, 6 deletions

diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index 85a46b7..2d240ba 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -71,198 +71,192 @@ MainWindow::MainWindow()
 	mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) );
 	mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) );
 	mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) );
 	Config config( "ntp" );
 	config.setGroup( "settings" );
 	slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", FALSE ) );
 	slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", FALSE ) );
 
 	mainWidget->setCurrentTab( tr( "Time" ) );
 	layout->addWidget( mainWidget );
 
 	// Create QCOP channel
 	QCopChannel *channel = new QCopChannel( "QPE/Application/netsystemtime", this );
 	connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 			 this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) );
 
 	// Create NTP socket
 	ntpSock = new QSocket( this );
 	connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) );
 	slotProbeNTPServer();
 
 	// Create timer for automatic time lookups
 	ntpTimer = new QTimer( this );
 
 	// Connect everything together
 	connect( timeTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) );
 	connect( timeTab, SIGNAL(tzChanged(const QString &)), predictTab, SLOT(slotTZChanged(const QString &)) );
 	connect( timeTab, SIGNAL(getPredictedTime()), predictTab, SLOT(slotSetPredictedTime()) );
 	connect( formatTab, SIGNAL(show12HourTime(int)), timeTab, SLOT(slotUse12HourTime( int )) );
 	connect( formatTab, SIGNAL(dateFormatChanged(const DateFormat &)),
 			 timeTab, SLOT(slotDateFormatChanged(const DateFormat &)) );
 	connect( formatTab, SIGNAL(weekStartChanged(int)), timeTab, SLOT(slotWeekStartChanged(int)) );
 	connect( settingsTab, SIGNAL(ntpDelayChanged(int)), this, SLOT(slotNTPDelayChanged(int)) );
 	connect( settingsTab, SIGNAL(displayNTPTab(bool)), this, SLOT(slotDisplayNTPTab(bool)) );
 	connect( settingsTab, SIGNAL(displayPredictTab(bool)), this, SLOT(slotDisplayPredictTab(bool)) );
 	connect( predictTab, SIGNAL(setTime(const QDateTime &)), this, SLOT(slotSetTime(const QDateTime &)) );
 
 	// Do initial time server check
 	slotNTPDelayChanged( config.readNumEntry( "ntpRefreshFreq", 1440 ) );
 	slotCheckNtp( -1 );
 
 	// Display app
 	showMaximized();
 }
 
 MainWindow::~MainWindow()
 {
 	if ( ntpProcess )
 		delete ntpProcess;
 }
 
 void MainWindow::accept()
 {
 	// Turn off the screensaver (Note: needs to be encased in { } so that it deconstructs and sends)
 	{
 		QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
 		disableScreenSaver << 0 << 0 << 0;
 	}
 
 	// Update the systemtime
 	timeTab->saveSettings( TRUE );
 
 	// Save format options
 	formatTab->saveSettings( TRUE );
 
 	// Save settings options
 	settingsTab->saveSettings();
 
 	// Since time has changed quickly load in the DateBookDB to allow the alarm server to get a better
 	// grip on itself (example re-trigger alarms for when we travel back in time).
 	DateBookDB db;
 
 	// Turn back on the screensaver
 	QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
 	enableScreenSaver << -1 << -1 << -1;
 
 	// Exit app
 	qApp->quit();
 }
 
 void MainWindow::reject()
 {
 	// Reset time settings
 	timeTab->saveSettings( FALSE );
 
 	// Send notifications but do not save settings
 	formatTab->saveSettings( FALSE );
 
 	// Exit app
 	qApp->quit();
 }
 
 void MainWindow::runNTP()
 {
 	if ( !ntpDelayElapsed() && ntpInteractive )
 	{
-		QString msg = tr( "You asked for a delay of " );
-		msg.append( QString::number( ntpDelay ) );
-		msg.append( tr( " minutes, but only " ) );
-		msg.append( QString::number( _lookupDiff / 60 ) );
-		msg.append( tr(" minutes elapsed since last lookup.<br>Continue?") );
-
 		QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) );
 		
 		switch (
 			QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No )
 			)
 		{
 			case QMessageBox::Yes: break;
 			case QMessageBox::No:  return;
 			default: return;
 		}
 	}
 
 	QString srv = settingsTab->ntpServer();
 
 	// Send information to time server tab if enabled
 	if ( ntpTabEnabled )
 	{
 		ntpTab->setStartTime( QDateTime::currentDateTime().toString() );
 		QString output = tr( "Running:\nntpdate " );
 		output.append( srv );
 		ntpTab->addNtpOutput( output );
 	}
 
 	if ( !ntpProcess )
 	{
 		ntpProcess = new OProcess();
 		connect( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
 				 this, SLOT(slotNtpOutput(OProcess*,char*,int)) );
 		connect( ntpProcess, SIGNAL(processExited(OProcess*)),
 				 this, SLOT(slotNtpFinished(OProcess*)) );
 	}
 
 	else
 		ntpProcess->clearArguments();
 	
 	*ntpProcess << "ntpdate" << srv;
 	bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput );
 	if ( !ret )
 	{
 		QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) );
 		if ( ntpTabEnabled )
 			ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) );
 	}
 }
 
 bool MainWindow::ntpDelayElapsed()
 {
 	// Determine if time elapsed is greater than time delay
 	Config config( "ntp" );
 	config.setGroup( "lookups" );
 	_lookupDiff = TimeConversion::toUTC( QDateTime::currentDateTime() ) - config.readNumEntry( "time", 0 );
 	if ( _lookupDiff < 0 )
 		return true;
 	return ( _lookupDiff - ( ntpDelay * 60) ) > 0;
 }
 
 void MainWindow::slotSetTime( const QDateTime &dt )
 {
 	timeTab->setDateTime( dt );
 }
 
 void MainWindow::slotQCopReceive( const QCString &msg, const QByteArray & )
 {
 	if ( msg == "ntpLookup(QString)" )
 	{
 		ntpInteractive = false;
 		runNTP();
 	}
 	if ( msg == "setPredictedTime(QString)" )
 	{
 		//setPredictTime();
 	}
 }
 
 void MainWindow::slotDisplayNTPTab( bool display )
 {
 	ntpTabEnabled = display;
 
 	// Create widget if it hasn't needed
 	if ( display && !ntpTab )
 	{
 		ntpTab = new NTPTabWidget( mainWidget );
 		connect( ntpTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) );
 	}
 
 	// Display/hide tab
 	display ? mainWidget->addTab( ntpTab, "netsystemtime/ntptab", tr( "Time Server" ) )
 			: mainWidget->removePage( ntpTab );
 }
 
 void MainWindow::slotDisplayPredictTab( bool display )
 {
 	predictTabEnabled = display;
 
 	// Create widget if it hasn't needed
 	if ( display && !predictTab )