From 369a154651bedfbcebc0e3b122bb767505157a4a Mon Sep 17 00:00:00 2001
From: "Adrian C. (anrxc)" <anrxc@sysphere.org>
Date: Thu, 13 May 2010 23:58:07 +0200
Subject: xinitrc: don't play the login sound too early

---
 xinitrc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/xinitrc b/xinitrc
index 40e513c..5dc5044 100755
--- a/xinitrc
+++ b/xinitrc
@@ -57,12 +57,11 @@ xset r rate 200 30
 #   - xcb does not support Xcursor yet
 xsetroot -cursor_name left_ptr
 
-# Fix broken HAL key mappings
-#  - Lock key, Presentation key, Sync key
+# Fix the broken udev keymap
+#  - Lock, Presentation, Sync, €, $
 sudo /usr/bin/setkeycodes e06e 152
 sudo /usr/bin/setkeycodes e075 217
 sudo /usr/bin/setkeycodes e079 173
-#  - Euro key, Dollar key
 sudo /usr/bin/setkeycodes e033 159
 sudo /usr/bin/setkeycodes e034 151
 # }}}
@@ -70,13 +69,10 @@ sudo /usr/bin/setkeycodes e034 151
 
 # {{{ Autostart settings
 #
-# Play a startup sound
-ogg123 -q "${HOME}/.fvwm/sounds/Dream/Startup.ogg" &
-
 # Start the GnuPG agent and enable OpenSSH agent emulation
 if (pgrep -u "${USER}" gpg-agent); then
-  eval `cat $gnupglog`
-  eval `cut -d= -f1 $gnupglog | xargs echo export`
+  eval `cat ${gnupglog}`
+  eval `cut -d= -f1 ${gnupglog} | xargs echo export`
 else
   eval `gpg-agent --enable-ssh-support --daemon`
 fi
@@ -91,6 +87,9 @@ xwrits typetime=45 clock breakclock top ready-picture="${HOME}/.xwrits/ready.gif
 # Open a terminal emulator on the first tag
 #   - resume the old screen session or start a new one
 urxvt -e screen -l -UDRS term &
+
+# Play a startup sound
+ogg123 -q "${HOME}/.local/share/gajim/sounds/voices/voice-system-activated.ogg" &
 # }}}
 
 
-- 
cgit v1.2.3