Try to delete jump lists in "-cleanup".

[originally from svn r9050]

diff --git a/windows/winjump.c b/windows/winjump.c
index 4e69dd7467c67f0d72fe64065d6a83a31a8e8858..5cd981454a26854e6fc2196496e3e252e266e173 100644 (file)
--- a/windows/winjump.c
+++ b/windows/winjump.c
@@ -663,7 +663,7 @@ static void update_jumplist_from_registry(void)
 }
 
 /* Clears the entire jumplist. */
-static void clear_jumplist(void)
+void clear_jumplist(void)
 {
     ICustomDestinationList *pCDL;
     UINT num_items;

diff --git a/windows/winnojmp.c b/windows/winnojmp.c
index 5a3ae83e7e5894ac81a18e0c778432d6a66c3606..27d969a3b0594000d6d4431f5553921805bda846 100644 (file)
--- a/windows/winnojmp.c
+++ b/windows/winnojmp.c
@@ -5,3 +5,4 @@
 \r
 void add_session_to_jumplist(const char * const sessionname) {}\r
 void remove_session_from_jumplist(const char * const sessionname) {}\r
+void clear_jumplist(void) {}\r

diff --git a/windows/winstore.c b/windows/winstore.c
index 00049b74369279f3c6fa2bfe8990c0901431a58e..99b1ab8a572d287f3da52ae010883d69d9992969 100644 (file)
--- a/windows/winstore.c
+++ b/windows/winstore.c
@@ -779,6 +779,12 @@ void cleanup_all(void)
      */
     access_random_seed(DEL);
 
+    /* ------------------------------------------------------------
+     * Ask Windows to delete any jump list information associated
+     * with this installation of PuTTY.
+     */
+    clear_jumplist();
+
     /* ------------------------------------------------------------
      * Destroy all registry information associated with PuTTY.
      */

diff --git a/windows/winstuff.h b/windows/winstuff.h
index 28f6556b07c25f3397a46153e737d4bd5699a6cd..610d71a59b5643b2b46110567cb45bb42b1d7931 100644 (file)
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -514,6 +514,7 @@ extern Backend serial_backend;
 #define JUMPLIST_SUPPORTED             /* suppress #defines in putty.h */
 void add_session_to_jumplist(const char * const sessionname);
 void remove_session_from_jumplist(const char * const sessionname);
+void clear_jumplist(void);
 
 /*
  * Extra functions in winstore.c over and above the interface in