summaryrefslogtreecommitdiff
authorskyhusker <skyhusker>2005-04-24 18:04:05 (UTC)
committer skyhusker <skyhusker>2005-04-24 18:04:05 (UTC)
commit2654d303f9ee732ef938ab1a54f314b2e6605579 (patch) (unidiff)
tree68181686ffaea0deeaaf64fb60d6dda099ed4e1b
parent909be3f5cc74846f74febdfe53d5b9f92bdd4471 (diff)
downloadopie-2654d303f9ee732ef938ab1a54f314b2e6605579.zip
opie-2654d303f9ee732ef938ab1a54f314b2e6605579.tar.gz
opie-2654d303f9ee732ef938ab1a54f314b2e6605579.tar.bz2
Relaxed fix for errors in ntpdate command, avoiding false error messages. Fixes bug #1357.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/mainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index 01d9a98..1f9f8c3 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -296,49 +296,49 @@ void MainWindow::slotProbeNTPServer()
296 ntpSock->connectToHost( settingsTab->ntpServer(), 123 ); 296 ntpSock->connectToHost( settingsTab->ntpServer(), 123 );
297} 297}
298 298
299void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen ) 299void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen )
300{ 300{
301 QString output = QString( buffer ).left( buflen ); 301 QString output = QString( buffer ).left( buflen );
302 ntpOutput.append( output ); 302 ntpOutput.append( output );
303 303
304 if ( ntpTabEnabled ) 304 if ( ntpTabEnabled )
305 ntpTab->addNtpOutput( output ); 305 ntpTab->addNtpOutput( output );
306} 306}
307 307
308void MainWindow::slotNtpFinished( OProcess *p ) 308void MainWindow::slotNtpFinished( OProcess *p )
309{ 309{
310 QString output; 310 QString output;
311 QDateTime dt = QDateTime::currentDateTime(); 311 QDateTime dt = QDateTime::currentDateTime();
312 312
313 // Re-enable set time buttons & change app caption to indicate time update is happening 313 // Re-enable set time buttons & change app caption to indicate time update is happening
314 if ( ntpTabEnabled ) 314 if ( ntpTabEnabled )
315 ntpTab->setNTPBtnEnabled( true ); 315 ntpTab->setNTPBtnEnabled( true );
316 timeTab->setNTPBtnEnabled( true ); 316 timeTab->setNTPBtnEnabled( true );
317 setCaption( tr( "SystemTime" ) ); 317 setCaption( tr( "SystemTime" ) );
318 318
319 // Verify run was successful 319 // Verify run was successful
320 if ( p->exitStatus() != 0 || !p->normalExit() ) 320 if ( p->exitStatus() != 0 )
321 { 321 {
322 if ( isVisible() && ntpInteractive ) 322 if ( isVisible() && ntpInteractive )
323 { 323 {
324 output = tr( "Error while getting time from\n server: " ); 324 output = tr( "Error while getting time from\n server: " );
325 output.append( settingsTab->ntpServer() ); 325 output.append( settingsTab->ntpServer() );
326 QMessageBox::critical(this, tr( "Error" ), output ); 326 QMessageBox::critical(this, tr( "Error" ), output );
327 } 327 }
328 // slotCheckNtp(-1); 328 // slotCheckNtp(-1);
329 return; 329 return;
330 } 330 }
331 331
332 // Set controls on time tab to new time value 332 // Set controls on time tab to new time value
333 timeTab->setDateTime( dt ); 333 timeTab->setDateTime( dt );
334 334
335 // Write out lookup information 335 // Write out lookup information
336 Config config( "ntp" ); 336 Config config( "ntp" );
337 config.setGroup( "lookups" ); 337 config.setGroup( "lookups" );
338 int lastLookup = config.readNumEntry( "time", 0 ); 338 int lastLookup = config.readNumEntry( "time", 0 );
339 int lookupCount = config.readNumEntry( "count", 0 ); 339 int lookupCount = config.readNumEntry( "count", 0 );
340 bool lastNtp = config.readBoolEntry( "lastNtp", false ); 340 bool lastNtp = config.readBoolEntry( "lastNtp", false );
341 int time = TimeConversion::toUTC( QDateTime::currentDateTime() ); 341 int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
342 config.writeEntry( "time", time ); 342 config.writeEntry( "time", time );
343 343
344 // Calculate new time/time shift 344 // Calculate new time/time shift