author | tille <tille> | 2002-11-16 17:42:37 (UTC) |
---|---|---|
committer | tille <tille> | 2002-11-16 17:42:37 (UTC) |
commit | 0861a25d4f28be8a3ba794eafca9f29eac3cc7c1 (patch) (unidiff) | |
tree | 0e78a2019fa62f803f6d61683b0daaeb4e810fd7 /noncore/settings/netsystemtime/settime.cpp | |
parent | 55f437bb3caaeec328bce4e2d00818780f1b4aa2 (diff) | |
download | opie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.zip opie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.tar.gz opie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.tar.bz2 |
first try to revert timezones on reject...
... not working i am too stupid ;)
Diffstat (limited to 'noncore/settings/netsystemtime/settime.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/netsystemtime/settime.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index 36166ae..6a28989 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp | |||
@@ -53,13 +53,13 @@ | |||
53 | 53 | ||
54 | 54 | ||
55 | SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) | 55 | SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) |
56 | : NtpBase( parent, name, true, f ) | 56 | : NtpBase( parent, name, true, f ) |
57 | { | 57 | { |
58 | setCaption( tr("System Time") ); | 58 | setCaption( tr("System Time") ); |
59 | 59 | _oldTimeZone=""; | |
60 | QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); | 60 | QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); |
61 | 61 | ||
62 | // TextLabelMainPredTime = new QLabel( FrameSystemTime ); | 62 | // TextLabelMainPredTime = new QLabel( FrameSystemTime ); |
63 | // vb->addWidget( TextLabelMainPredTime, 1, 0 ); | 63 | // vb->addWidget( TextLabelMainPredTime, 1, 0 ); |
64 | 64 | ||
65 | timeButton = new SetTime( FrameSystemTime ); | 65 | timeButton = new SetTime( FrameSystemTime ); |
@@ -315,20 +315,19 @@ void SetDateTime::updateSystem() | |||
315 | 315 | ||
316 | } | 316 | } |
317 | 317 | ||
318 | void SetDateTime::tzChange( const QString &tz ) | 318 | void SetDateTime::tzChange( const QString &tz ) |
319 | { | 319 | { |
320 | // set the TZ get the time and leave gracefully... | 320 | // set the TZ get the time and leave gracefully... |
321 | QString strSave; | 321 | _oldTimeZone = getenv( "TZ" ); |
322 | strSave = getenv( "TZ" ); | ||
323 | setenv( "TZ", tz, 1 ); | 322 | setenv( "TZ", tz, 1 ); |
324 | 323 | ||
325 | QDate d = QDate::currentDate(); | 324 | QDate d = QDate::currentDate(); |
326 | // reset the time. | 325 | // reset the time. |
327 | if ( !strSave.isNull() ) { | 326 | if ( !_oldTimeZone.isNull() ) { |
328 | setenv( "TZ", strSave, 1 ); | 327 | setenv( "TZ", _oldTimeZone, 1 ); |
329 | } | 328 | } |
330 | dateButton->setDate( d ); | 329 | dateButton->setDate( d ); |
331 | updateSystem(); | 330 | updateSystem(); |
332 | } | 331 | } |
333 | 332 | ||
334 | void SetDateTime::formatChanged(int i) | 333 | void SetDateTime::formatChanged(int i) |