CVS update by vins xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: vins    
  Date: 06/12/09 19:37:18

  Branch:      xemacs/src release-21-4
  Modified:    xemacs/src ChangeLog sound.c
Log:


Revision  Changes    Path
1.290.2.114 +7 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.113
retrieving revision 1.290.2.114
diff -u -p -r1.290.2.113 -r1.290.2.114
--- ChangeLog	2006/11/20 18:29:42	1.290.2.113
+++ ChangeLog	2006/12/09 18:37:06	1.290.2.114
@@ -1,3 +1,10 @@
+2006-11-29  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* sound.c (init_native_sound):
+	Only X11 and GTK devices can possibly not be on the console of the
+	associated machine. Fixes a crash when init_native_sound is called
+	on a msprinter device. 
+
 2006-11-14  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* buffer.c (buffer-file-name): Document invariant.



1.12.2.2  +1 -1      XEmacs/xemacs/src/sound.c

Index: sound.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sound.c,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -p -r1.12.2.1 -r1.12.2.2
--- sound.c	2006/07/01 05:20:01	1.12.2.1
+++ sound.c	2006/12/09 18:37:12	1.12.2.2
@@ -467,7 +467,7 @@ init_nas_sound (struct device *d)
 static void
 init_native_sound (struct device *d)
 {
-  if (DEVICE_TTY_P (d) || DEVICE_STREAM_P (d) || DEVICE_MSWINDOWS_P(d))
+  if (!(DEVICE_X_P(d) || DEVICE_GTK_P(d)))
     DEVICE_ON_CONSOLE_P (d) = 1;
 #ifdef HAVE_X_WINDOWS
   else