|
 |
1a94a7 |
From e91197a37f6841ada71204cd41f7d0459adffd9a Mon Sep 17 00:00:00 2001
|
|
|
1a94a7 |
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
|
1a94a7 |
Date: Mon, 17 Dec 2018 14:13:05 +0100
|
|
|
1a94a7 |
Subject: [PATCH] a11y: Check display in `*grab_cell_focus()`
|
|
|
1a94a7 |
|
|
|
1a94a7 |
Calling the accessibility function `grab_focus()` on a `GtkCell` under
|
|
|
1a94a7 |
Wayland will cause the client to crash.
|
|
|
1a94a7 |
|
|
|
1a94a7 |
This is another case of `gdk_x11_get_server_time()` being called
|
|
|
1a94a7 |
regardless of the actual windowing backend used.
|
|
|
1a94a7 |
|
|
|
1a94a7 |
Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1507
|
|
|
1a94a7 |
---
|
|
|
1a94a7 |
gtk/a11y/gtktreeviewaccessible.c | 9 +++++----
|
|
|
1a94a7 |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
1a94a7 |
|
|
|
1a94a7 |
diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
|
|
|
1a94a7 |
index efb9c9bc53..eec4480f29 100644
|
|
|
1a94a7 |
--- a/gtk/a11y/gtktreeviewaccessible.c
|
|
|
1a94a7 |
+++ b/gtk/a11y/gtktreeviewaccessible.c
|
|
|
1a94a7 |
@@ -1174,11 +1174,12 @@ gtk_tree_view_accessible_grab_cell_focus (GtkCellAccessibleParent *parent,
|
|
|
1a94a7 |
if (gtk_widget_is_toplevel (toplevel))
|
|
|
1a94a7 |
{
|
|
|
1a94a7 |
#ifdef GDK_WINDOWING_X11
|
|
|
1a94a7 |
- gtk_window_present_with_time (GTK_WINDOW (toplevel),
|
|
|
1a94a7 |
- gdk_x11_get_server_time (gtk_widget_get_window (widget)));
|
|
|
1a94a7 |
-#else
|
|
|
1a94a7 |
- gtk_window_present (GTK_WINDOW (toplevel));
|
|
|
1a94a7 |
+ if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (toplevel)))
|
|
|
1a94a7 |
+ gtk_window_present_with_time (GTK_WINDOW (toplevel),
|
|
|
1a94a7 |
+ gdk_x11_get_server_time (gtk_widget_get_window (widget)));
|
|
|
1a94a7 |
+ else
|
|
|
1a94a7 |
#endif
|
|
|
1a94a7 |
+ gtk_window_present (GTK_WINDOW (toplevel));
|
|
|
1a94a7 |
}
|
|
|
1a94a7 |
|
|
|
1a94a7 |
return TRUE;
|
|
|
1a94a7 |
--
|
|
|
1a94a7 |
2.20.1
|
|
|
1a94a7 |
|