This commit switches from using hardcoded ntp servers to using a pool ntp

server.

3 files changed, 16 insertions, 16 deletions

diff --git a/etc/ntpservers b/etc/ntpservers
index 5ea836b..2482d31 100644
--- a/etc/ntpservers
+++ b/etc/ntpservers
@@ -1,24 +1,24 @@
 [servers]
 count = 11
 [0]
-name = time.fu-berlin.de
+name = de.pool.ntp.org
 [1]
-name = time.ethz.ch
+name = ch.pool.ntp.org
 [2]
-name = otc2.psu.edu
+name = us.pool.ntp.org
 [3]
-name = ice.mcc.ac.uk
+name = uk.pool.ntp.org
 [4]
-name = ptbtime1.ptb.de
+name = 0.de.pool.ntp.org
 [5]
-name = bernina.ethz.ch
+name = 0.ch.pool.ntp.org
 [6]
-name = ntp.univ-lyon1.fr
+name = fr.pool.ntp.org
 [7]
-name = ntp.bri.connect.com.au
+name = au.pool.ntp.org
 [8]
-name = nist1.datum.com
+name = 1.us.pool.ntp.org
 [9]
-name = time-a.nist.gov
+name = 2.us.pool.ntp.org
 [10]
-name = time-b.timefreq.bldrdoc.gov
+name = 3.us.pool.ntp.org
diff --git a/i18n/es/netsystemtime.ts b/i18n/es/netsystemtime.ts
index f777c73..4ad8631 100644
--- a/i18n/es/netsystemtime.ts
+++ b/i18n/es/netsystemtime.ts
@@ -1,38 +1,38 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Ntp</name>
     <message>
-        <source>time.fu-berlin.de</source>
-        <translation>time.fu-berlin.de</translation>
+	<source>pool.ntp.org</source>
+        <translation>pool.ntp.org</translation>
     </message>
     <message>
         <source>Run NTP?</source>
         <translation>¿Ejecutar NTP?</translation>
     </message>
     <message>
         <source>You asked for a delay of </source>
         <translation>Preguntó por un retraso de </translation>
     </message>
     <message>
         <source> minutes, but only </source>
         <translation> minutos, pero sólo </translation>
     </message>
     <message>
         <source> minutes elapsed since last loopup.</source>
         <translation> minutos transcurrieron desde el último ajuste.</translation>
     </message>
     <message>
         <source>Rerun NTP?</source>
         <translation>¿Reiniciar NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
         <translation>Ejecutando:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Error mientras ejecutaba ntpdate</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> segundos</translation>
diff --git a/noncore/settings/netsystemtime/settingstabwidget.cpp b/noncore/settings/netsystemtime/settingstabwidget.cpp
index 3bb0ec3..b26e751 100644
--- a/noncore/settings/netsystemtime/settingstabwidget.cpp
+++ b/noncore/settings/netsystemtime/settingstabwidget.cpp
@@ -74,67 +74,67 @@ SettingsTabWidget::SettingsTabWidget( QWidget *parent )
 	sbPredictDelay->setWrapping( TRUE );
 	sbPredictDelay->setMaximumWidth( 50 );
 	layout->addWidget( sbPredictDelay, 3, 0 );
 
 	// Space filler
 	layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 4, 0 );
 
 	// Display time server information selector
 	chNtpTab = new QCheckBox( tr( "Display time server information" ), container );
 	connect( chNtpTab, SIGNAL( toggled(bool) ), this, SIGNAL( displayNTPTab(bool) ) );
 	layout->addMultiCellWidget( chNtpTab, 5, 5, 0, 1 );
 
 	// Display time prediction information selector
 	chPredictTab = new QCheckBox( tr( "Display time prediction information" ), container );
 	connect( chPredictTab, SIGNAL( toggled(bool) ), this, SIGNAL( displayPredictTab(bool) ) );
 	layout->addMultiCellWidget( chPredictTab, 6, 6, 0, 1 );
 
 	// Space filler
 	layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 7, 0 );
 
 	// Initialize values
 	QString ntpSrvsFile = QPEApplication::qpeDir();
 	ntpSrvsFile.append( "etc/ntpservers" );
 	Config ntpSrvs( ntpSrvsFile, Config::File );
 	ntpSrvs.setGroup( "servers" );
 	int srvCount = ntpSrvs.readNumEntry( "count", 0 );
 	for ( int i = 0; i < srvCount; i++ )
 	{
 		ntpSrvs.setGroup( QString::number( i ) );
 		cbTimeServer->insertItem( ntpSrvs.readEntry( "name" ) );
 	}
 	if ( srvCount==0 ) {
-		cbTimeServer->insertItem( "time.fu-berlin.de" );
-    cbTimeServer->insertItem( "time-a.nist.gov" );
-    cbTimeServer->insertItem( "ntp.bri.connect.com.au" );
+		cbTimeServer->insertItem( "0.pool.ntp.org" );
+    cbTimeServer->insertItem( "1.pool.ntp.org" );
+    cbTimeServer->insertItem( "2.pool.ntp.org" );
   }
 	Config config( "ntp" );
 	config.setGroup( "settings" );
 	sbPredictDelay->setValue( config.readNumEntry( "minLookupDiff", 720 ) );
 	sbNtpDelay->setValue( config.readNumEntry( "ntpRefreshFreq", 1440 ) );
 	cbTimeServer->setCurrentItem( config.readNumEntry( "ntpServer", 0 ) );
 	chNtpTab->setChecked( config.readBoolEntry( "displayNtpTab", FALSE ) );
 	chPredictTab->setChecked( config.readBoolEntry( "displayPredictTab", FALSE ) );
 }
 
 SettingsTabWidget::~SettingsTabWidget()
 {
 }
 
 void SettingsTabWidget::saveSettings()
 {
 	int srvCount = cbTimeServer->count();
 	bool serversChanged = TRUE;
 	int curSrv = cbTimeServer->currentItem();
 	QString edit = cbTimeServer->currentText();
 	for ( int i = 0; i < srvCount; i++ )
 	{
 		if ( edit == cbTimeServer->text( i ) )
 			serversChanged = FALSE;
 	}
 	if ( serversChanged )
 	{
 		QString ntpSrvsFile = QPEApplication::qpeDir();
 		ntpSrvsFile.append( "etc/ntpservers" );
 		Config ntpSrvs( ntpSrvsFile, Config::File );
 		ntpSrvs.setGroup( "servers" );
 		ntpSrvs.writeEntry( "count", ++srvCount );