X-Git-Url: https://git.kirya.net/?p=dotfiles%2Fopenbox.git;a=blobdiff_plain;f=autostart.sh;h=eb9a8dae2144653a2d9085cc9d498b8d4027b30b;hp=6f217ed9ab16511899e5ef31773cc1aace82d84b;hb=8bcaee82cea632ba62e1d47312bf49419d2f1f6a;hpb=e73def645401643a6b7b54857fb01fd8a3effa5e;ds=sidebyside

diff --git a/autostart.sh b/autostart.sh
index 6f217ed..eb9a8da 100644
--- a/autostart.sh
+++ b/autostart.sh
@@ -3,7 +3,16 @@
 
 # Programs to launch at startup
 eval `dbus-launch --sh-syntax --exit-with-session` 
-eval `gnome-keyring-daemon --start --components=ssh,gpg,secrets,pkcs11`
+eval `gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg`
+export GPG_AGENT_INFO
+
+# Run XDG autostart things.  By default don't run anything desktop-specific
+# See xdg-autostart --help more info
+DESKTOP_ENV="OPENBOX"
+if which /usr/lib/openbox/xdg-autostart >/dev/null; then
+  /usr/lib/openbox/xdg-autostart $DESKTOP_ENV
+fi
+
 gnome-settings-daemon &
 gnome-screensaver &
 nitrogen --restore &
@@ -22,7 +31,7 @@ if egrep -iq 'touchpad' /proc/bus/input/devices; then
     synclient TapButton1=1 &
 fi
 
-xrdb ~/.Xresources
+xrdb ~/.Xresources &
 
 # Export the dbus session address on startup so it can be used by cron
 # http://dev.gentoo.org/~tomka/mail.html