summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 f387498ed..bb6b43e06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 so HAVE_SELECT is not defined and the poll(2) compat code doesn't get 4 so HAVE_SELECT is not defined and the poll(2) compat code doesn't get
5 built in. Remove HAVE_SELECT so we can build on platforms without poll. 5 built in. Remove HAVE_SELECT so we can build on platforms without poll.
6 - (dtucker) [scp.c] Include sys/poll.h inside HAVE_SYS_POLL_H. 6 - (dtucker) [scp.c] Include sys/poll.h inside HAVE_SYS_POLL_H.
7 - (djm) [contrib/gnome-ssh-askpass2.h] Keep askpass windown on top. From
8 Debian patch via bernd AT openbsd.org
7 9
820080228 1020080228
9 - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes 11 - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes
@@ -3651,4 +3653,4 @@
3651 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3653 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3652 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3654 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3653 3655
3654$Id: ChangeLog,v 1.4848 2008/02/29 04:07:01 dtucker Exp $ 3656$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 0ce8daec9..901176dbb 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -111,6 +111,7 @@ passphrase_dialog(char *message)
111 111
112 gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH"); 112 gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH");
113 gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); 113 gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
114 gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
114 gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label), 115 gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label),
115 TRUE); 116 TRUE);
116 117