FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1604 from Wevah/ios-candidate 

Update to latest RSCore
This commit is contained in:
Brent Simmons 2020-01-10 23:47:08 -08:00 committed by GitHub
parent ff95ca1d07 ca429153ce
commit 71a7592a5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/AppDelegate.swift
View File

@ -85,7 +85,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
NSWindow.allowsAutomaticWindowTabbing = false NSWindow.allowsAutomaticWindowTabbing = false
super.init() super.init()
AccountManager.shared = AccountManager(accountsFolder: RSDataSubfolder(nil, "Accounts")!) AccountManager.shared = AccountManager(accountsFolder: Platform.dataSubfolder(forApplication: nil, folderName: "Accounts")!)
NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(inspectableObjectsDidChange(_:)), name: .InspectableObjectsDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(inspectableObjectsDidChange(_:)), name: .InspectableObjectsDidChange, object: nil)

2
Mac/MainWindow/AddFeed/AddFeedController.swift
View File

@ -98,7 +98,7 @@ class AddFeedController: AddFeedWindowControllerDelegate {
private extension AddFeedController { private extension AddFeedController {
var urlStringFromPasteboard: String? { var urlStringFromPasteboard: String? {
if let urlString = NSPasteboard.rs_urlString(from: NSPasteboard.general) { if let urlString = NSPasteboard.urlString(from: NSPasteboard.general) {
return urlString.rs_normalizedURL() return urlString.rs_normalizedURL()
} }
return nil return nil

2
Shared/ArticleStyles/ArticleStylesManager.swift
View File

@ -24,7 +24,7 @@ private let styleSuffixes = [styleSuffix, nnwStyleSuffix, cssStyleSuffix];
final class ArticleStylesManager { final class ArticleStylesManager {
static let shared = ArticleStylesManager() static let shared = ArticleStylesManager()
private let folderPath = RSDataSubfolder(nil, stylesFolderName)! private let folderPath = Platform.dataSubfolder(forApplication: nil, folderName: stylesFolderName)!
var currentStyleName: String { var currentStyleName: String {
get { get {

2
submodules/RSCore

@ -1 +1 @@
Subproject commit 525f0d9ad5edd49108ccdecb4e47dbe10e9bb217 Subproject commit 806d1fdc16511a9469bf2a18348caf9f20ff8cdc