diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-22 14:39:17 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-22 17:12:16 (GMT) |
| commit | 57cc5c50df4fc3673c948e8a55b4bab991e9cb7f (patch) | |
| tree | 9609fdf3fb3def986a662be85ed41c5876677e11 /src/gui/kernel/qt_x11_p.h | |
| parent | 9f08d620588752a6617d0e265c6b7137704e39c5 (diff) | |
| download | Qt-57cc5c50df4fc3673c948e8a55b4bab991e9cb7f.zip Qt-57cc5c50df4fc3673c948e8a55b4bab991e9cb7f.tar.gz Qt-57cc5c50df4fc3673c948e8a55b4bab991e9cb7f.tar.bz2 | |
clean up x11 desktop detection
KDE_FULL_SESSION is reliable since kde 2.x or so.
DESKTOP_SESSION is not reliable, unless one uses a new gnome.
GNOME_DESKTOP_SESSION_ID was temporarily unreliable. the two together
should be reliable.
copy the xfce4 detection from the xdg-open tool. assumed to be reliable.
remove the window manager hacks, as they are redundand with the
asssumedly reliable detection methods above.
Reviewed-by: jbache
Diffstat (limited to 'src/gui/kernel/qt_x11_p.h')
| -rw-r--r-- | src/gui/kernel/qt_x11_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index b2ce754..167557b 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -564,11 +564,8 @@ struct QX11Data _MOTIF_WM_HINTS, DTWM_IS_RUNNING, - KDE_FULL_SESSION, - KWIN_RUNNING, - KWM_RUNNING, - GNOME_BACKGROUND_PROPERTIES, ENLIGHTENMENT_DESKTOP, + _DT_SAVE_MODE, _SGI_DESKS_MANAGER, // EWMH (aka NETWM) |