1 files changed, 29 insertions, 21 deletions

diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index ddb1372..87b20ec 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -23,26 +23,26 @@ Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
 	Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
  	_maxOffset = cfg.readNumEntry("maxOffset",5);
   _minLookupDiff = cfg.readNumEntry("minLookupDiff",10);
   LineEditNtpServer->setText( cfg.readEntry("ntpServer") );
  	ntpProcess = new OProcess( );
   connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
   					this, SLOT(getNtpOutput(OProcess*,char*,int)));
   connect ( ntpProcess, SIGNAL(processExited(OProcess*)),
   					this, SLOT(ntpFinished(OProcess*)));
   connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
   connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
- 	_nextCorrection = new QTimer( this );
-    connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) );
+// 	_nextCorrection = new QTimer( this );
+//    connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) );
   slotRunNtp();
   readLookups();
 }
 
 Ntp::~Ntp()
 {
 
 }
 
 void Ntp::accept()
 {
 	Config cfg("ntp",Config::User);
@@ -74,60 +74,66 @@ void  Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
   }
   lineStrOld = lineStr;
 }
 
 void  Ntp::ntpFinished(OProcess*)
 {
 	Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   int lastLookup = cfg.readNumEntry("time",0);
   int lookupCount = cfg.readNumEntry("count",-1);
   int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
   cfg.writeEntry("time", time);
+  cfg.setGroup("correction");
+  cfg.writeEntry("time", time);
  	
   float timeShift = getTimeShift();
   if (timeShift == 0.0) return;
  	int secsSinceLast = time - lastLookup;
   TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
   if ( lastLookup > 0 && secsSinceLast > 60*_minLookupDiff)
   {
 	  lookupCount++;
    	cfg.writeEntry("count",lookupCount);
 	  cfg.setGroup("lookup_"+QString::number(lookupCount));
     _shiftPerSec =  timeShift / secsSinceLast;
 //    float nextCorr = _maxOffset / _shiftPerSec;
    	qDebug("secs since last lookup %i", secsSinceLast);qDebug("timeshift since last lookup %f", timeShift);qDebug("timeshift since per sec %f", _shiftPerSec);
 		cfg.writeEntry("secsSinceLast",secsSinceLast);
 		cfg.writeEntry("timeShift",QString::number(timeShift));
   }
 }
 
-void Ntp::correctClock()
-{
-	qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
-	Config cfg("ntp",Config::User);
-  cfg.setGroup("correction");
- 	int lastTime = cfg.readNumEntry("time",0);
-  int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
-  int corr = int((now - lastTime) * _shiftPerSec);
-  struct timeval myTv;
-  myTv.tv_sec = TimeConversion::toUTC( QDateTime::currentDateTime().addSecs(corr) );
-  myTv.tv_usec = 0;
-
-  if ( myTv.tv_sec != -1 )
-      ::settimeofday( &myTv, 0 );
-  Global::writeHWClock();
-  cfg.writeEntry("time",now);
-	qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
-}
+//void Ntp::correctClock()
+//{
+//	qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
+//	Config cfg("ntp",Config::User);
+//  cfg.setGroup("correction");
+// 	int lastTime = cfg.readNumEntry("time",0);
+//  if ( lastTime == 0 )
+//  {
+//   	return;
+//  }
+//  int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
+//  int corr = int((now - lastTime) * _shiftPerSec);
+//  struct timeval myTv;
+//  myTv.tv_sec = TimeConversion::toUTC( QDateTime::currentDateTime().addSecs(corr) );
+//  myTv.tv_usec = 0;
+//
+//  if ( myTv.tv_sec != -1 )
+//      ::settimeofday( &myTv, 0 );
+//  Global::writeHWClock();
+//  cfg.writeEntry("time",now);
+//	qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
+//}
 
 float Ntp::getTimeShift()
 {
 	QString _offset = "offset";
   QString _sec = "sec";
   QRegExp _reOffset = QRegExp(_offset);
   QRegExp _reEndOffset = QRegExp(_sec);
   int posOffset = _reOffset.match( _ntpOutput );
   int posEndOffset = _reEndOffset.match( _ntpOutput, posOffset );
   posOffset += _offset.length() + 1;
   QString diff = _ntpOutput.mid(posOffset, posEndOffset-posOffset-1);
   qDebug("%s", _ntpOutput.latin1());
@@ -170,14 +176,16 @@ void Ntp::readLookups()
   TextLabelShift->setText(QString::number(_shiftPerSec));
 }
 
 void Ntp::preditctTime()
 {
 	qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
 	Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
  	int lastTime = cfg.readNumEntry("time",0);
   setenv( "TZ", tz->currentZone(), 1 );
   int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
   int corr = int((now - lastTime) * _shiftPerSec);
- 	TextLabelPredTime->setText(QDateTime::currentDateTime().addSecs(corr).toString());
+  QDateTime dt = QDateTime::currentDateTime().addSecs(corr);
+  setTime(dt);
+ 	TextLabelPredTime->setText(dt.toString());
 }