2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c2e6cadc6..566167053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
  - (djm) [channels.c misc.c misc.h sshd.c] add missing setsockopt() to
    set IPV6_V6ONLY for local forwarding with GatwayPorts=yes. Unify
    setting IPV6_V6ONLY behind a new function misc.c:sock_set_v6only()
-   report and fix from jan.kratochvil AT redhat.com
+   bz#1648, report and fix from jan.kratochvil AT redhat.com
+ - (djm) [contrib/gnome-ssh-askpass2.c] Make askpass dialog desktop-modal.
+   bz#1645, patch from jchadima AT redhat.com
 
 20091107
  - (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)
         g_signal_connect(G_OBJECT(entry), "activate",
                          G_CALLBACK(ok_dialog), dialog);
 
+        gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
+
         /* Grab focus */
         gtk_widget_show_now(dialog);
         if (grab_pointer) {