From e8412f167ec2c8d72055181c2c5e1df09699a94e Mon Sep 17 00:00:00 2001 From: Jaakko Keränen Date: Mon, 18 Jan 2021 19:22:03 +0200 Subject: Fixed opening heading feed entries in a tab The heading goto fragment wasn't being stripped appropriately from the URLs. --- src/feeds.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/feeds.c') diff --git a/src/feeds.c b/src/feeds.c index 75173ee1..a40df571 100644 --- a/src/feeds.c +++ b/src/feeds.c @@ -57,12 +57,7 @@ void deinit_FeedEntry(iFeedEntry *d) { } const iString *url_FeedEntry(const iFeedEntry *d) { - const size_t fragPos = indexOf_String(&d->url, '#'); - if (fragPos != iInvalidPos) { - return collect_String(newRange_String((iRangecc){ constBegin_String(&d->url), - constBegin_String(&d->url) + fragPos })); - } - return &d->url; + return urlFragmentStripped_String(&d->url); } iBool isUnread_FeedEntry(const iFeedEntry *d) { @@ -300,6 +295,7 @@ static iBool updateEntries_Feeds_(iFeeds *d, iPtrArray *incoming) { size_t pos; if (locate_SortedArray(&d->entries, &entry, &pos)) { iFeedEntry *existing = *(iFeedEntry **) at_SortedArray(&d->entries, pos); + iAssert(isHeadingEntry_FeedEntry_(existing) == isHeadingEntry_FeedEntry_(entry)); /* Already known, but update it, maybe the time and label have changed. */ if (!isHeadingEntry_FeedEntry_(existing)) { iBool changed = iFalse; -- cgit v1.2.3