diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-06-15 08:58:57 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-06-16 09:39:52 (GMT) |
| commit | 840cc3614bb365c018951f5b4211030fc303bcc8 (patch) | |
| tree | ff8cace3f9988fa1864df9c4f42e3657d56184f2 /src/gui/kernel/qt_x11_p.h | |
| parent | 94e39aff7dd02d4a631d5c40c6f5a5f6fa424035 (diff) | |
| download | Qt-840cc3614bb365c018951f5b4211030fc303bcc8.zip Qt-840cc3614bb365c018951f5b4211030fc303bcc8.tar.gz Qt-840cc3614bb365c018951f5b4211030fc303bcc8.tar.bz2 | |
Fix for resetting DESKTOP_STARTUP_ID envvar.
That was wrong to reset environment variable returned with a putenv
since getenv returns a value only. This fix reverts to old behavior
when unsetenv is not available and will leak 20 bytes once on
qapplication initialization.
This fixes 2f4ca8e06be0477503acf2a4bf38a1c76f52e5b1.
Reviewed-by: Bradley T. Hughes
Diffstat (limited to 'src/gui/kernel/qt_x11_p.h')
| -rw-r--r-- | src/gui/kernel/qt_x11_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index b480f34..3493a8b 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -506,8 +506,6 @@ struct QX11Data int fc_hint_style; char *startupId; - char *originalStartupId; - char *startupIdString; DesktopEnvironment desktopEnvironment; |