3 files changed, 12 insertions, 1 deletions

diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
index 901176dbb..86d9f9d05 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -207,6 +207,8 @@ main(int argc, char **argv)
 
         gtk_init(&argc, &argv);
 
+        gtk_window_set_default_icon_from_file ("/usr/share/pixmaps/ssh-askpass-gnome.png", NULL);
+
         if (argc > 1) {
                 message = g_strjoinv(" ", argv + 1);
         } else {
diff --git a/debian/changelog b/debian/changelog
index 793835199..b3b620f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openssh (1:4.3p2-8) UNRELEASED; urgency=low
+
+  [ Vincent Untz ]
+  * Give the ssh-askpass-gnome window a default icon; remove unnecessary
+    icon extension from .desktop file (closes:
+    https://launchpad.net/bugs/27152).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 11 Dec 2006 15:04:44 +0000
+
 openssh (1:4.3p2-7) unstable; urgency=medium
 
   [ Colin Watson ]
diff --git a/debian/ssh-askpass-gnome.desktop b/debian/ssh-askpass-gnome.desktop
index ecbb920d7..84a870d50 100644
--- a/debian/ssh-askpass-gnome.desktop
+++ b/debian/ssh-askpass-gnome.desktop
@@ -8,5 +8,5 @@ Exec=/usr/bin/ssh-add
 TryExec=ssh-add
 Terminal=false
 Type=Application
-Icon=ssh-askpass-gnome.png
+Icon=ssh-askpass-gnome
 Categories=Application;Network;