--- Misc.pm.old	2004-09-23 14:31:23.000000000 -0700
+++ Misc.pm	2004-09-23 14:33:50.000000000 -0700
@@ -95,7 +95,7 @@ sub findbin {
 	return $path;	
 }
 
-sub urlFromWinShortcut {
+sub pathFromWinShortcut {
 	my $fullpath = shift;
 	$fullpath = pathFromFileURL($fullpath);
 	my $path = "";
@@ -112,7 +112,7 @@ sub urlFromWinShortcut {
 				$path = fileURLFromPath($path);
 				#collapse shortcuts to shortcuts into a single hop
 				if (Slim::Music::Info::isWinShortcut($path)) {
-					$path = urlFromWinShortcut($path);
+					$path = pathFromWinShortcut($path);
 				}
 			} else {
 				$::d_files && msg("Bad path in $fullpath\n");
@@ -124,7 +124,7 @@ sub urlFromWinShortcut {
 	} else {
 		$::d_files && msg("Windows shortcuts not supported on non-windows platforms\n");
 	}
-	$::d_files && msg("urlFromWinShortuct: path $path from shortcut $fullpath\n");	
+	$::d_files && msg("pathFromWinShortcut: path $path from shortcut $fullpath\n");	
 	return $path;
 }
 	
@@ -461,7 +461,7 @@ sub virtualToAbsolute {
 			if (defined($Slim::Utils::Scan::playlistCache{Slim::Utils::Misc::fileURLFromPath($curdir)})) {
 				$curdir = $Slim::Utils::Scan::playlistCache{Slim::Utils::Misc::fileURLFromPath($curdir)}
 			} else {
-				$curdir = pathFromFileURL(urlFromWinShortcut(Slim::Utils::Misc::fileURLFromPath($curdir)));
+				$curdir = pathFromWinShortcut(Slim::Utils::Misc::fileURLFromPath($curdir));
 			}
 		}
 		#continue traversing if curdir is a list
--- Scan.pm.old	2004-09-23 14:34:08.000000000 -0700
+++ Scan.pm	2004-09-23 14:33:57.000000000 -0700
@@ -111,7 +111,7 @@ sub addToList {
 	}
 	 	
 	if (Slim::Music::Info::isWinShortcut($playlisturl)) {
-		$playlisturl = Slim::Utils::Misc::urlFromWinShortcut($playlisturl);
+		$playlisturl = Slim::Utils::Misc::pathFromWinShortcut($playlisturl);
 	}
 	
 	# special case, if we try to add a song, then just add it
@@ -371,7 +371,7 @@ sub readList {   # reads a directory or 
 			if (defined Slim::Music::Info::cachedPlaylist($playlisturl)) {
 				$playlistpath = ${Slim::Music::Info::cachedPlaylist($playlisturl)}[0];
 			} else {
-				$playlistpath = Slim::Utils::Misc::urlFromWinShortcut($playlisturl);
+				$playlistpath = Slim::Utils::Misc::pathFromWinShortcut($playlisturl);
 				Slim::Music::Info::cachePlaylist($playlisturl, [$playlistpath]);
 			}
 			if ($playlistpath eq "") {