[PULL] trivial fixes

[Jamey Sharp]

These commits have been reviewed and I believe are ready for merge.

The following changes since commit 25d1c6cd37cc4079adf7c4bad8d10678fb08b409:
  Keith Packard (1):
        Exa screen private has SavedSourceValidate, not SourceValidate

are available in the git repository at:

  git://people.freedesktop.org/~jamey/xserver for-keith

Jamey Sharp (3):
      Boolean-or short-circuits, so (a || (!a && ...)) is redundant. Simplify.
      Kill unused/useless macros in panoramiX.h: BREAK_IF, IF_RETURN, FORCE_ROOT
      ProcGrabButton: remove redundant error check.

 Xext/panoramiX.c      |    3 ++-
 Xext/panoramiX.h      |   13 -------------
 Xext/panoramiXprocs.c |    2 +-
 Xext/shape.c          |    6 +++---
 dix/events.c          |    1 -
 mi/miinitext.c        |    3 +--
 6 files changed, 7 insertions(+), 21 deletions(-)