From cb4027a951f32f82cad44017f3092ef05a0cc325 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 1 Oct 2017 11:28:44 -0700 Subject: [PATCH] Fix some build errors. --- Evergreen/MainWindow/Sidebar/SidebarViewController.swift | 2 +- Frameworks/Account/Account.swift | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift b/Evergreen/MainWindow/Sidebar/SidebarViewController.swift index 6677575bd..ddec33305 100644 --- a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift +++ b/Evergreen/MainWindow/Sidebar/SidebarViewController.swift @@ -24,7 +24,7 @@ import Account treeController = TreeController(delegate: treeControllerDelegate) NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(folderChildrenDidChange(_:)), name: NSNotification.Name(rawValue: FolderChildrenDidChangeNotification), object: nil) +// NotificationCenter.default.addObserver(self, selector: #selector(folderChildrenDidChange(_:)), name: NSNotification.Name(rawValue: FolderChildrenDidChangeNotification), object: nil) NotificationCenter.default.addObserver(self, selector: #selector(userDidAddFeed(_:)), name: UserDidAddFeedNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(dataModelDidPerformBatchUpdates(_:)), name: .DataModelDidPerformBatchUpdates, object: nil) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index 40d338adb..41a0f805c 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -120,13 +120,15 @@ public final class Account: DisplayNameProvider, Hashable { return didAddFeed // TODO } - public func createFeed(with name: String, editedName: String, url: String) -> Feed { + public func createFeed(with name: String?, editedName: String?, url: String) -> Feed? { // For syncing, this may need to be an async method with a callback, // since it will likely need to call the server. if let feed = existingFeed(withURL: url) { - feed.editedName = editedName + if let editedName = editedName { + feed.editedName = editedName + } return feed }