gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed generating the Icon=... entry of .desktop files.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32807 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2011-04-08 18:16:34 +00:00
parent 9d31f2d08d
commit b342e83be1
2 changed files with 64 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2011-04-08 Nicola Pero <nicola.pero@meta-innovation.com>
* Tools/pl2link.m (main): Fixed determining the installation
location with the current filesystem layout (Problem reported by
"Philippe Roussel" <p.o.roussel@free.fr>).
2011-04-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/GSMime.m: Fix failure to connect to mail server.

78
Tools/pl2link.m
View file

@ -1,7 +1,7 @@
/*
This tool produces a desktop link file for KDE and Gnome out of a GNUstep
property list.
Copyright (C) 20010 Free Software Foundation, Inc.
Copyright (C) 2001, 2011 Free Software Foundation, Inc.
Written by: Fred Kiefer <FredKiefer@gmx.de>
Created: December 2001
@ -30,6 +30,7 @@
#import "Foundation/NSException.h"
#import "Foundation/NSFileManager.h"
#import "Foundation/NSProcessInfo.h"
#import "Foundation/NSPathUtilities.h"
int
main(int argc, char** argv, char **env)
@ -43,7 +44,6 @@ main(int argc, char** argv, char **env)
NSDictionary *plist = nil;
NSArray *list;
NSString *entry;
NSString *installDomain;
NSString *installPath = @"";
NSString *appName = @"";
@ -117,27 +117,65 @@ main(int argc, char** argv, char **env)
{
[fileContents appendFormat: @"Comment=%@\n", entry];
}
installDomain = [[procinfo environment] objectForKey: @"GNUSTEP_INSTALLATION_DOMAIN"];
if(installDomain != nil)
{
if([installDomain isEqualToString: @"SYSTEM"])
{
installPath = [[procinfo environment] objectForKey: @"GNUSTEP_SYSTEM_ROOT"];
}
else
{
installPath = [[procinfo environment] objectForKey: @"GNUSTEP_LOCAL_ROOT"];
}
}
else
{
installPath = [[procinfo environment] objectForKey: @"GNUSTEP_LOCAL_ROOT"];
}
/* Try to guess where the application will be installed. PS: At the
moment, this is only required for NSIcon, so I suppose we could
skip it if there is no NSIcon. */
{
/* The default installation domain is the local domain. Assume
that's the case unless something is specified. */
NSSearchPathDomainMask domain = NSLocalDomainMask;
NSString *installDomain;
NSArray *installPaths;
installDomain = [[procinfo environment] objectForKey: @"GNUSTEP_INSTALLATION_DOMAIN"];
if(installDomain != nil)
{
if ([installDomain isEqualToString: @"SYSTEM"])
{
domain = NSSystemDomainMask;
}
else if ([installDomain isEqualToString: @"NETWORK"])
{
domain = NSNetworkDomainMask;
}
else if ([installDomain isEqualToString: @"USER"])
{
domain = NSUserDomainMask;
}
/* In all other cases, we leave domain == NSLocalDomainMask. */
}
installPaths = NSSearchPathForDirectoriesInDomains (NSApplicationDirectory, domain, YES);
if ([installPaths count] > 0)
{
installPath = [installPaths objectAtIndex: 0];
}
else
{
/* Ahm - this should never happen. */
GSPrintf(stderr, @"Error determining the application installation location\n");
/* Try to get any application installation path. */
installPaths = NSSearchPathForDirectoriesInDomains (NSApplicationDirectory, NSAllDomainsMask, YES);
if ([installPaths count] > 0)
{
installPath = [installPaths objectAtIndex: 0];
GSPrintf(stderr, @"Assuming it will be installed into '%@' (this may be wrong!)\n", installPath);
}
else
{
[pool release];
exit(EXIT_FAILURE);
}
}
}
entry = [plist objectForKey: @"NSIcon"];
if (entry != nil)
{
NSString *iconPath = [[[[[installPath stringByAppendingPathComponent: @"Applications"]
stringByAppendingPathComponent:appName]
NSString *iconPath = [[[[installPath stringByAppendingPathComponent:appName]
stringByAppendingPathExtension:@"app"]
stringByAppendingPathComponent:@"Resources"]
stringByAppendingPathComponent:entry];