Accepting request 340480 from home:tiwai:branches:M17N

- Fix logging not to include the build path (boo#951602)

- Several fixes and cleanup for starting fcitx on GNOME on Leap
  (boo#947576,boo#942816)
  * Remove the superfluous manual dbus-launch from xim script
  * Use xdg autostart for GNOME, KDE, LXDE and XFCE;
    fcitx-autostart script is also modified to check $INPUT_METHOD
  * Delay start of fcitx daemon a bit, too

OBS-URL: https://build.opensuse.org/request/show/340480
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=124

xim.d-fcitx

@@ -5,12 +5,17 @@ export GTK_IM_MODULE=fcitx
 export QT_IM_SWITCHER=imsw-multi
 export QT_IM_MODULE=fcitx
 
-# Avoid relying on autolaunch to improvise D-Bus sessions for each process
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] ; then
-   eval $(dbus-launch --sh-syntax --exit-with-session)
-fi
-
-fcitx -d
+case "$WINDOWMANAGER" in
+    *gnome*|*kde*|*xfce*|*lxde*)
+	# started via xdg autostart (boo#947576)
+	# explicitly set below, as referred in xdg autostart
+	export INPUT_METHOD=fcitx
+	;;
+    *)
+	# FIXME: a little bit of delay is required to avoid race (boo#947576)
+	(sleep 2; fcitx -d) &
+	;;
+esac
 
 # success:
 return 0