Author: alexander
Date: 2007-11-28 08:04:00 -0700 (Wed, 28 Nov 2007)
New Revision: 2142

Modified:
   trunk/root/.purple/prefs.xml
   trunk/root/.xinitrc
Log:
Modified some default preferences:

 * Warn if the monitor is at [EMAIL PROTECTED] Hz, not only at [EMAIL PROTECTED]
 * Suggest to read /root/README.txt, not /root/README
 * Play sounds in Pidgin instead of beeping.



Modified: trunk/root/.purple/prefs.xml
===================================================================
--- trunk/root/.purple/prefs.xml        2007-11-28 14:12:29 UTC (rev 2141)
+++ trunk/root/.purple/prefs.xml        2007-11-28 15:04:00 UTC (rev 2142)
@@ -16,5 +16,9 @@
                <pref name='blist'>
                        <pref name='list_visible' type='bool' value='1'/>
                </pref>
+               <pref name='sound'>
+                       <pref name='command' type='path' value='aplay -q %s'/>
+                       <pref name='method' type='string' value='custom'/>
+               </pref>
        </pref>
 </pref>

Modified: trunk/root/.xinitrc
===================================================================
--- trunk/root/.xinitrc 2007-11-28 14:12:29 UTC (rev 2141)
+++ trunk/root/.xinitrc 2007-11-28 15:04:00 UTC (rev 2142)
@@ -2,19 +2,29 @@
 # LC_ALL=C, LANG=zh_CN.UTF-8
 # Remove LC_ALL now so that LANG takes effect
 unset LC_ALL
+
 if xrandr | grep -q '\*0.*640 x 480.*\*60'
 then
+       BAD_RESOLUTION="640 x 480"
+fi
+if xrandr | grep -q '\*0.*800 x 600.*\*60'
+then
+       BAD_RESOLUTION="800 x 600"
+fi
+
+if [ -n "$BAD_RESOLUTION" ]
+then
 xmessage -center \
 "The X server could not obtain the allowed synchronization
 frequencies from the monitor because your monitor is not
 Plug-n-Play compatible.  Thus, a default resolution of
-640 x 480 @ 60 Hz has been used.  This can hurt your eyes.
+$BAD_RESOLUTION @ 60 Hz has been used.  This can hurt your eyes.
 
 To fix the problem, press Ctrl + Alt + Backspace, and then
 specify the allowed frequency ranges in /etc/X11/xorg.conf
-manually.  See /root/README for details.
+manually.  See /root/README.txt for details.
 
-If 640 x 480 @ 60 Hz is indeed what you want, press the 'okay'
+If $BAD_RESOLUTION @ 60 Hz is indeed what you want, press the 'okay'
 button to proceed."
 fi
 scim -d

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to