From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 12 Apr 2010 23:27:48 +0000 (+0100)
Subject: Merge branch 'master' of metalzone:etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/c035e794d622d7074c8fa94e18cb5ddfea7c36a1?ds=sidebyside;hp=-c

Merge branch 'master' of metalzone:etc/profile

* 'master' of metalzone:etc/profile:
  dot/xinitrc: Punt a bunch of application startup stuff to `gnome-session'.
  setup, pulseaudio, git: Add PulseAudio configuration; substituted dotfiles.
  dot/emacs: Twiddle `{shell,comint}-file-name-chars'.
  bin/mdw-build: Insert missing space.
---

c035e794d622d7074c8fa94e18cb5ddfea7c36a1
diff --combined dot/xinitrc
index 3ae854b,750bc9e..151b9a4
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@@ -87,15 -87,12 +87,12 @@@ initialize () 
    run init xrdb -override $HOME/.Xdefaults
  
    ## Random xsettery.
 -  run init xset b 10 2000 50
 +  run init xset b 5 2000 50
    run init xset r rate 500 50
    run init xset m 2 1
  
    ## Key mappings.
    xmodmap -e 'keysym BackSpace = BackSpace BackSpace'
- 
-   ## Gnome settings.
-   case $vnc in no) run bginit gnome-settings-daemon ;; esac
  }
  
  ###--------------------------------------------------------------------------
@@@ -146,41 -143,9 +143,9 @@@ start-window-manager () 
  
  start-clients-local () { :; }
  
- scsv=$(pick_program screensaver gnome-screensaver xscreensaver)
- case $scsv in
-   xscreensaver)
-     scsvopts="-no-splash"
-     ;;
-   *)
-     scsvopts=""
-     ;;
- esac
- 
  start-clients () {
-   ## Mail notification.
-   run bginit mail-notification
- 
-   ## Gnome session.  With great reluctance.  At least it doesn't actually do
-   ## anything.
-   run bginit gnome-session
- 
-   ## Policykit authentication agent.
-   agent=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
-   if [ -x $agent ]; then run bginit $agent; fi
- 
-   ## System monitor.
-   case $vnc in no) run bginit gkrellm ;; esac
- 
-   ## Screensaver.
-   case $vnc in
-     no)
-       run init xscreensaver-command -exit
-       run bginit $scsv $scsvopts
-       ;;
-   esac
- 
-   ## Panel.
-   case $vnc in no) run bginit gnome-panel ;; esac
+   ## Gnome session.
+   case $vnc in no) run bginit gnome-session ;; esac
  
    ## Local clients.
    start-clients-local
@@@ -347,7 -312,7 +312,7 @@@ EO
  	eval "${line#!}"
  	;;
        *)
 -        set -- $line
 +	set -- $line
  	run bgclients "$@"
  	;;
      esac