Fix typo

[dotfiles/openbox.git] / autostart.sh

diff --git a/autostart.sh b/autostart.sh
index 5af749f..eb9a8da 100644 (file)
--- a/autostart.sh
+++ b/autostart.sh
@@ -3,13 +3,22 @@
 
 # Programs to launch at startup
 eval `dbus-launch --sh-syntax --exit-with-session` 
 
 # 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 &
 thunar --daemon &
 xcompmgr -c -t-5 -l-5 -r4.2 -o.55 &
 gnome-settings-daemon &
 gnome-screensaver &
 nitrogen --restore &
 thunar --daemon &
 xcompmgr -c -t-5 -l-5 -r4.2 -o.55 &

-xfce4-power-manager &
+gnome-power-manager &

 gnome-volume-control-applet &
 gnome-screensaver &
 system-config-printer-applet &
 gnome-volume-control-applet &
 gnome-screensaver &
 system-config-printer-applet &


@@ -22,6 +31,8 @@ if egrep -iq 'touchpad' /proc/bus/input/devices; then
     synclient TapButton1=1 &
 fi
 
     synclient TapButton1=1 &
 fi
 

+xrdb ~/.Xresources &
+

 # Export the dbus session address on startup so it can be used by cron
 # http://dev.gentoo.org/~tomka/mail.html
 touch $HOME/.Xdbus
 # Export the dbus session address on startup so it can be used by cron
 # http://dev.gentoo.org/~tomka/mail.html
 touch $HOME/.Xdbus