[gtk+/xi2: 831/1239] Merge branch 'events-refactor' into xi2

[Carlos Garnacho <carlosg src gnome org>]

commit ab6629188d3b75410eb4b7fdf0050f795f21ac91
Merge: 859049b... b32c34b...
Author: Carlos Garnacho <carlos lanedo com>
Date:   Sun Aug 23 02:01:02 2009 +0200

    Merge branch 'events-refactor' into xi2
    
    Conflicts:
    	gdk/x11/gdkwindow-x11.c

 gdk/x11/gdkdisplay-x11.c     |    3 +-
 gdk/x11/gdkeventsource.c     |   38 +++++++++++++++++++++++
 gdk/x11/gdkeventsource.h     |    6 ++++
 gdk/x11/gdkeventtranslator.c |   30 ++++++++++++++++++
 gdk/x11/gdkeventtranslator.h |   12 ++++++-
 gdk/x11/gdkwindow-x11.c      |   69 ++++++++++++++++++++++-------------------
 6 files changed, 123 insertions(+), 35 deletions(-)
---