Merge branch 'master' into XACE-SELINUX

Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
This commit is contained in:
Eamon Walsh 2007-11-19 18:10:46 -05:00 committed by Eamon Walsh
commit 2d17f47cc7
46 changed files with 92 additions and 977 deletions

View file

@ -405,7 +405,8 @@ XID winID = 0;
if ((force||(xkbi->desc->ctrls->enabled_ctrls&XkbAudibleBellMask))&&
(!eventOnly)) {
(*kbd->kbdfeed->BellProc)(percent,kbd,(pointer)pCtrl,class);
if (kbd->kbdfeed->BellProc)
(*kbd->kbdfeed->BellProc)(percent,kbd,(pointer)pCtrl,class);
}
interest = kbd->xkb_interest;
if ((!interest)||(force))