2 files changed, 8 insertions, 0 deletions

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)
 
         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);
 
diff --git a/debian/changelog b/debian/changelog
index 5664832e9..427ba317a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:3.9p1-4) UNRELEASED; urgency=low
+
+  * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU;
+    closes: #296487).
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 22 Feb 2005 22:14:03 +0000
+
 openssh (1:3.9p1-3) experimental; urgency=low
 
   * Explain how to run sshd from inittab in README.Debian (closes: #147360).