Fix crash on first startup of Daemon (?)

Makefile

@@ -112,7 +112,7 @@ OPTIMIZE := FULL
 # 	will recreate only the "locales/en.catkeys" file. Use it as a template
 # 	for creating catkeys for other languages. All localization files must be
 # 	placed in the "locales" subdirectory.
-LOCALES = en eo nl
+LOCALES = en eo
 
 #	Specify all the preprocessor symbols to be defined. The symbols will not
 #	have their values set automatically; you must supply the value (if any) to

locales/app/en.catkeys

@@ -1,30 +1,25 @@
-1	English	application/x-vnd.Pogger	3697078007
+1	English	application/x-vnd.Pogger	3216580394
 Updates	MainWindow		Updates
 Edit…	FeedsView		Edit…
 OK	FeedsView		OK
-Default entry program	EntriesView		Default entry program
 Never automatically update	UpdatesView		Never automatically update
 Edit feed	FeedEditWindow		Edit feed
 Browse…	EntriesView		Browse…
 Entries	MainWindow		Entries
-Make default	EntriesView		Make default
 Feeds	MainWindow		Feeds
 Feed name:	FeedEditWindow		Feed name:
-Update feed	FeedListView		Update feed
 There is not enough memory available on your system to load the preferences file.\nPlease try closing a few applications and restarting Pogger.	Preferences		There is not enough memory available on your system to load the preferences file.\nPlease try closing a few applications and restarting Pogger.
 Select…	EntriesView		Select…
 Confirm removal	FeedsView		Confirm removal
-Scheduling	UpdatesView		Scheduling
 Are you sure you want to remove the selected feed?	FeedsView		Are you sure you want to remove the selected feed?
+Scheduling	UpdatesView		Scheduling
 Open as:	EntriesView		Open as:
 Couldn't open the preferences file because permission was denied.\nThis usually means that you don't have read permissions to your settings directory.\nPlease make sure that your user has read-access to your settings directory― likely %path%.\nCheck your OS documentation for more information.	Preferences		Couldn't open the preferences file because permission was denied.\nThis usually means that you don't have read permissions to your settings directory.\nPlease make sure that your user has read-access to your settings directory― likely %path%.\nCheck your OS documentation for more information.
-Ignore	EntriesView		Ignore
 Pogger	System name		Pogger
 Update every 30 minutes	UpdatesView		Update every 30 minutes
 Cancel	FeedsView		Cancel
-Notify about new entries	UpdatesView		Notify about new entries
-This program will only be used to open entry files if they are first opened with Pogger.\nCurrently, Pogger isn't set as the default to open feed entries.	EntriesView		This program will only be used to open entry files if they are first opened with Pogger.\nCurrently, Pogger isn't set as the default to open feed entries.
 Invalid feed	FeedEditWindow		Invalid feed
