Diffstat (limited to 'noncore/settings/netsystemtime/settime.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/netsystemtime/settime.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index 93543cd..e7e604f 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp | |||
@@ -228,18 +228,12 @@ void SetDateTime::writeSettings() | |||
228 | 228 | ||
229 | } | 229 | } |
230 | 230 | ||
231 | void SetDateTime::commitTime() | 231 | void SetDateTime::commitTime() |
232 | { | 232 | { |
233 | tz->setFocus(); | 233 | tz->setFocus(); |
234 | // really turn off the screensaver before doing anything | ||
235 | { | ||
236 | // Needs to be encased in { } so that it deconstructs and sends | ||
237 | QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | ||
238 | disableScreenSaver << 0 << 0 << 0; | ||
239 | } | ||
240 | // Need to process the QCOP event generated above before proceeding | 234 | // Need to process the QCOP event generated above before proceeding |
241 | qApp->processEvents(); | 235 | qApp->processEvents(); |
242 | 236 | ||
243 | // before we progress further, set our TZ! | 237 | // before we progress further, set our TZ! |
244 | setenv( "TZ", tz->currentZone(), 1 ); | 238 | setenv( "TZ", tz->currentZone(), 1 ); |
245 | // now set the time... | 239 | // now set the time... |
@@ -247,12 +241,18 @@ void SetDateTime::commitTime() | |||
247 | 241 | ||
248 | if ( dt.isValid() ) setTime(dt); | 242 | if ( dt.isValid() ) setTime(dt); |
249 | } | 243 | } |
250 | 244 | ||
251 | void SetDateTime::setTime(QDateTime dt) | 245 | void SetDateTime::setTime(QDateTime dt) |
252 | { | 246 | { |
247 | // really turn off the screensaver before doing anything | ||
248 | { | ||
249 | // Needs to be encased in { } so that it deconstructs and sends | ||
250 | QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | ||
251 | disableScreenSaver << 0 << 0 << 0; | ||
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 ); |
@@ -262,16 +262,25 @@ void SetDateTime::setTime(QDateTime dt) | |||
262 | ::settimeofday( &myTv, 0 ); | 262 | ::settimeofday( &myTv, 0 ); |
263 | Global::writeHWClock(); | 263 | Global::writeHWClock(); |
264 | // since time has changed quickly load in the datebookdb | 264 | // since time has changed quickly load in the datebookdb |
265 | // to allow the alarm server to get a better grip on itself | 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) | 266 | // (example re-trigger alarms for when we travel back in time) |
267 | DateBookDB db; | 267 | DateBookDB db; |
268 | // Restore screensaver | ||
269 | QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | ||
270 | enableScreenSaver << -1 << -1 << -1; | ||
268 | } | 271 | } |
269 | 272 | ||
270 | void SetDateTime::updateSystem(int i) | 273 | void SetDateTime::updateSystem(int i) |
271 | { | 274 | { |
275 | // really turn off the screensaver before doing anything | ||
276 | { | ||
277 | // Needs to be encased in { } so that it deconstructs and sends | ||
278 | QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | ||
279 | disableScreenSaver << 0 << 0 << 0; | ||
280 | } | ||
272 | qDebug("SetDateTime::updateSystem(int %i)",i); | 281 | qDebug("SetDateTime::updateSystem(int %i)",i); |
273 | writeSettings(); | 282 | writeSettings(); |
274 | 283 | ||
275 | // set the timezone for everyone else... | 284 | // set the timezone for everyone else... |
276 | QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); | 285 | QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); |
277 | setTimeZone << tz->currentZone(); | 286 | setTimeZone << tz->currentZone(); |