[gtk+/xi2: 1192/1239] GdkDevice: Allow master devices to change input mode.

[Carlos Garnacho <carlosg src gnome org>]

commit 456dfbd25610d2f43204144b5c4e404ea85e4ddc
Author: Carlos Garnacho <carlos gnome org>
Date:   Sat Sep 19 17:08:53 2009 +0200

    GdkDevice: Allow master devices to change input mode.

 gdk/gdkdevice.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index fb8f73a..8a4182f 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -344,9 +344,6 @@ gdk_device_set_mode (GdkDevice    *device,
 {
   g_return_val_if_fail (GDK_IS_DEVICE (device), FALSE);
 
-  if (gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_MASTER)
-    return FALSE;
-
   if (device->mode == mode)
     return TRUE;
 
@@ -355,7 +352,8 @@ gdk_device_set_mode (GdkDevice    *device,
   device->mode = mode;
   g_object_notify (G_OBJECT (device), "input-mode");
 
-  _gdk_input_check_extension_events (device);
+  if (gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_MASTER)
+    _gdk_input_check_extension_events (device);
 
   return TRUE;
 }