+Notify about new entries	UpdatesView		Notify about new entries
 {0, plural,=1{Update every hour}other{Update every # hours}}	UpdatesView		{0, plural,=1{Update every hour}other{Update every # hours}}
 OK	EntriesView		OK
 Couldn't open this folder because no path was specified.\nPlease select a new folder.	EntriesView		Couldn't open this folder because no path was specified.\nPlease select a new folder.
@@ -36,24 +31,21 @@ Update daily	UpdatesView		Update daily
 HTML	EntriesView		HTML
 Notify about update failures	UpdatesView		Notify about update failures
 The path you selected isn't a folder― please choose another path.	EntriesView		The path you selected isn't a folder― please choose another path.
-Update source	FeedListView		Update source
 Update now	MainWindow		Update now
 24 hours	UpdatesView		24 hours
 There is not enough memory available on your system to access the given path.\nPlease try closing a few applications and restarting Pogger.	EntriesView		There is not enough memory available on your system to access the given path.\nPlease try closing a few applications and restarting Pogger.
-Edit feed…	FeedListView		Edit feed…
 Untitled Feed	FeedListItem		Untitled Feed
 Never	UpdatesView		Never
 Feed URL:	FeedEditWindow		Feed URL:
 New Feed	FeedEditWindow		New Feed
 Remove selected feed	FeedsView		Remove selected feed
+Please enter a URL.	FeedEditWindow		Please enter a URL.
 OK	FeedEditWindow		OK
 URL	EntriesView		URL
-Please enter a URL.	FeedEditWindow		Please enter a URL.
 Preferences file	Preferences		Preferences file
 Notifications	UpdatesView		Notifications
 Add new feed	FeedsView		Add new feed
 Fetching %source%…	FeedsView		Fetching %source%…
-Remove feed…	FeedListView		Remove feed…
 Cancel	FeedEditWindow		Cancel
 Opening	EntriesView		Opening
 The given URL is invalid. Please make sure you typed it in correctly.	FeedEditWindow		The given URL is invalid. Please make sure you typed it in correctly.

locales/app/nl.catkeys

@@ -1,54 +0,0 @@
-1	Dutch	application/x-vnd.Pogger	3216580394
-Updates	MainWindow		Updates
-Edit…	FeedsView		Bewerken…
-OK	FeedsView		OK
-Never automatically update	UpdatesView		Nooit automatisch updaten
-Edit feed	FeedEditWindow		Feed bewerken
-Browse…	EntriesView		Bladeren…
-Entries	MainWindow		Inzendingen
-Feeds	MainWindow		Feeds
-Feed name:	FeedEditWindow		Feed naam:
-There is not enough memory available on your system to load the preferences file.\nPlease try closing a few applications and restarting Pogger.	Preferences		Er is niet voldoende geheugen beschickbaar op je systeem om de instellingen te laden.\nProbeer enkele toepassingen te sluiten en Pogger te herstarten.
-Select…	EntriesView		Selecteer…
-Confirm removal	FeedsView		Bevestig verwijdering
-Are you sure you want to remove the selected feed?	FeedsView		Ben je zeker dat je de geselecteerde feed wil verwijderen?
-Scheduling	UpdatesView		Plannen
-Open as:	EntriesView		Open als:
-Couldn't open the preferences file because permission was denied.\nThis usually means that you don't have read permissions to your settings directory.\nPlease make sure that your user has read-access to your settings directory― likely %path%.\nCheck your OS documentation for more information.	Preferences		Kon de instellingen niet openen (toegang geweigeerd).\nDit betekend meestal dat je geen lees-rechten hebt op je instellingen map.\nVerzeker jezelf ervan dat je lees-rechten hebt op deze map― waarschijnlijk %path%.\nControleer je OS documentatie voor meer informatie.
-Pogger	System name		Pogger
-Update every 30 minutes	UpdatesView		Elke 30 minuten
-Cancel	FeedsView		Annuleer
-Invalid feed	FeedEditWindow		Ongeldige feed
-Notify about new entries	UpdatesView		Waarschuw bij nieuwe inzendingen
-{0, plural,=1{Update every hour}other{Update every # hours}}	UpdatesView		{0, plural,=1{Update Elk uur}other{Elke # uren}}
-OK	EntriesView		OK
-Couldn't open this folder because no path was specified.\nPlease select a new folder.	EntriesView		Kan deze map niet openen omdat er geen pad ingesteld was.\nSelecteer een nieuwe map.
-Cancel	MainWindow		Annuleer
-Entries directory	EntriesView		Inzendingen map
-Saving	EntriesView		Opslaan
-Couldn't open the preferences file because the path is not specified.\nThis usually means that the programmer made a mistake.\nPlease submit a bug report to the Pogger repository on GitHub.\nYour personal settings will not be loaded.	Preferences		Kan de instellingen niet openen omdat het pad niet gedefinieerd is.\nDit betekend meestal dat de programmeur een fout gemaakt heeft.\nRaporteer een bug raport bij Pogger repository op GitHub.\Je persoonlijke instellingen worden niet geladen.
-Update daily	UpdatesView		Update dagelijks
-HTML	EntriesView		HTML
-Notify about update failures	UpdatesView		Waarschuw bij mislukte updates
-The path you selected isn't a folder― please choose another path.	EntriesView		Het pad dat je selecteerde is geen map― gelieve een ander pad op te geven.
-Update now	MainWindow		Update nu
-24 hours	UpdatesView		24 uur
-There is not enough memory available on your system to access the given path.\nPlease try closing a few applications and restarting Pogger.	EntriesView		Er is niet voldoende geheugen beschikbaar om het opgegeven pad te bereiken.\nProbeer enkele toepassingen te sluiten en Pogger te herstarten.
-Untitled Feed	FeedListItem		Feed zonder titel
-Never	UpdatesView		Nooit
-Feed URL:	FeedEditWindow		Feed URL:
-New Feed	FeedEditWindow		Nieuwe Feed
-Remove selected feed	FeedsView		Geselecteerde feed verwijderen
-Please enter a URL.	FeedEditWindow		Gelieve een URl in te geven.
-OK	FeedEditWindow		OK
-URL	EntriesView		URL
-Preferences file	Preferences		Instellingen bestand
-Notifications	UpdatesView		Meldingen
-Add new feed	FeedsView		Nieuwe feed toevoegen
-Fetching %source%…	FeedsView		Binnenhalen %source%…
-Cancel	FeedEditWindow		Annuleer
-Opening	EntriesView		Open
-The given URL is invalid. Please make sure you typed it in correctly.	FeedEditWindow		URL is ongeldig. Verzeker jezelf dat er geen typefouten zijn.
-Entry folder:	EntriesView		Map ingang:
-Couldn't open this folder because permission was denied.\nThis usually means that you don't have read permissions.\nPlease make sure that your user has read-access to this folder.\nCheck your OS documentation for more information.	EntriesView		Kon de map niet openen (toegang geweigeerd).\nDit betekend meestal dat je geen lees-rechten hebt.\nVerzeker jezelf ervan dat je lees-rechten hebt op deze map.\nControleer je OS documentatie voor meer informatie.
-Open with:	EntriesView		Open met:

locales/daemon/en.catkeys

@@ -1,8 +1,11 @@
-1	English	application/x-vnd.PoggerDaemon	931636984
+1	English	application/x-vnd.PoggerDaemon	3501771266
 {0, plural,=1{One new entry from %source%.}other{# new entries from %source%.}}	Notifier		{0, plural,=1{One new entry from %source%.}other{# new entries from %source%.}}
+Channel '%source%' at %url%:\n	RssFeed		Channel '%source%' at %url%:\n
+Channel '%source%' at %url%:\n	AtomFeed		Channel '%source%' at %url%:\n
 Downloading feed from 	FeedController		Downloading feed from 
 Settings…	DeskbarView		Settings…
 Couldn't open the preferences file because the path is not specified.\nThis usually means that the programmer made a mistake.\nPlease submit a bug report to the Pogger repository on GitHub.\nYour personal settings will not be loaded.	Preferences		Couldn't open the preferences file because the path is not specified.\nThis usually means that the programmer made a mistake.\nPlease submit a bug report to the Pogger repository on GitHub.\nYour personal settings will not be loaded.
+\t-%count% entries-\n	RssFeed		\t-%count% entries-\n
 {0, plural,=1{Failed to update %source% and one other.}other{Failed to update %source% and # others.}}	Notifier		{0, plural,=1{Failed to update %source% and one other.}other{Failed to update %source% and # others.}}
 Preferences file	Preferences		Preferences file
 Update now	DeskbarView		Update now
@@ -11,6 +14,7 @@ Update failure	Notifier		Update failure
 Untitled feed	Notifier		Untitled feed
 Quit Pogger	DeskbarView		Quit Pogger
 Open entry folder…	DeskbarView		Open entry folder…
+\t-%count% entries-\n	AtomFeed		\t-%count% entries-\n
 There is not enough memory available on your system to load the preferences file.\nPlease try closing a few applications and restarting Pogger.	Preferences		There is not enough memory available on your system to load the preferences file.\nPlease try closing a few applications and restarting Pogger.
 Query new entries…	DeskbarView		Query new entries…
 {0, plural,=1{%n% new entries from %source% and one other.}other{%n% new entries from %source% and # others.}}	Notifier		{0, plural,=1{%n% new entries from %source% and one other.}other{%n% new entries from %source% and # others.}}

locales/daemon/nl.catkeys

@@ -1,23 +0,0 @@
-1	Dutch	application/x-vnd.PoggerDaemon	3501771266
-{0, plural,=1{One new entry from %source%.}other{# new entries from %source%.}}	Notifier		{0, plural,=1{Een nieuwe inzending van %source%.}other{# nieuwe inzendingen van %source%.}}
-Channel '%source%' at %url%:\n	RssFeed		Kanaal '%source%' op %url%:\n
-Channel '%source%' at %url%:\n	AtomFeed		Kanaal '%source%' op %url%:\n
-Downloading feed from 	FeedController		Downloaden feed van 
-Settings…	DeskbarView		Instellingen…
-Couldn't open the preferences file because the path is not specified.\nThis usually means that the programmer made a mistake.\nPlease submit a bug report to the Pogger repository on GitHub.\nYour personal settings will not be loaded.	Preferences		Kan de instellingen niet openen omdat het pad niet gedefinieerd is.\nDit betekend meestal dat de programmeur een fout gemaakt heeft.\nRaporteer een bug raport bij Pogger repository op GitHub.\Je persoonlijke instellingen worden niet geladen.
-\t-%count% entries-\n	RssFeed		\t-%count% inzendingen-\n
-{0, plural,=1{Failed to update %source% and one other.}other{Failed to update %source% and # others.}}	Notifier		{0, plural,=1{Update mislukt van %source% en een andere.}other{Update mislukt %source% en # anderen.}}
-Preferences file	Preferences		Instellingen bestand
-Update now	DeskbarView		Update nu
-Feed updates	Notifier		Feed updates
-Update failure	Notifier		Update mislukt
-Untitled feed	Notifier		Feed zonder titel
-Quit Pogger	DeskbarView		Pogger afsluiten
-Open entry folder…	DeskbarView		Open inzendingen map…
-\t-%count% entries-\n	AtomFeed		\t-%count% inzendingen-\n
-There is not enough memory available on your system to load the preferences file.\nPlease try closing a few applications and restarting Pogger.	Preferences		Er is niet voldoende geheugen beschickbaar op je systeem om de instellingen te laden.\nProbeer enkele toepassingen te sluiten en Pogger te herstarten.
-Query new entries…	DeskbarView		Zoek nieuwe inzendingen…
-{0, plural,=1{%n% new entries from %source% and one other.}other{%n% new entries from %source% and # others.}}	Notifier		{0, plural,=1{%n% nieuwe inzendingen van %source% en een andere.}other{%n% nieuwe inzendingen van %source% en # anderen.}}
-Couldn't open the preferences file because permission was denied.\nThis usually means that you don't have read permissions to your settings directory.\nPlease make sure that your user has read-access to your settings directory― likely %path%.\nCheck your OS documentation for more information.	Preferences		Kon de instellingen niet openen (toegang geweigeerd).\nDit betekend meestal dat je geen lees-rechten hebt op je instellingen map.\nVerzeker jezelf ervan dat je lees-rechten hebt op deze map― waarschijnlijk %path%.\nControleer je OS documentatie voor meer informatie.
-Failed to update %source%.	Notifier		Update mislukt voor %source%.
-led to update %source%.

src/FeedEditWindow.cpp

@@ -146,11 +146,8 @@ FeedEditWindow::_SaveFeed()
 		fFeed->SetTitle(title.String());
 	fFeed->SetUrl(BUrl(urlString));
 
-	if (BString(fFeed->Identifier()).IsEmpty() == true) {
-		Source* source = SourceManager::GetSourceOfType("RssAtom");
-		fFeed->SetSource(source->Config());
+	if (BString(fFeed->Identifier()).IsEmpty() == true)
 		SourceManager::AddFeed(fFeed);
-	}
 	else
 		SourceManager::EditFeed(fFeed);
 

src/Source.h

@@ -43,7 +43,6 @@ public:
 
 	virtual const char* Type() { return "Source"; };
 	virtual const char* Name() { return "Generic"; };
-	virtual const char* Config() { return NULL; };
 
 	BString fConfigPath;
 };

src/SourceManager.cpp

@@ -141,7 +141,7 @@ SourceManager::EditFeed(Feed* updated)
 void
 SourceManager::RemoveFeed(Feed* mortonta)
 {
-	return GetSource(mortonta)->RemoveFeed(mortonta);
+	return GetSource(mortonta)->EditFeed(mortonta);
 }
 
 

src/Util.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021, Jaidyn Levesque <jadedctrl@teknik.io>
+ * Copyright 2020, Jaidyn Levesque <jadedctrl@teknik.io>
  * Copyight 2017 Akshay Agarwal, agarwal.akshay.akshay8@gmail.com
  * All rights reserved. Distributed under the terms of the MIT license.
  */
@@ -252,13 +252,8 @@ loadVectorIcon(const char* name, int32 iconSize, int32 cropSize)
 	if (data != NULL
 		&& BIconUtils::GetVectorIcon((uint8*)data, length, temp)
 			== B_OK
-		&& dest->ImportBits(
-#if B_HAIKU_VERSION	>= B_HAIKU_VERSION_1_PRE_BETA_4
-			   temp, BPoint(0, 0), BPoint(0, 0), BSize(cropSize, cropSize))
-#else
-			   temp, BPoint(0, 0), BPoint(0, 0), cropSize, cropSize)
-#endif
-			== B_OK) {
+		&& dest->ImportBits(temp, BPoint(0, 0), BPoint(0, 0),
+			cropSize, cropSize) == B_OK)  {
 			delete temp;
 			return dest;
 	}

src/sources/RssAtom.cpp

@@ -44,13 +44,6 @@ RssAtom::Name()
 }
 
 
-const char*
-RssAtom::Config()
-{
-	return fConfigPath.String();
-}
-
-
 BObjectList<Feed>
 RssAtom::Feeds()
 {

src/sources/RssAtom.h

@@ -20,7 +20,6 @@ public:
 
 	const char* Type();
 	const char* Name();
-	const char* Config();
 
 	BObjectList<Feed> Feeds();
 
@@ -35,8 +34,6 @@ public:
 
 	bool IsUpdated(Feed* feed);
 
-	BString fConfigPath;
-
 private:
 	bool _IsAtom(Feed* feed);
 	bool _IsRss(Feed* feed);
@@ -74,6 +71,7 @@ private:
 	BPath _SubscriptionPath();
 
 	BString fTitle;
+	BString fConfigPath;
 };