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

[Carlos Garnacho <carlosg src gnome org>]

commit 97926b116434ddfeaec26401cb53f0218e3dc518
Merge: 7d7ac80... 456d028...
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Jul 2 22:56:11 2009 +0200

    Merge branch 'events-refactor' into xi2
    
    Conflicts:
    	gdk/x11/Makefile.am

 gdk/Makefile.am                 |    3 +
 gdk/gdk.h                       |    1 +
 gdk/gdk.symbols                 |   51 +++-----
 gdk/gdkdevice.c                 |  284 +++++++++++++++++++++++++++++++++++++++
 gdk/gdkdevice.h                 |  181 +++++++++++++++++++++++++
 gdk/gdkdevicemanager.c          |    4 +
 gdk/gdkdevicemanager.h          |    2 +-
 gdk/gdkevents.h                 |    2 +-
 gdk/gdkinput.c                  |   40 ++++++
 gdk/gdkinput.h                  |  131 +-----------------
 gdk/x11/Makefile.am             |   11 +--
 gdk/x11/gdkdevice-core.c        |   68 +++++++++
 gdk/x11/gdkdevice-core.h        |   51 +++++++
 gdk/x11/gdkdevicemanager-core.c |   34 ++----
 gdk/x11/gdkdisplay-x11.c        |   46 ++++++-
 gdk/x11/gdkevents-x11.c         |    8 +-
 gdk/x11/gdkmain-x11.c           |    5 +-
 gdk/x11/gdkprivate-x11.h        |    1 -
 gdk/x11/gdkwindow-x11.c         |    4 +-
 19 files changed, 729 insertions(+), 198 deletions(-)
---
diff --cc gdk/x11/Makefile.am
index 4cd9e2c,4913b8a..cc067bd
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@@ -23,7 -23,6 +23,8 @@@ libgdk_x11_la_SOURCES =    	
  	gdkasync.h		\
  	gdkcolor-x11.c	   	\
  	gdkcursor-x11.c	   	\
++	gdkdevice-core.c	\
 +	gdkdevicemanager-core.c \
  	gdkdevicemanager-x11.c	\
  	gdkdisplay-x11.c	\
  	gdkdisplay-x11.h	\
@@@ -65,14 -62,10 +64,8 @@@
  	xsettings-common.h	\
  	xsettings-common.c
  
 -if XINPUT_XFREE
 -libgdk_x11_la_SOURCES += gdkinput-x11.c gdkinput-xfree.c
 -else
 -libgdk_x11_la_SOURCES += gdkdevicemanager-core.c gdkdevice-core.c
 +if XINPUT_2
- libgdk_x11_la_SOURCES += gdkinput-x11.c gdkinput-xfree.c gdkdevicemanager-xi2.c
- else
- if XINPUT_XFREE
- libgdk_x11_la_SOURCES += gdkinput-x11.c gdkinput-xfree.c
- else
- libgdk_x11_la_SOURCES += gdkinput-none.c
- endif
++libgdk_x11_la_SOURCES += gdkdevicemanager-xi2.c
  endif