1 files changed, 3 insertions, 2 deletions

diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 0abb401..083b50f 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -1,124 +1,125 @@
 #include "ntp.h"
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qtimer.h>
 #include <qtable.h>
 #include <qlabel.h>
 #include <qsocket.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qmessagebox.h>
 #include <qmultilineedit.h>
 #include <opie/oprocess.h>
+#include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/timeconversion.h>
 #include <qpe/tzselect.h>
 #include <qpe/timestring.h>
 #include <qpe/qpedialog.h>
 #include <sys/time.h>
 #include <time.h>
 #include <stdlib.h>
 
 
 Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
     : SetDateTime( parent, name, fl )
 {
-                 
-        Config ntpSrvs("/etc/ntpservers",Config::File);
+                qDebug("%s",          QPEApplication::qpeDir().latin1());
+        Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File);
   ntpSrvs.setGroup("servers");
   int srvCount = ntpSrvs.readNumEntry("count", 0 );
   for (int i = 0; i < srvCount; i++)
   {
           ntpSrvs.setGroup(QString::number(i));
            ComboNtpSrv->insertItem( ntpSrvs.readEntry("name") );
   }
   if ( srvCount==0 ) ComboNtpSrv->insertItem(tr("time.fu-berlin.de"));
 
         Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
         SpinBoxMinLookupDelay->setValue( cfg.readNumEntry("minLookupDiff",41) );
         SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",42) );
   ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) );
 
   ntpTimer = new QTimer(this);
 
          ntpProcess = new OProcess( );
   connect( SpinBoxNtpDelay, SIGNAL( valueChanged(int) ),
                                         SLOT(slotNtpDelayChanged(int)) );
 
   ntpSock = new QSocket( this );
   connect( ntpSock, SIGNAL( error(int) ),
                                         SLOT(slotCheckNtp(int)) );
   slotProbeNtpServer();
 
   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()));
   connect(PushButtonSetPredTime, SIGNAL(clicked()), this, SLOT(setPredictTime()));
   slotCheckNtp(-1);
   readLookups();
 }
 
 Ntp::~Ntp()
 {
         delete ntpProcess;
         Config ntpSrvs("/etc/ntpservers",Config::File);
   ntpSrvs.setGroup("servers");
   int srvCount = ComboNtpSrv->count();
   ntpSrvs.writeEntry("count", srvCount);
   for (int i = 0; i < srvCount; i++)
   {
           ntpSrvs.setGroup(QString::number(i));
            ntpSrvs.writeEntry( "name", ComboNtpSrv->text(i) );
   }
         Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
   cfg.writeEntry("ntpServer", ComboNtpSrv->currentItem());
   cfg.writeEntry( "minLookupDiff", SpinBoxMinLookupDelay->value() );
          cfg.writeEntry( "ntpRefreshFreq", SpinBoxNtpDelay->value() );
 }
 
 bool Ntp::ntpDelayElapsed()
 {
         Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   _lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0);
   return (_lookupDiff - (SpinBoxNtpDelay->value()*60)) > -60;
 }
 
 QString Ntp::getNtpServer()
 {
         return ComboNtpSrv->currentText();
 }
 
 void Ntp::slotRunNtp()
 {
   if ( !ntpDelayElapsed() )
   {
           switch (
             QMessageBox::warning(this, tr("Run NTP?"),
      tr("You asked for a delay of ")+SpinBoxNtpDelay->text()+tr(" minutes, but only ")+
      QString::number(_lookupDiff/60)+tr(" minutes elapsed since last loopup.")+
      "<br>"+tr("Rerun NTP?"),
      QMessageBox::Ok,QMessageBox::Cancel)
            ) {
                     case QMessageBox::Ok:     break;
                    case QMessageBox::Cancel: return;
               default: return;
       }
   }
         TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
   ntpOutPut( tr("Running:")+"\nntpdate "+getNtpServer() );
          
         ntpProcess->clearArguments();
         *ntpProcess << "ntpdate" << getNtpServer();
         bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
   if ( !ret ) {
      qDebug("Error while executing ntpdate");
      ntpOutPut( tr("Error while executing ntpdate"));
   }
 }