diff options
| author | Nick Schermer <nick@xfce.org> | 2012-02-24 21:58:59 +0100 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2012-03-24 22:24:36 +0100 |
| commit | ccd9d7a93a85159c571518b12e326d1c7064f9c7 (patch) | |
| tree | 489179bb1126d488c0947cbbc8a356ac630d0bc9 /scripts | |
| parent | 00915e5e3769b5a8afc3c340b538da2de70a9937 (diff) | |
| download | xfce4-session-ccd9d7a93a85159c571518b12e326d1c7064f9c7.tar.gz | |
Start screensaver with autostart.
Instead of the code in xinitrc, start xscreensaver using
autostart. We don't care about gnome-screensaver.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 7 | ||||
| -rwxr-xr-x | scripts/xinitrc.in.in | 28 | ||||
| -rw-r--r-- | scripts/xscreensaver.desktop.in | 9 |
3 files changed, 17 insertions, 27 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 4a1c3282..b8877edf 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -24,12 +24,19 @@ conffiles_DATA = \ xinitrc \ Xft.xrdb +autostartdir = $(sysconfdir)/xdg/autostart +autostart_in_files = xscreensaver.desktop.in +autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + EXTRA_DIST = \ + $(autostart_in_files) \ startxfce4.in \ xinitrc.in \ Xft.xrdb \ xflock4 DISTCLEANFILES = \ + $(autostart_DATA) \ startxfce4 \ xinitrc diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index 1395fb5e..a85ac4a3 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -184,35 +184,9 @@ if test "$ssh_agent_enabled" != "false"; then fi -# launch a screensaver if enabled. do not launch if we're root or if -# we're in a VNC session. -screensaver_enabled=`xfconf-query -c xfce4-session -p /startup/screensaver/enabled 2> /dev/null` -if test $UID -gt 0 -a -z "$VNCSESSION" -a "$screensaver_enabled" != "false"; then - screensaver_type=`xfconf-query -c xfce4-session -p /startup/screensaver/type 2> /dev/null` - - case "$screensaver_type" in - xscreensaver) - xscreensaver -no-splash & - ;; - - gnome-screensaver) - gnome-screensaver & - ;; - - *) - if test x"`which xscreensaver 2>/dev/null`" != x""; then - xscreensaver -no-splash & - elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then - gnome-screensaver & - fi - ;; - esac -fi - - # Run xfce4-session if installed if which xfce4-session >/dev/null 2>&1; then - ck-launch-session xfce4-session + xfce4-session if test "$ssh_agent_kill_cmd"; then echo "running '$ssh_agent_kill_cmd'" diff --git a/scripts/xscreensaver.desktop.in b/scripts/xscreensaver.desktop.in new file mode 100644 index 00000000..b18ba526 --- /dev/null +++ b/scripts/xscreensaver.desktop.in @@ -0,0 +1,9 @@ + +[Desktop Entry] +Type=Application +_Name=Screensaver +_Comment=Launch screensaver and locker program +Icon=preferences-desktop-screensaver +Exec=xscreensaver -no-splash +TryExec=xscreensaver +OnlyShowIn=XFCE; |