gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 08:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

avoid spurious warnings when two paths point to the same apps

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26196 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2008-03-05 09:31:10 +00:00
parent f491ac4dfb
commit 85f5384f72
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-03-05 Richard Frith-Macdonald <rfm@gnu.org>
* Tools/make_services.m: Standardise paths to avoid error reports when
two paths point to the same app.
2008-03-04 Fred Kiefer <FredKiefer@gmx.de> 2008-03-04 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSCell.m (-performClickWithFrame:inView:): Call * Source/NSCell.m (-performClickWithFrame:inView:): Call

7
Tools/make_services.m
View file

@ -436,6 +436,7 @@ scanDirectory(NSMutableDictionary *services, NSString *path)
|| [ext isEqualToString: @"profile"])) || [ext isEqualToString: @"profile"]))
{ {
newPath = [path stringByAppendingPathComponent: name]; newPath = [path stringByAppendingPathComponent: name];
newPath = [newPath stringByStandardizingPath];
if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir) if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir)
{ {
NSString *oldPath; NSString *oldPath;
@ -499,6 +500,7 @@ scanDirectory(NSMutableDictionary *services, NSString *path)
else if (ext != nil && [ext isEqualToString: @"service"]) else if (ext != nil && [ext isEqualToString: @"service"])
{ {
newPath = [path stringByAppendingPathComponent: name]; newPath = [path stringByAppendingPathComponent: name];
newPath = [newPath stringByStandardizingPath];
if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir) if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir)
{ {
NSBundle *bundle; NSBundle *bundle;
@ -538,6 +540,7 @@ scanDirectory(NSMutableDictionary *services, NSString *path)
else else
{ {
newPath = [path stringByAppendingPathComponent: name]; newPath = [path stringByAppendingPathComponent: name];
newPath = [newPath stringByStandardizingPath];
if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir) if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir)
{ {
scanDirectory(services, newPath); scanDirectory(services, newPath);
@ -567,6 +570,7 @@ scanApplications(NSMutableDictionary *services, NSString *path)
|| [ext isEqualToString: @"profile"])) || [ext isEqualToString: @"profile"]))
{ {
newPath = [path stringByAppendingPathComponent: name]; newPath = [path stringByAppendingPathComponent: name];
newPath = [newPath stringByStandardizingPath];
if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir) if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir)
{ {
NSString *oldPath; NSString *oldPath;
@ -630,6 +634,7 @@ scanApplications(NSMutableDictionary *services, NSString *path)
else else
{ {
newPath = [path stringByAppendingPathComponent: name]; newPath = [path stringByAppendingPathComponent: name];
newPath = [newPath stringByStandardizingPath];
if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir) if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir)
{ {
scanApplications(services, newPath); scanApplications(services, newPath);
@ -709,6 +714,7 @@ scanServices(NSMutableDictionary *services, NSString *path)
if (ext != nil && [ext isEqualToString: @"service"]) if (ext != nil && [ext isEqualToString: @"service"])
{ {
newPath = [path stringByAppendingPathComponent: name]; newPath = [path stringByAppendingPathComponent: name];
newPath = [newPath stringByStandardizingPath];
if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir) if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir)
{ {
NSBundle *bundle; NSBundle *bundle;
@ -748,6 +754,7 @@ scanServices(NSMutableDictionary *services, NSString *path)
else else
{ {
newPath = [path stringByAppendingPathComponent: name]; newPath = [path stringByAppendingPathComponent: name];
newPath = [newPath stringByStandardizingPath];
if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir) if ([mgr fileExistsAtPath: newPath isDirectory: &isDir] && isDir)
{ {
scanServices(services, newPath); scanServices(services, newPath);