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

This commit is contained in:
Gregory John Casamento 2021-10-12 19:20:30 -04:00
commit edc38e137f
3 changed files with 20 additions and 7 deletions

View file

@ -1,5 +1,5 @@
/*
Copyright (C) 2013 Free Software Foundation, Inc.
Copyright (C) 2013-2021 Free Software Foundation, Inc.
Author: German A. Arias <german@xelalug.org>
Date: 2013
@ -499,14 +499,14 @@ static GSAutocompleteWindow *gsWindow = nil;
}
// Delegate
- (int) numberOfRowsInTableView: (NSTableView *)aTableView
- (NSInteger) numberOfRowsInTableView: (NSTableView *)aTableView
{
return [_words count];
}
- (id) tableView: (NSTableView *)aTableView
objectValueForTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex
row: (NSInteger)rowIndex
{
return [[_words objectAtIndex: rowIndex] description];
}

View file

@ -343,10 +343,16 @@ static void gs_jpeg_memory_dest_create (j_compress_ptr cinfo, NSData** data)
static void gs_jpeg_memory_dest_destroy (j_compress_ptr cinfo)
{
if (NULL == cinfo)
return;
gs_jpeg_dest_ptr dest = (gs_jpeg_dest_ptr) cinfo->dest;
free (dest->buffer);
free (dest->data);
free (dest);
if (NULL != dest)
{
free (dest->buffer);
free (dest->data);
free (dest);
}
cinfo->dest = NULL;
}

View file

@ -59,6 +59,7 @@
#import "AppKit/NSTextField.h"
#import "AppKit/NSWindow.h"
#import "GSGuiPrivate.h"
#import "GNUstepBase/NSDebug+GNUstepBase.h"
#import "GNUstepGUI/GSServicesManager.h"
// prototype for function to create name for server
@ -105,6 +106,12 @@ extern NSString *GSSpellServerName(NSString *checkerDictionary, NSString *langua
@implementation GSServicesManager(NSSpellCheckerMethods)
- (id)_launchSpellCheckerForLanguage: (NSString *)language
{
if ([[NSUserDefaults standardUserDefaults] boolForKey: @"GSDisableSpellCheckerServer"])
{
GSOnceMLog(@"WARNING: spell checker disabled - reset 'GSDisableSpellCheckerServer' to NO in defaults to re-enable");
return nil;
}
id<NSSpellServerPrivateProtocol> proxy = nil;
NSDictionary *spellCheckers = [_allServices objectForKey: @"BySpell"];
NSDictionary *checkerDictionary = [spellCheckers objectForKey: language];
@ -131,7 +138,7 @@ extern NSString *GSSpellServerName(NSString *checkerDictionary, NSString *langua
[(NSDistantObject *)proxy setProtocolForProxy:
@protocol(NSSpellServerPrivateProtocol)];
}
return proxy;
}