fixed a few things for OS X 10.7 Lion

drjokepu · Jun 7, 2013 · 08c35ad · 08c35ad
1 parent 9824131
commit 08c35ad
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/PostgreSQL Inspector/PostgreSQL Inspector/PGDatabase.h b/PostgreSQL Inspector/PostgreSQL Inspector/PGDatabase.h
@@ -20,7 +20,7 @@
 @property (nonatomic, strong) NSArray *schemaObjectGroups;
 @property (nonatomic, strong) NSArray *roles;
 @property (nonatomic, assign) NSInteger publicSchemaIndex;
-@property (nonatomic, weak) id<PGDatabaseDelegate> delegate;
+@property (nonatomic, unsafe_unretained) id<PGDatabaseDelegate> delegate;
 
 -(id)initWithConnectionEntry:(PGConnectionEntry*)theConnectionEntry;
 -(void)loadSchema:(PGConnection*)connection;

diff --git a/PostgreSQL Inspector/PostgreSQL Inspector/PGUUID.h b/PostgreSQL Inspector/PostgreSQL Inspector/PGUUID.h
@@ -10,7 +10,7 @@
 
 bool system_has_NSUUID(void);
 
-@interface PGUUID : NSObject
+@interface PGUUID : NSObject <NSCopying>
 
 +(id)UUID;
 -(id)init;

diff --git a/PostgreSQL Inspector/PostgreSQL Inspector/PGUUID.m b/PostgreSQL Inspector/PostgreSQL Inspector/PGUUID.m
@@ -101,6 +101,13 @@ -(void)getUUIDBytes:(uuid_t)uuidBytes
     uuidBytes[15] = cfBytes.byte15;
 }
 
+-(id)copyWithZone:(NSZone *)zone
+{
+    uuid_t cfBytes;
+    [self getUUIDBytes:cfBytes];
+    return [[PGUUID alloc] initWithUUIDBytes:cfBytes];
+}
+
 @end
 
 bool system_has_NSUUID(void)

diff --git a/PostgreSQL Inspector/PostgreSQL Inspector/PGUUIDFormatter.m b/PostgreSQL Inspector/PostgreSQL Inspector/PGUUIDFormatter.m
@@ -14,7 +14,7 @@ @implementation PGUUIDFormatter
 
 -(NSString *)stringForObjectValue:(id)obj
 {
-    if ([obj isKindOfClass:[NSUUID class]] || [obj isKindOfClass:[PGUUID class]])
+    if ((system_has_NSUUID() && [obj isKindOfClass:[NSUUID class]]) || [obj isKindOfClass:[PGUUID class]])
     {
         NSString *str = [obj UUIDString];
         if (![PGUserDefaults uppercaseUUIDs])