callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new getter

Browse Source 
This avoids the use of generic api in the per-event code path.
This commit is contained in:
Matthias Clasen
2016-04-30 20:59:16 -04:00
parent 7f4b575fc3
commit 98f16fdf7a
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/gdkwindow.c
View File

@ -9559,8 +9559,6 @@ _gdk_windowing_got_event (GdkDisplay *display,
if (device) if (device)
{ {
GdkInputMode mode;
if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD) if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
{ {
pointer_info = _gdk_display_get_pointer_info (display, device); pointer_info = _gdk_display_get_pointer_info (display, device);
@ -9572,10 +9570,9 @@ _gdk_windowing_got_event (GdkDisplay *display,
source_device = pointer_info->last_slave; source_device = pointer_info->last_slave;
} }
g_object_get (device, "input-mode", &mode, NULL);
_gdk_display_device_grab_update (display, device, source_device, serial); _gdk_display_device_grab_update (display, device, source_device, serial);
if (mode == GDK_MODE_DISABLED || if (gdk_device_get_input_mode (device) == GDK_MODE_DISABLED ||
!_gdk_display_check_grab_ownership (display, device, serial)) !_gdk_display_check_grab_ownership (display, device, serial))
{ {
/* Device events are blocked by another /* Device events are blocked by another