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

minor tidyup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34742 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-02-08 10:36:46 +00:00
parent 0bf9693431
commit b71be91d36
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/NSPasteboard.m
View file

@ -770,8 +770,8 @@ static NSString *namePrefix = @"NSTypedFilenamesPboardType:";
filename = o; filename = o;
} }
else if ([o isKindOfClass: [NSArray class]] == YES else if ([o isKindOfClass: [NSArray class]] == YES
&& [o count] > 0 && [o count] > 0
&& [[o objectAtIndex: 0] isKindOfClass: [NSString class]] == YES) && [[o objectAtIndex: 0] isKindOfClass: [NSString class]] == YES)
{ {
filename = [o objectAtIndex: 0]; filename = [o objectAtIndex: 0];
} }
@ -1073,17 +1073,13 @@ static NSMapTable *mimeMap = NULL;
+ (NSPasteboard*) generalPasteboard + (NSPasteboard*) generalPasteboard
{ {
static NSPasteboard *generalPboard = nil; static NSPasteboard *generalPboard = nil;
NSPasteboard *currentGeneralPboard;
// call pasteboardWithName: every time, to update server connection if needed // call pasteboardWithName: every time, to update server connection if needed
NSPasteboard *currentGeneralPboard = [self pasteboardWithName: NSGeneralPboard]; currentGeneralPboard = [self pasteboardWithName: NSGeneralPboard];
if (!generalPboard) // getting it for the first time if (currentGeneralPboard != generalPboard)
{ {
// add an extra retain to keep it from being released and recreated in every release pool ASSIGN(generalPboard, currentGeneralPboard);
generalPboard = [currentGeneralPboard retain];
}
else if (currentGeneralPboard != generalPboard)
{
[generalPboard release];
generalPboard = [currentGeneralPboard retain];
} }
return generalPboard; return generalPboard;
} }
@ -1551,7 +1547,7 @@ static NSMapTable *mimeMap = NULL;
return ok; return ok;
} }
- (BOOL)writeObjects: (NSArray*)objects - (BOOL) writeObjects: (NSArray*)objects
{ {
// FIXME: not implemented // FIXME: not implemented
return NO; return NO;