Diffstat (limited to 'noncore/settings/netsystemtime/settime.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/netsystemtime/settime.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index b456012..2398c08 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp | |||
@@ -252,54 +252,58 @@ void SetDateTime::setTime(QDateTime dt) | |||
252 | { | 252 | { |
253 | Config cfg("ntp",Config::User); | 253 | Config cfg("ntp",Config::User); |
254 | cfg.setGroup("correction"); | 254 | cfg.setGroup("correction"); |
255 | int t = TimeConversion::toUTC(dt); | 255 | int t = TimeConversion::toUTC(dt); |
256 | struct timeval myTv; | 256 | struct timeval myTv; |
257 | myTv.tv_sec = t; | 257 | myTv.tv_sec = t; |
258 | cfg.writeEntry("time", t ); | 258 | cfg.writeEntry("time", t ); |
259 | myTv.tv_usec = 0; | 259 | myTv.tv_usec = 0; |
260 | 260 | ||
261 | if ( myTv.tv_sec != -1 ) | 261 | if ( myTv.tv_sec != -1 ) |
262 | ::settimeofday( &myTv, 0 ); | 262 | ::settimeofday( &myTv, 0 ); |
263 | Global::writeHWClock(); | 263 | Global::writeHWClock(); |
264 | // since time has changed quickly load in the datebookdb | ||
265 | // to allow the alarm server to get a better grip on itself | ||
266 | // (example re-trigger alarms for when we travel back in time) | ||
267 | DateBookDB db; | ||
264 | } | 268 | } |
265 | 269 | ||
266 | void SetDateTime::updateSystem(int i) | 270 | void SetDateTime::updateSystem(int i) |
267 | { | 271 | { |
268 | qDebug("SetDateTime::updateSystem(int %i)",i); | 272 | qDebug("SetDateTime::updateSystem(int %i)",i); |
269 | writeSettings(); | 273 | writeSettings(); |
270 | // since time has changed quickly load in the datebookdb | ||
271 | // to allow the alarm server to get a better grip on itself | ||
272 | // (example re-trigger alarms for when we travel back in time) | ||
273 | // DateBookDB db; | ||
274 | 274 | ||
275 | // set the timezone for everyone else... | 275 | // set the timezone for everyone else... |
276 | QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); | 276 | QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); |
277 | setTimeZone << tz->currentZone(); | 277 | setTimeZone << tz->currentZone(); |
278 | 278 | ||
279 | // AM/PM setting and notify time changed | 279 | // AM/PM setting and notify time changed |
280 | QCopEnvelope setClock( "QPE/System", "clockChange(bool)" ); | 280 | QCopEnvelope setClock( "QPE/System", "clockChange(bool)" ); |
281 | setClock << ampmCombo->currentItem(); | 281 | setClock << ampmCombo->currentItem(); |
282 | 282 | ||
283 | // Notify everyone what day we prefer to start the week on. | 283 | // Notify everyone what day we prefer to start the week on. |
284 | QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" ); | 284 | QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" ); |
285 | setWeek << weekStartCombo->currentItem(); | 285 | setWeek << weekStartCombo->currentItem(); |
286 | 286 | ||
287 | // Notify everyone what date format to use | 287 | // Notify everyone what date format to use |
288 | QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" ); | 288 | QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" ); |
289 | setDateFormat << date_formats[dateFormatCombo->currentItem()]; | 289 | setDateFormat << date_formats[dateFormatCombo->currentItem()]; |
290 | 290 | ||
291 | // Restore screensaver | 291 | // Restore screensaver |
292 | QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | 292 | QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); |
293 | enableScreenSaver << -1 << -1 << -1; | 293 | enableScreenSaver << -1 << -1 << -1; |
294 | // since time has changed quickly load in the datebookdb | ||
295 | // to allow the alarm server to get a better grip on itself | ||
296 | // (example re-trigger alarms for when we travel back in time) | ||
297 | DateBookDB db; | ||
294 | 298 | ||
295 | } | 299 | } |
296 | 300 | ||
297 | void SetDateTime::tzChange( const QString &tz ) | 301 | void SetDateTime::tzChange( const QString &tz ) |
298 | { | 302 | { |
299 | qDebug("SetDateTime::tzChange"); | 303 | qDebug("SetDateTime::tzChange"); |
300 | // set the TZ get the time and leave gracefully... | 304 | // set the TZ get the time and leave gracefully... |
301 | QString strSave; | 305 | QString strSave; |
302 | strSave = getenv( "TZ" ); | 306 | strSave = getenv( "TZ" ); |
303 | setenv( "TZ", tz, 1 ); | 307 | setenv( "TZ", tz, 1 ); |
304 | 308 | ||
305 | QDate d = QDate::currentDate(); | 309 | QDate d = QDate::currentDate(); |