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

Merge branch 'master' of github.com:gnustep/libs-gui into NSGridView_NSStackView_branch

Browse source
This commit is contained in:
Gregory John Casamento 2021-02-24 19:24:09 -05:00
commit b8ecd7b59b
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2021-02-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSPasteboard.m (-_pasteboardWithTarget:name:): Correct
wrong order of arguments to NSMapInsert.
* Source/NSPasteboard.m (-generalPasteboard): Simplify
implementation.
2021-02-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSSearchFieldCell.m: Correct encoding/decoding that was

13
Source/NSPasteboard.m
View file

@ -1095,16 +1095,7 @@ static NSMapTable *mimeMap = NULL;
*/
+ (NSPasteboard*) generalPasteboard
{
static NSPasteboard *generalPboard = nil;
NSPasteboard *currentGeneralPboard;
// call pasteboardWithName: every time, to update server connection if needed
currentGeneralPboard = [self pasteboardWithName: NSGeneralPboard];
if (currentGeneralPboard != generalPboard)
{
ASSIGN(generalPboard, currentGeneralPboard);
}
return generalPboard;
return [self pasteboardWithName: NSGeneralPboard];
}
+ (void) initialize
@ -2138,7 +2129,7 @@ description, [cmd stringByDeletingLastPathComponent]);
{
ASSIGN(p->target, (id)aTarget);
ASSIGNCOPY(p->name, aName);
NSMapInsert(pasteboards, (void*)p, (void*)p->name);
NSMapInsert(pasteboards, (void*)p->name, (void*)p);
[p autorelease];
}
}