Now that we've decided on a file extension for private key files

(.PPK), make it the default in all the private-key file dialogs.

[originally from svn r1808]

diff --git a/pageant.c b/pageant.c
index df24a7dfde75542437b90df70c087728966ab4c2..0f423f2d6f0b9f5c5680942f95772c19b01070cf 100644 (file)
--- a/pageant.c
+++ b/pageant.c
@@ -1240,7 +1240,7 @@ static void prompt_add_keyfile(void)
     of.lStructSize = sizeof(of);
 #endif
     of.hwndOwner = main_hwnd;
-    of.lpstrFilter = "All Files\0*\0\0\0";
+    of.lpstrFilter = "PuTTY Private Key Files\0*.PPK\0AllFiles\0*\0\0\0";
     of.lpstrCustomFilter = NULL;
     of.nFilterIndex = 1;
     of.lpstrFile = filelist;

diff --git a/puttygen.c b/puttygen.c
index 2d58975929b52b0d24935ff82906ebc974a7f07a..44b5ec9e67b62446f44eae7ff2ef763ac8c88f2c 100644 (file)
--- a/puttygen.c
+++ b/puttygen.c
@@ -182,7 +182,7 @@ static int prompt_keyfile(HWND hwnd, char *dlgtitle,
     of.lStructSize = sizeof(of);
 #endif
     of.hwndOwner = hwnd;
-    of.lpstrFilter = "All Files\0*\0\0\0";
+    of.lpstrFilter = "PuTTY Private Key Files\0*.PPK\0AllFiles\0*\0\0\0";
     of.lpstrCustomFilter = NULL;
     of.nFilterIndex = 1;
     of.lpstrFile = filename;
@@ -190,6 +190,7 @@ static int prompt_keyfile(HWND hwnd, char *dlgtitle,
     of.nMaxFile = FILENAME_MAX;
     of.lpstrFileTitle = NULL;
     of.lpstrInitialDir = NULL;
+    of.lpstrDefExt = ".ppk";
     of.lpstrTitle = dlgtitle;
     of.Flags = 0;
     if (save)

diff --git a/windlg.c b/windlg.c
index bdc9852185e4ec58d81f6edeb4d3e7524b8d4916..2876d9dbfa90afe327c50ab7bbec7d50079761a8 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -3133,7 +3133,8 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
                of.lStructSize = sizeof(of);
 #endif
                of.hwndOwner = hwnd;
-               of.lpstrFilter = "All Files\0*\0\0\0";
+               of.lpstrFilter = "PuTTY Private Key Files\0*.PPK\0"
+                   "AllFiles\0*\0\0\0";
                of.lpstrCustomFilter = NULL;
                of.nFilterIndex = 1;
                of.lpstrFile = filename;