From d233d6dac286fdd17f46c47896b731c4f6ba53f5 Mon Sep 17 00:00:00 2001 From: michael starke Date: Fri, 30 Oct 2015 17:27:10 +0100 Subject: [PATCH] Using new Sparkle and KeePassKit versions Signed-off-by: michael starke --- KeePassKit | 2 +- MacPass/MPDocument+EditingSession.m | 3 +-- MacPass/MPEntryViewController.m | 1 + MacPass/MacPass-Info.plist | 2 +- Sparkle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/KeePassKit b/KeePassKit index 23f60077..c7f95009 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit 23f6007746bd1a1bfeb8a33aecc8ac5431028841 +Subproject commit c7f950092e03c305da8d7db24b150a1f9ebec7e6 diff --git a/MacPass/MPDocument+EditingSession.m b/MacPass/MPDocument+EditingSession.m index 85e1e16f..b93c3fbd 100644 --- a/MacPass/MPDocument+EditingSession.m +++ b/MacPass/MPDocument+EditingSession.m @@ -17,8 +17,7 @@ NSString *const MPDocumentDidCommitChangesToSelectedItem = @"com.hicknhack.mac @implementation MPDocument (EditingSession) - (BOOL)hasActiveEditingSession { -// return (self.tree.activeEditingSession != nil); -// return (self.editingSession != nil); + return NO; } - (void)commitChangesToSelectedItem:(id)sender { diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m index 93aaa750..15e583bf 100644 --- a/MacPass/MPEntryViewController.m +++ b/MacPass/MPEntryViewController.m @@ -29,6 +29,7 @@ #import "MPEntryContextMenuDelegate.h" #import "KeePassKit/KeePassKit.h" +#import "KPKNode+IconImage.h" #import "HNHTableHeaderCell.h" #import "HNHGradientView.h" diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 2591673f..6ede688d 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -62,7 +62,7 @@ CFBundleSignature ???? CFBundleVersion - 2560 + 2562 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSAppTransportSecurity diff --git a/Sparkle b/Sparkle index e9fa7c3d..93a5228f 160000 --- a/Sparkle +++ b/Sparkle @@ -1 +1 @@ -Subproject commit e9fa7c3d4a43e34694be06050400c5609486caf1 +Subproject commit 93a5228f5bac3b0cd0cb42ca20e0e4ae0fceb29c