summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-30 13:34:40 (UTC)
committer harlekin <harlekin>2002-08-30 13:34:40 (UTC)
commit6fddd961f703acc7b60fb49d5da6ee1a0ab01019 (patch) (side-by-side diff)
treeff8652921450c3f59c6b97dac4590ed8588a9119
parent131ccdb3f2b18cdf6f0d7ce2eb9b31016ec3f1aa (diff)
downloadopie-6fddd961f703acc7b60fb49d5da6ee1a0ab01019.zip
opie-6fddd961f703acc7b60fb49d5da6ee1a0ab01019.tar.gz
opie-6fddd961f703acc7b60fb49d5da6ee1a0ab01019.tar.bz2
do not kill all applets when setting the time .-)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/settime.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index e3b2ddd..d1dc5b8 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -239,95 +239,95 @@ void SetDateTime::commitTime()
// before we progress further, set our TZ!
setenv( "TZ", tz->currentZone(), 1 );
// now set the time...
QDateTime dt( dateButton->date(), timeButton->time() );
if ( dt.isValid() ) setTime(dt);
}
void SetDateTime::setTime(QDateTime dt)
{
// really turn off the screensaver before doing anything
{
// Needs to be encased in { } so that it deconstructs and sends
QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
disableScreenSaver << 0 << 0 << 0;
}
Config cfg("ntp",Config::User);
cfg.setGroup("correction");
int t = TimeConversion::toUTC(dt);
struct timeval myTv;
myTv.tv_sec = t;
cfg.writeEntry("time", t );
myTv.tv_usec = 0;
if ( myTv.tv_sec != -1 )
::settimeofday( &myTv, 0 );
Global::writeHWClock();
// since time has changed quickly load in the datebookdb
// to allow the alarm server to get a better grip on itself
// (example re-trigger alarms for when we travel back in time)
DateBookDB db;
- QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" );
- timeApplet << "";
+ //QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" );
+ //timeApplet << "";
// Restore screensaver
QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
enableScreenSaver << -1 << -1 << -1;
}
void SetDateTime::updateSystem(int i)
{
// really turn off the screensaver before doing anything
{
// Needs to be encased in { } so that it deconstructs and sends
QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
disableScreenSaver << 0 << 0 << 0;
}
qDebug("SetDateTime::updateSystem(int %i)",i);
writeSettings();
// set the timezone for everyone else...
QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
setTimeZone << tz->currentZone();
// AM/PM setting and notify time changed
QCopEnvelope setClock( "QPE/System", "clockChange(bool)" );
setClock << ampmCombo->currentItem();
// Notify everyone what day we prefer to start the week on.
QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" );
setWeek << weekStartCombo->currentItem();
- // Notify everyone what date format to use
+ // Notify everyone what date format to use
QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" );
setDateFormat << date_formats[dateFormatCombo->currentItem()];
// Restore screensaver
QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
enableScreenSaver << -1 << -1 << -1;
// since time has changed quickly load in the datebookdb
// to allow the alarm server to get a better grip on itself
// (example re-trigger alarms for when we travel back in time)
DateBookDB db;
}
void SetDateTime::tzChange( const QString &tz )
{
// set the TZ get the time and leave gracefully...
QString strSave;
strSave = getenv( "TZ" );
setenv( "TZ", tz, 1 );
QDate d = QDate::currentDate();
// reset the time.
if ( !strSave.isNull() ) {
setenv( "TZ", strSave, 1 );
}
dateButton->setDate( d );
updateSystem();
}
void SetDateTime::formatChanged(int i)
{
dateButton->setDateFormat(date_formats[i]);