Back to xscreensaver and xfce4-power-manager, after having looked at gnome-power...
authorJulien Valroff <julien@kirya.net>
Wed, 6 Jul 2011 18:39:13 +0000 (20:39 +0200)
committerJulien Valroff <julien@kirya.net>
Wed, 6 Jul 2011 18:39:13 +0000 (20:39 +0200)
autostart.sh
menu.xml
rc.xml

index 03e4a64..c5e8827 100644 (file)
@@ -11,13 +11,13 @@ export GPG_AGENT_INFO
 
 xrdb ~/.Xresources &
 xdg-user-dirs-update &
-~/scripts/SessionManager.py &
-( sleep 10s && gnome-screensaver ) &
-( sleep 20s && gnome-power-manager ) &
+xscreensaver &
+xfce4-power-manager &
 volumeicon &
 system-config-printer-applet &
 thunar --daemon &
 xcompmgr -c -t-5 -l-5 -r4.2 -o.55 &
+nm-applet &
 
 if egrep -iq 'touchpad' /proc/bus/input/devices; then
     synclient VertEdgeScroll=1 &
@@ -26,14 +26,13 @@ fi
 
 # Export the dbus session address on startup so it can be used by cron
 # http://dev.gentoo.org/~tomka/mail.html
-touch $HOME/.Xdbus
-chmod 600 $HOME/.Xdbus
-env | grep DBUS_SESSION_BUS_ADDRESS > $HOME/.Xdbus
-echo 'export DBUS_SESSION_BUS_ADDRESS' >> $HOME/.Xdbus
+touch $HOME/.Xdbus & 
+chmod 600 $HOME/.Xdbus &
+env | grep DBUS_SESSION_BUS_ADDRESS > $HOME/.Xdbus &
+echo 'export DBUS_SESSION_BUS_ADDRESS' >> $HOME/.Xdbus &
 
 tint2 &
 conky &
-nm-applet &
 
 ~/scripts/start-daemon.sh -n19 -c2 -p7 offlineimap -u Noninteractive.Quiet
 
@@ -41,4 +40,3 @@ nm-applet &
 gajim &
 #x-terminal-emulator -e mutt &
 #x-www-browser &
-#liferea &
index 0b137d4..cc5fb88 100644 (file)
--- a/menu.xml
+++ b/menu.xml
                        <item label="Économiseur d'écran">
                                <action name="Execute">
                                        <execute>
-                                               gnome-screensaver-preferences
+                                               xscreensaver-demo
                                        </execute>
                                </action>
                        </item>
                <item label="Verrouiller l'écran">
                        <action name="Execute">
                                <execute>
-                                       gnome-screensaver-command -\-lock
+                                       xscreensaver-command -lock
                                </execute>
                        </action>
                </item>
diff --git a/rc.xml b/rc.xml
index 9d87a06..3f760dd 100644 (file)
--- a/rc.xml
+++ b/rc.xml
     </keybind>
     <keybind key="C-A-L">
       <action name="Execute">
-        <execute>gnome-screensaver-command -\-lock</execute>
+        <execute>xscreensaver-command -lock</execute>
       </action>
     </keybind>
   </keyboard>