You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
1.2 KiB
34 lines
1.2 KiB
commit 2b1fb2f30a94a967dacec298e3c7d8a80b4c3194 |
|
Author: Damien Goutte-Gattat <dgouttegattat@incenp.org> |
|
Date: Wed Aug 23 21:46:22 2017 +0200 |
|
|
|
gtk: Really always set the window as transient. |
|
|
|
* gtk+-2/pinentry-gtk-2.c (make_transient): Set the window as |
|
transient even if we do not grab the keyboard. |
|
-- |
|
|
|
In the previous commit attempting to fix issue 3253, the window |
|
was set as transient only in grabbing mode. The window should |
|
actually always be set as transient, independently of whether |
|
we grab the keyboard or not. This is especially important now |
|
that --no-grab is the default behavior of GnuPG Agent. |
|
|
|
GnuPG-bug-id: 3253 |
|
Fixes-commit: f69dadc6ccea7672869436291ab5c1f58d545466 |
|
Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org> |
|
|
|
diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c |
|
index f17a702..89728c4 100644 |
|
--- a/gtk+-2/pinentry-gtk-2.c |
|
+++ b/gtk+-2/pinentry-gtk-2.c |
|
@@ -136,9 +136,6 @@ make_transient (GtkWidget *win, GdkEvent *event, gpointer data) |
|
(void)event; |
|
(void)data; |
|
|
|
- if (! pinentry->grab) |
|
- return; |
|
- |
|
/* Make window transient for the root window. */ |
|
screen = gdk_screen_get_default (); |
|
root = gdk_screen_get_root_window (screen);
|
|
|