diff options
Diffstat (limited to 'starttde')
| -rwxr-xr-x | starttde | 27 |
1 files changed, 25 insertions, 2 deletions
@@ -581,7 +581,7 @@ if [ "$TGTK_PRELOAD" != "" ]; then elif [ -e /usr/lib/libnspr4.so ]; then TGTK_NSPR_PRELOAD="/usr/lib/libnspr4.so:" fi - export LD_PRELOAD=$TGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD + export LD_PRELOAD=$TGTK_PRELOAD:$TGTK_NSPR_PRELOAD$LD_PRELOAD fi # We run mkfontdir on the user's font dirs (if we have permission) to pick @@ -640,6 +640,29 @@ $TDEDIR/bin/dcopserver_shutdown echo "[starttde] Starting Trinity..." 1>&2 +# Start tde_dbus_hardwarecontrol at background +if [ -x $TDEDIR/bin/tde_dbus_hardwarecontrol ]; then + ( + TDE_DBUS=$(dbus-send --system --print-reply --dest=org.freedesktop.DBus \ + /org/freedesktop/DBus org.freedesktop.DBus.StartServiceByName \ + string:org.trinitydesktop.hardwarecontrol \ + uint32:0 | \ + sed -n "s| *uint32 \([0-9]*\).*|\1|p") + case "$TDE_DBUS" in + 2) + TDE_DBUS_STATE="running" + ;; + 1) + TDE_DBUS_STATE="started" + ;; + *) + TDE_DBUS_STATE="not started" + ;; + esac + echo "[starttde] Trinity hardware control dbus daemon $TDE_DBUS_STATE." 1>&2 + )& +fi + # Detect any running Xorg composition managers. $TDEDIR/bin/kdetcompmgr @@ -708,7 +731,7 @@ fi # TDE_FULL_SESSION=true export TDE_FULL_SESSION -xprop -root -f TDE_FULL_SESSION 8t -set TDE_FULL_SESSION true +xprop -root -f TDE_FULL_SESSION 8s -set TDE_FULL_SESSION true echo "[starttde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2 TDE_SESSION_UID=`id -u` export TDE_SESSION_UID |