diff options
| author | Benjamin Otte <otte.benjamin@googlemail.com> | 2018-04-30 09:55:45 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte.benjamin@googlemail.com> | 2018-04-30 09:55:45 +0000 |
| commit | 279d7bb2f501ac4ced717d16fbfacc38bf8123fd (patch) | |
| tree | 9c68c223375b0043b962c39c9fc7053e9d472a0c | |
| parent | ff47cb0c519a0e24bfe2e9d80826ab2954cf3e42 (diff) | |
| parent | c926b28d965dbae90b17d404d2c6d1e031a6f006 (diff) | |
| download | gtk+-279d7bb2f501ac4ced717d16fbfacc38bf8123fd.tar.gz | |
Merge branch 'window-activate-grab-3-3' into 'gtk-3-22'
gdk: do not deactivate window on keyboard grabs
See merge request GNOME/gtk!127
| -rw-r--r-- | gdk/x11/gdkdevicemanager-core-x11.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkeventsource.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c index 350a79b03f..7f7aa048aa 100644 --- a/gdk/x11/gdkdevicemanager-core-x11.c +++ b/gdk/x11/gdkdevicemanager-core-x11.c @@ -30,7 +30,7 @@ #define HAS_FOCUS(toplevel) \ - ((toplevel)->has_focus || (toplevel)->has_pointer_focus) + ((toplevel)->has_focus_window || (toplevel)->has_pointer_focus) static void gdk_x11_device_manager_core_finalize (GObject *object); static void gdk_x11_device_manager_core_constructed (GObject *object); diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c index 774d10c528..590e597c75 100644 --- a/gdk/x11/gdkeventsource.c +++ b/gdk/x11/gdkeventsource.c @@ -33,7 +33,7 @@ static gboolean gdk_event_source_dispatch (GSource *source, static void gdk_event_source_finalize (GSource *source); #define HAS_FOCUS(toplevel) \ - ((toplevel)->has_focus || (toplevel)->has_pointer_focus) + ((toplevel)->has_focus_window || (toplevel)->has_pointer_focus) struct _GdkEventSource { |