From 99b3136c3b354cdb6f0ba99d349dbb69374caaf34158a6a137b78fa7f29b39aa Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 23 Aug 2014 08:33:00 +0000 Subject: [PATCH] Accepting request 245785 from home:fcrozat:branches:X11:Utilities - Improve GNOME detection for Classic mode. OBS-URL: https://build.opensuse.org/request/show/245785 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=24 --- x11-tools.changes | 5 +++++ xim | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/x11-tools.changes b/x11-tools.changes index cdbc7b1..5ad0b14 100644 --- a/x11-tools.changes +++ b/x11-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 22 15:52:48 UTC 2014 - fcrozat@suse.com + +- Improve GNOME detection for Classic mode. + ------------------------------------------------------------------- Thu Jan 9 08:07:07 UTC 2014 - lnussel@suse.de diff --git a/xim b/xim index 6ce08de..da509fd 100644 --- a/xim +++ b/xim @@ -95,7 +95,9 @@ gnome_ibus_workaround () { im=${im##*/} im=${im#[0-9][0-9]-} test "$im" = "none" && return - if [ "${WINDOWMANAGER##*/}" = "gnome-session" ]; then + windowmanager=${WINDOWMANAGER##*/} + windowmanager=${windowmanager%-*} + if [ "$windowmanager" = "gnome" ]; then local active if [ "$im" = "ibus" ]; then active=true