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

[Carlos Garnacho <carlosg src gnome org>]

commit 86cd2bafb63ce8a90aadf2f446a3d0a9b265eadb
Merge: e5cece6... d8b6c8b...
Author: Carlos Garnacho <carlos gnome org>
Date:   Sat Sep 26 14:08:02 2009 +0200

    Merge branch 'events-refactor' into xi2

 gdk/gdk.symbols         |   15 ++-------------
 gdk/gdkdevice.c         |   13 +++++++++++++
 gdk/x11/Makefile.am     |    6 +++---
 gdk/x11/gdkinput-none.c |    2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)
---
diff --cc gdk/gdk.symbols
index 91229ef,04ad233..9af03f2
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@@ -401,22 -388,22 +401,11 @@@ gdk_device_free_histor
  gdk_device_get_axis
  gdk_device_get_history
  gdk_device_get_type G_GNUC_CONST
++gdk_device_get_state
  gdk_device_set_axis_use
  gdk_device_set_key
--gdk_device_set_source
--#endif
--
--#if IN_FILE(__GDK_INPUT_NONE_C__)
--gdk_device_get_state
--gdk_device_set_mode
--#endif
--
--#if IN_FILE(__GDK_INPUT_XFREE_C__)
  gdk_device_set_mode
--#endif
--
--#if IN_FILE(__GDK_INPUT_X11_C__)
--gdk_device_get_state
++gdk_device_set_source
  #endif
  #endif
  
diff --cc gdk/gdkdevice.c
index 0bae5a1,6cba30e..8a4182f
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@@ -285,6 -207,6 +285,19 @@@ gdk_device_get_property (GObject    *ob
      }
  }
  
++void
++gdk_device_get_state (GdkDevice       *device,
++                      GdkWindow       *window,
++                      gdouble         *axes,
++                      GdkModifierType *mask)
++{
++  g_return_if_fail (GDK_IS_DEVICE (device));
++  g_return_if_fail (GDK_IS_WINDOW (window));
++
++  if (GDK_DEVICE_GET_CLASS (device)->get_state)
++    GDK_DEVICE_GET_CLASS (device)->get_state (device, window, axes, mask);
++}
++
  gboolean
  gdk_device_get_history (GdkDevice      *device,
                          GdkWindow      *window,
diff --cc gdk/x11/Makefile.am
index 7f27140,e23e793..0bfc0a5
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@@ -64,12 -63,10 +64,12 @@@ libgdk_x11_la_SOURCES =    	
  	xsettings-common.h	\
  	xsettings-common.c
  
 -if XINPUT_XFREE
 -libgdk_x11_la_SOURCES += gdkdevicemanager-xi.c gdkdevice-xi.c gdkinput-x11.c gdkinput-xfree.c
 +if XINPUT_2
 +libgdk_x11_la_SOURCES += gdkdevicemanager-xi2.c gdkdevice-xi2.c
- elif if XINPUT_XFREE
- libgdk_x11_la_SOURCES += gdkdevicemanager-xi.c gdkdevice-xi.c
  else
--libgdk_x11_la_SOURCES += gdkinput-none.c
++if XINPUT_XFREE
++libgdk_x11_la_SOURCES += gdkdevicemanager-xi.c gdkdevice-xi.c
++endif
  endif