diff options
author | Damien Miller <djm@mindrot.org> | 2009-11-18 17:51:59 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-11-18 17:51:59 +1100 |
commit | 2191e04549839502631f3f97ededd301a1498cd0 (patch) | |
tree | 69a7ee2632b56ef5ee7331986cac05707878d646 | |
parent | 04ee0f8f12ff3a1227439c5f67623547d7a5bd11 (diff) |
- (djm) [contrib/gnome-ssh-askpass2.c] Make askpass dialog desktop-modal.
bz#1645, patch from jchadima AT redhat.com
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | contrib/gnome-ssh-askpass2.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -2,7 +2,9 @@ | |||
2 | - (djm) [channels.c misc.c misc.h sshd.c] add missing setsockopt() to | 2 | - (djm) [channels.c misc.c misc.h sshd.c] add missing setsockopt() to |
3 | set IPV6_V6ONLY for local forwarding with GatwayPorts=yes. Unify | 3 | set IPV6_V6ONLY for local forwarding with GatwayPorts=yes. Unify |
4 | setting IPV6_V6ONLY behind a new function misc.c:sock_set_v6only() | 4 | setting IPV6_V6ONLY behind a new function misc.c:sock_set_v6only() |
5 | report and fix from jan.kratochvil AT redhat.com | 5 | bz#1648, report and fix from jan.kratochvil AT redhat.com |
6 | - (djm) [contrib/gnome-ssh-askpass2.c] Make askpass dialog desktop-modal. | ||
7 | bz#1645, patch from jchadima AT redhat.com | ||
6 | 8 | ||
7 | 20091107 | 9 | 20091107 |
8 | - (dtucker) [authfile.c] Fall back to 3DES for the encryption of private | 10 | - (dtucker) [authfile.c] Fall back to 3DES for the encryption of private |
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c index 901176dbb..9d97c30c0 100644 --- a/contrib/gnome-ssh-askpass2.c +++ b/contrib/gnome-ssh-askpass2.c | |||
@@ -120,6 +120,8 @@ passphrase_dialog(char *message) | |||
120 | g_signal_connect(G_OBJECT(entry), "activate", | 120 | g_signal_connect(G_OBJECT(entry), "activate", |
121 | G_CALLBACK(ok_dialog), dialog); | 121 | G_CALLBACK(ok_dialog), dialog); |
122 | 122 | ||
123 | gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); | ||
124 | |||
123 | /* Grab focus */ | 125 | /* Grab focus */ |
124 | gtk_widget_show_now(dialog); | 126 | gtk_widget_show_now(dialog); |
125 | if (grab_pointer) { | 127 | if (grab_pointer) { |