Write the hardware clock after setting the datetime. This way we can

gurantee it is set while opiealarm has not run.

1 files changed, 6 insertions, 0 deletions

diff --git a/noncore/settings/netsystemtime/timetabwidget.cpp b/noncore/settings/netsystemtime/timetabwidget.cpp
index 1ea460e..3cc127d 100644
--- a/noncore/settings/netsystemtime/timetabwidget.cpp
+++ b/noncore/settings/netsystemtime/timetabwidget.cpp
@@ -79,214 +79,220 @@ TimeTabWidget::TimeTabWidget( QWidget *parent )
 	sbHour = new QSpinBox( container );
 	sbHour->setWrapping( TRUE );
 	layout->addMultiCellWidget( sbHour, 2, 2, 0, 1 );
 
 	// Minutes
 	layout->addMultiCellWidget( new QLabel( tr( "Minute" ), container ), 1, 1, 2, 3 );
 	sbMin = new QSpinBox( container );
 	sbMin->setWrapping( TRUE );
 	sbMin->setMinValue( 0 );
 	sbMin->setMaxValue( 59 );
 	layout->addMultiCellWidget( sbMin, 2, 2, 2, 3 );
 
 	// AM/PM
 	cbAmpm = new QComboBox( container );
 	cbAmpm->insertItem( tr( "AM" ), ValueAM );
 	cbAmpm->insertItem( tr( "PM" ), ValuePM );
 	layout->addMultiCellWidget( cbAmpm, 2, 2, 4, 5 );
 
 	// Date
 	layout->addWidget( new QLabel( tr( "Date" ), container ), 4, 0 );
 	btnDate = new DateButton( TRUE, container );
 	layout->addMultiCellWidget( btnDate, 4, 4, 1, 5 );
 
 	// Timezone
 	layout->addMultiCellWidget( new QLabel( tr( "Time zone" ), container ), 6, 6, 0, 1 );
 	selTimeZone = new TimeZoneSelector( container );
 	connect( selTimeZone, SIGNAL(signalNewTz(const QString&)), this, SLOT(slotTZChanged(const QString&)) );
 	layout->addMultiCellWidget( selTimeZone, 6, 6, 2, 5 );
 
 	// Space filler
 	layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 7, 0 );
 
 	// Set NTP time button
 	QPushButton *pb = new QPushButton( Resource::loadPixmap( "netsystemtime/ntptab" ),
 										tr( "Get time from the network" ), container );
 	connect( pb, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) );
 	layout->addMultiCellWidget( pb, 8, 8, 0, 5 );
 
 	// Set predicted time button
 	pb = new QPushButton( Resource::loadPixmap( "netsystemtime/predicttab" ), tr( "Set predicted time" ),
 						  container );
 	connect( pb, SIGNAL(clicked()), this, SIGNAL(getPredictedTime()) );
 	layout->addMultiCellWidget( pb, 9, 9, 0, 5 );
 
 	// Space filler at bottom of widget
 	layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 10, 0 );
 
 	// Initialize values
 	Config config( "locale" );
 	config.setGroup( "Location" );
 	selTimeZone->setCurrentZone( config.readEntry( "Timezone", "America/New_York" ) );
 	use12HourTime = FALSE;
 	setDateTime( QDateTime::currentDateTime() );
 }
 
 TimeTabWidget::~TimeTabWidget()
 {
 }
 
 void TimeTabWidget::saveSettings( bool commit )
 {
 	if ( commit )
 	{
 		// Set timezone and announce to world
 		QString tz = selTimeZone->currentZone();
 		Config config("locale");
 		config.setGroup( "Location" );
 		config.writeEntry( "Timezone", tz );
 		setenv( "TZ", tz, 1 );
 		QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
 		setTimeZone << tz;
 
 		// If controls have a valid date & time, update systemtime
 		int hour = sbHour->value();
 		if ( use12HourTime && cbAmpm->currentItem() == ValuePM )
 			hour += 12;
 		QDateTime dt( btnDate->date(), QTime ( hour, sbMin->value(), QTime::currentTime().second() ) );
 		setSystemTime( dt );
 	}
 	else
 	{
 		// Reset systemtime to hardware clock (i.e. undo any changes made by this app)
 		system("/sbin/hwclock --hctosys --utc");
 	}
 }
 
 void TimeTabWidget::setDateTime( const QDateTime &dt )
 {
 	// Set time
 	QTime t = dt.time();
 	if( use12HourTime )
 	{
 		int show_hour = t.hour();
 		if ( t.hour() >= 12 )
 		{
 			show_hour -= 12;
 			cbAmpm->setCurrentItem( ValuePM );
 		}
 		else
 		{
 			cbAmpm->setCurrentItem( ValueAM );
 		}
 		if ( show_hour == 0 )
 			show_hour = 12;
 		sbHour->setValue( show_hour );
 	}
 	else
 	{
 		sbHour->setValue( t.hour() );
 	}
 	sbMin->setValue( t.minute() );
 	
 	// Set date
 	btnDate->setDate( dt.date() );
 }
 
 void TimeTabWidget::setSystemTime( const QDateTime &dt )
 {
 	// Set system clock
 	if ( dt.isValid() )
 	{
 		struct timeval myTv;
 		int t = TimeConversion::toUTC( dt );
 			myTv.tv_sec = t;
 		myTv.tv_usec = 0;
 
 		if ( myTv.tv_sec != -1 )
 			::settimeofday( &myTv, 0 );
+
+                /*
+                 * Commit the datetime to the  'hardware'
+                 * as Global::writeHWClock() is a NOOP with Opie Alarm
+                 */
+                system("/sbin/hwclock --systohc --utc");
 	}
 }
 
 void TimeTabWidget::slotUse12HourTime( int i )
 {
 	use12HourTime = (i == 1);
     
 	cbAmpm->setEnabled( use12HourTime );
 
 	int show_hour = sbHour->value();
 
 	if ( use12HourTime )
 	{
 		sbHour->setMinValue( 1 );
 		sbHour->setMaxValue( 12 );
 
 		if ( show_hour >= 12 )
 		{
 			show_hour -= 12;
 			cbAmpm->setCurrentItem( ValuePM );
 		}
 		else
 		{
 			cbAmpm->setCurrentItem( ValueAM );
 		}
 		if ( show_hour == 0 )
 			show_hour = 12;
 	}
 	else
 	{
 		sbHour->setMinValue( 0 );
 		sbHour->setMaxValue( 23 );
 
 		if ( cbAmpm->currentItem() == ValuePM )
 		{
 			show_hour += 12;
 			if ( show_hour == 24 )
 				show_hour = 0;
 		}
 	}
 
 	sbHour->setValue( show_hour );
 }
 
 void TimeTabWidget::slotDateFormatChanged( const DateFormat &df )
 {
 	btnDate->setDateFormat( df );
 }
 
 void TimeTabWidget::slotWeekStartChanged( int monday )
 {
 	btnDate->setWeekStartsMonday( monday );
 }
 
 void TimeTabWidget::slotTZChanged( const QString &newtz )
 {
 	// If controls have a valid date & time, update systemtime
 	int hour = sbHour->value();
 	if ( use12HourTime && cbAmpm->currentItem() == ValuePM )
 		hour += 12;
 	QDateTime dt( btnDate->date(), QTime ( hour, sbMin->value(), QTime::currentTime().second() ) );
 	setSystemTime( dt );
 	QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
 	setTimeZone << newtz;
 
 	// Set system timezone
 	QString currtz = getenv( "TZ" );
 	setenv( "TZ", newtz, 1 );
 
 	// Get new date/time
 	hour = sbHour->value();
 	if ( use12HourTime && cbAmpm->currentItem() == ValuePM )
 		hour += 12;
 	dt = QDateTime::currentDateTime();
 
 	// Reset system timezone
 	if ( !currtz.isNull() )
 	{
 		setenv( "TZ", currtz, 1 );
 	}
 
 	// Set controls to new time
 	setDateTime( dt );
 
 	emit tzChanged( newtz );
 }