gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 17:52:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Gregory John Casamento 2020-01-20 15:55:05 -05:00
commit b9c8e8d78b
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2020-01-20 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSAppearance.h,
* Source/NSPDFInfo.m,
* Source/NSWorkspace.m: Fix compiler warnings.
2020-01-19 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSXibKeyedUnarchiver.m: Remove references of XIB 5.

4
Headers/AppKit/NSAppearance.h
View file

@ -55,8 +55,8 @@ typedef NSString* NSAppearanceName;
- (NSAppearanceName) bestMatchFromAppearancesWithNames: (NSArray *)appearances;
// Getting and setting the appearance
+ (void) setCurrentAppearance: (NSAppearanceName)name;
+ (NSAppearanceName) currentAppearance;
+ (void) setCurrentAppearance: (NSAppearance *)appearance;
+ (NSAppearance *) currentAppearance;
// Managing vibrancy
- (BOOL) allowsVibrancy;

3
Source/NSPDFInfo.m
View file

@ -22,9 +22,10 @@
Boston, MA 02110 USA.
*/
#import <AppKit/NSPDFInfo.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSURL.h>
#import <AppKit/NSPDFInfo.h>
@implementation NSPDFInfo

4
Source/NSWorkspace.m
View file

@ -1308,7 +1308,6 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
non-standard f_basetype field, which provides the name of the
underlying file system type.
*/
uid_t uid;
BOOL isRootFS;
BOOL hasOwnership;
@ -1323,7 +1322,6 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
if (statfs([fullPath fileSystemRepresentation], &m))
return NO;
#endif
uid = geteuid();
*writableFlag = 1;
#if defined(HAVE_STRUCT_STATVFS_F_FLAG)
@ -1342,9 +1340,11 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
hasOwnership = NO;
#if (defined(USING_STATFS) && defined(HAVE_STRUCT_STATFS_F_OWNER)) || (defined(USING_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_OWNER))
uid_t uid = geteuid();
if (uid == 0 || uid == m.f_owner)
hasOwnership = YES;
#elif (defined(USING_STATVFS) && !defined(USING_STATFS) && defined (HAVE_STATFS) && defined(HAVE_STRUCT_STATFS_F_OWNER))
uid_t uid = geteuid();
// FreeBSD only?
struct statfs m2;
statfs([fullPath fileSystemRepresentation], &m2);