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

gurantee it is set while opiealarm has not run.

1 files changed, 10 insertions, 4 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
@@ -40,65 +40,65 @@
 
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qscrollview.h>
 #include <qspinbox.h>
 
 #include <stdlib.h>
 #include <sys/time.h>
 
 static const int ValueAM = 0;
 static const int ValuePM = 1;
 
 TimeTabWidget::TimeTabWidget( QWidget *parent )
 	: QWidget( parent, 0x0, 0 )
 {
 	// Synchronize HW clock to systemtime
 	// This app will update systemtime
 	//  - if Cancel is clicked, will reset systemtime to HW clock's time
 	//  - if Ok is clicked, will leave systemtime as is
 	system("/sbin/hwclock --systohc --utc");
 
 	QVBoxLayout *tmpvb = new QVBoxLayout( this );
 	QScrollView *sv = new QScrollView( this );
 	tmpvb->addWidget( sv, 0, 0 );
 	sv->setResizePolicy( QScrollView::AutoOneFit );
 	sv->setFrameStyle( QFrame::NoFrame );
 	QWidget *container = new QWidget( sv->viewport() );
 	sv->addChild( container );
-    
+
 	QGridLayout *layout = new QGridLayout( container );
 	layout->setMargin( 2 );
 	layout->setSpacing( 4 );
 
 	// Hours
 	layout->addMultiCellWidget( new QLabel( tr( "Hour" ), container ), 1, 1, 0, 1 );
 	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 );
@@ -158,88 +158,94 @@ void TimeTabWidget::saveSettings( bool commit )
 	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 );
+                    ::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;
 		}