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

@@ -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
 

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