2 files changed, 30 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 21d6358a4..840369f2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,31 @@
+19991122
+ - Make <enter> close gnome-ssh-askpass (Debian bug #50299)
+
 19991121
-  - OpenBSD CVS Changes
-    - [channels.c]
-      make this compile, bad markus
-    - [log.c readconf.c servconf.c ssh.h]
-      bugfix: loglevels are per host in clientconfig,
-      factor out common log-level parsing code.
-    - [servconf.c]
-      remove unused index (-Wall)
-    - [ssh-agent.c]
-      only one 'extern char *__progname'
-    - [sshd.8]
-      document SIGHUP, -Q to synopsis
-    - [sshconnect.c serverloop.c sshd.c packet.c packet.h]
-      [channels.c clientloop.c]
-      SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@
-      [hope this time my ISP stays alive during commit]
-    - [OVERVIEW README] typos; green@freebsd
-    - [ssh-keygen.c]
-      replace xstrdup+strcat with strlcat+fixed buffer, fixes OF (bad me)
-      exit if writing the key fails (no infinit loop)
-      print usage() everytime we get bad options
-    - [ssh-keygen.c] overflow, djm@mindrot.org
-    - [sshd.c] fix sigchld race; cjc5@po.cwru.edu
-      
+ - OpenBSD CVS Changes
+   - [channels.c]
+     make this compile, bad markus
+   - [log.c readconf.c servconf.c ssh.h]
+     bugfix: loglevels are per host in clientconfig,
+     factor out common log-level parsing code.
+   - [servconf.c]
+     remove unused index (-Wall)
+   - [ssh-agent.c]
+     only one 'extern char *__progname'
+   - [sshd.8]
+     document SIGHUP, -Q to synopsis
+   - [sshconnect.c serverloop.c sshd.c packet.c packet.h]
+     [channels.c clientloop.c]
+     SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@
+     [hope this time my ISP stays alive during commit]
+   - [OVERVIEW README] typos; green@freebsd
+   - [ssh-keygen.c]
+     replace xstrdup+strcat with strlcat+fixed buffer, fixes OF (bad me)
+     exit if writing the key fails (no infinit loop)
+     print usage() everytime we get bad options
+   - [ssh-keygen.c] overflow, djm@mindrot.org
+   - [sshd.c] fix sigchld race; cjc5@po.cwru.edu
+     
 19991120
  - Merged more Solaris support from Marc G. Fournier 
    <marc.fournier@acadiau.ca>
diff --git a/gnome-ssh-askpass.c b/gnome-ssh-askpass.c
index 749560992..93a64d1e1 100644
--- a/gnome-ssh-askpass.c
+++ b/gnome-ssh-askpass.c
@@ -74,6 +74,9 @@ int passphrase_dialog(char **passphrase_p, char *message)
         gdk_pointer_grab(dialog->window, TRUE, 0, NULL, NULL, GDK_CURRENT_TIME);
         gdk_keyboard_grab(dialog->window, FALSE, GDK_CURRENT_TIME);
 
+        /* Make <enter> close dialog */
+        gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry));
+
         /* Run dialog */
         result = gnome_dialog_run(GNOME_DIALOG(dialog));