rpms/xterm/F-9 xterm-242-xbell.patch,NONE,1.1 xterm.spec,1.70,1.71

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5272

Modified Files:
	xterm.spec 
Added Files:
	xterm-242-xbell.patch 
Log Message:
- fix bell (#487829)


xterm-242-xbell.patch:

--- NEW FILE xterm-242-xbell.patch ---
# patch by Thomas E. Dickey <dickey at invisible-island.net>
# created  Sat Feb 28 16:00:38 UTC 2009
# ------------------------------------------------------------------------------
# misc.c         |   16 +++++++---------
# version.h      |    4 ++--
# xterm.log.html |   10 +++++++++-
# 3 files changed, 18 insertions(+), 12 deletions(-)
# ------------------------------------------------------------------------------
Index: misc.c
--- xterm-242+/misc.c	2009-02-13 23:39:29.000000000 +0000
+++ xterm-242a/misc.c	2009-02-28 15:37:30.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.405 2009/02/13 23:39:29 tom Exp $ */
+/* $XTermId: misc.c,v 1.406 2009/02/28 15:37:30 tom Exp $ */
 
 /*
  *
@@ -821,16 +821,14 @@
 void
 xtermBell(XtermWidget xw, int which, int percent)
 {
-    if (percent > 0) {
-	TScreen *screen = TScreenOf(xw);
+    TScreen *screen = TScreenOf(xw);
 #if defined(HAVE_XKB_BELL_EXT)
-	Atom tony = AtomBell(xw, which);
-	if (tony != None) {
-	    XkbBell(screen->display, VShellWindow, percent, tony);
-	} else
+    Atom tony = AtomBell(xw, which);
+    if (tony != None) {
+	XkbBell(screen->display, VShellWindow, percent, tony);
+    } else
 #endif
-	    XBell(screen->display, percent);
-    }
+	XBell(screen->display, percent);
 }
 
 void


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-9/xterm.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- xterm.spec	18 Feb 2009 14:57:59 -0000	1.70
+++ xterm.spec	2 Mar 2009 13:00:01 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
 Version: 242
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -16,6 +16,7 @@
 Patch1: xterm-242-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
+Patch4: xterm-242-xbell.patch
 
 %bcond_with trace
 
@@ -32,6 +33,7 @@
 %patch1 -p1 -b .resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
+%patch4 -p1 -b .xbell
 
 %build
 %configure \
@@ -82,6 +84,9 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Mon Mar 02 2009 Miroslav Lichvar <mlichvar at redhat.com> 242-2.fc9
+- fix bell (#487829)
+
 * Wed Feb 18 2009 Miroslav Lichvar <mlichvar at redhat.com> 242-1.fc9
 - update to 242