summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <djm>2008-02-29 11:53:40 +0000
committerdjm <djm>2008-02-29 11:53:40 +0000
commit06c6fa5c26ca18ade9ee8e7e52a704cbc6984e6f (patch)
tree78b478f5c69e4b54c6ac70ac913bc75d39adc32f
parent7a538507d5771bb2a491b6f8dadd6ee0cba7da4b (diff)
downloadopenssh-06c6fa5c26ca18ade9ee8e7e52a704cbc6984e6f.tar.gz
- (djm) [contrib/gnome-ssh-askpass2.h] Keep askpass windown on top. From
Debian patch via bernd AT openbsd.org
-rw-r--r--ChangeLog4
-rw-r--r--contrib/gnome-ssh-askpass2.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f387498e..bb6b43e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
so HAVE_SELECT is not defined and the poll(2) compat code doesn't get
built in. Remove HAVE_SELECT so we can build on platforms without poll.
- (dtucker) [scp.c] Include sys/poll.h inside HAVE_SYS_POLL_H.
+ - (djm) [contrib/gnome-ssh-askpass2.h] Keep askpass windown on top. From
+ Debian patch via bernd AT openbsd.org
20080228
- (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes
@@ -3651,4 +3653,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4848 2008/02/29 04:07:01 dtucker Exp $
+$Id: ChangeLog,v 1.4849 2008/02/29 11:53:40 djm Exp $
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
index 0ce8daec..901176db 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -111,6 +111,7 @@ passphrase_dialog(char *message)
gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH");
gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+ gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label),
TRUE);