From bb2c4f4978f2d5ff1fb2ce3c197b7529430bff07 Mon Sep 17 00:00:00 2001
From: Riccardo Mottola <rm@gnu.org>
Date: Fri, 7 Feb 2025 03:14:49 +0100
Subject: [PATCH] resolve links, so that e.g /home/xxx /usr/home/xxx match

---
 Source/NSWorkspace.m | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m
index 0ed6dcef3..6bc7f7136 100644
--- a/Source/NSWorkspace.m
+++ b/Source/NSWorkspace.m
@@ -28,7 +28,7 @@
    If not, see <http://www.gnu.org/licenses/> or write to the 
    Free Software Foundation, 51 Franklin Street, Fifth Floor, 
    Boston, MA 02110-1301, USA.
-*/ 
+*/
 
 #import "config.h"
 
@@ -794,10 +794,10 @@ - (id) init
     }
 
   if (sysDir != nil)
-    [folderPathIconDict setObject: @"GSFolder" forKey: sysDir];
+    [folderPathIconDict setObject: @"GSFolder" forKey: [sysDir stringByResolvingSymlinksInPath]];
 
   [folderPathIconDict setObject: @"HomeDirectory"
-    forKey: NSHomeDirectory()];
+			 forKey: [NSHomeDirectory() stringByResolvingSymlinksInPath]];
 
   /* it would be nice to use different root icons... */
   [folderPathIconDict setObject: @"Root_PC" forKey: NSOpenStepRootDirectory()];
@@ -805,42 +805,42 @@ - (id) init
   for (i = 0; i < [libraryDirs count]; i++)
     {
       [folderPathIconDict setObject: @"LibraryFolder"
-	forKey: [libraryDirs objectAtIndex: i]];
+	forKey: [[libraryDirs objectAtIndex: i] stringByResolvingSymlinksInPath]];
     }
   for (i = 0; i < [appDirs count]; i++)
     {
       [folderPathIconDict setObject: @"ApplicationFolder"
-	forKey: [appDirs objectAtIndex: i]];
+	forKey: [[appDirs objectAtIndex: i] stringByResolvingSymlinksInPath]];
     }
   for (i = 0; i < [documentDir count]; i++)
     {
       [folderPathIconDict setObject: @"DocsFolder"
-	forKey: [documentDir objectAtIndex: i]];
+	forKey: [[documentDir objectAtIndex: i] stringByResolvingSymlinksInPath]];
     }
   for (i = 0; i < [downloadDir count]; i++)
     {
       [folderPathIconDict setObject: @"DownloadFolder"
-	forKey: [downloadDir objectAtIndex: i]];
+	forKey: [[downloadDir objectAtIndex: i] stringByResolvingSymlinksInPath]];
     }
   for (i = 0; i < [desktopDir count]; i++)
     {
       [folderPathIconDict setObject: @"Desktop"
-	forKey: [desktopDir objectAtIndex: i]];
+	forKey: [[desktopDir objectAtIndex: i] stringByResolvingSymlinksInPath]];
     }
   for (i = 0; i < [imgDir count]; i++)
     {
       [folderPathIconDict setObject: @"ImageFolder"
-	forKey: [imgDir objectAtIndex: i]];
+	forKey: [[imgDir objectAtIndex: i] stringByResolvingSymlinksInPath]];
     }
   for (i = 0; i < [musicDir count]; i++)
     {
       [folderPathIconDict setObject: @"MusicFolder"
-	forKey: [musicDir objectAtIndex: i]];
+	forKey: [[musicDir objectAtIndex: i] stringByResolvingSymlinksInPath]];
     }
   for (i = 0; i < [videoDir count]; i++)
     {
       [folderPathIconDict setObject: @"VideoFolder"
-	forKey: [videoDir objectAtIndex: i]];
+	forKey: [[videoDir objectAtIndex: i] stringByResolvingSymlinksInPath]];
     }
   folderIconCache = [[NSMutableDictionary alloc] init];
 
@@ -1514,13 +1514,13 @@ - (NSImage*) iconForFile: (NSString*)fullPath
   if ([fileType isEqual: NSFileTypeDirectory] == YES)
     {
       NSString *iconPath = nil;
-      
+
       if ([pathExtension isEqualToString: @"app"]
 	|| [pathExtension isEqualToString: @"debug"]
 	|| [pathExtension isEqualToString: @"profile"])
 	{
 	  image = [self appIconForApp: fullPath];
-	  
+
 	  if (image == nil)
 	    {
 	      /*