diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc index 9b0c318c2..62944a5da 100644 --- a/plugins/FeedReader/services/p3FeedReader.cc +++ b/plugins/FeedReader/services/p3FeedReader.cc @@ -38,7 +38,7 @@ RsFeedReader *rsFeedReader = NULL; *********/ p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsForums *forums) - : RsPQIService(RS_SERVICE_TYPE_PLUGIN_FEEDREADER, CONFIG_TYPE_FEEDREADER, 5, pgHandler), + : RsPQIService(RS_SERVICE_TYPE_PLUGIN_FEEDREADER, 5, pgHandler), mFeedReaderMtx("p3FeedReader"), mDownloadMutex("p3FeedReaderDownload"), mProcessMutex("p3FeedReaderProcess"), mPreviewMutex("p3FeedReaderPreview") { mNextFeedId = 1; @@ -227,6 +227,22 @@ uint32_t p3FeedReader::getStandardStorageTime() return mStandardStorageTime; } +RsServiceInfo p3FeedReader::getServiceInfo() +{ + const std::string FEEDREADER_APP_NAME = "FEEDREADER"; + const uint16_t FEEDREADER_APP_MAJOR_VERSION = 1; + const uint16_t FEEDREADER_APP_MINOR_VERSION = 0; + const uint16_t FEEDREADER_MIN_MAJOR_VERSION = 1; + const uint16_t FEEDREADER_MIN_MINOR_VERSION = 0; + + return RsServiceInfo(RS_SERVICE_TYPE_PLUGIN_FEEDREADER, + FEEDREADER_APP_NAME, + FEEDREADER_APP_MAJOR_VERSION, + FEEDREADER_APP_MINOR_VERSION, + FEEDREADER_MIN_MAJOR_VERSION, + FEEDREADER_MIN_MINOR_VERSION); +} + void p3FeedReader::setStandardStorageTime(uint32_t storageTime) { RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/ diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h index 2de0a7832..c518e7a26 100644 --- a/plugins/FeedReader/services/p3FeedReader.h +++ b/plugins/FeedReader/services/p3FeedReader.h @@ -74,6 +74,7 @@ public: /****************** p3Service STUFF ******************/ virtual int tick(); + virtual RsServiceInfo getServiceInfo() ; /****************** internal STUFF *******************/ bool getFeedToDownload(RsFeedReaderFeed &feed, const std::string &neededFeedId); diff --git a/plugins/FeedReader/services/rsFeedReaderItems.h b/plugins/FeedReader/services/rsFeedReaderItems.h index 85174d37f..14f6d0e6e 100644 --- a/plugins/FeedReader/services/rsFeedReaderItems.h +++ b/plugins/FeedReader/services/rsFeedReaderItems.h @@ -24,7 +24,7 @@ #include "serialiser/rsserviceids.h" #include "serialiser/rsserial.h" -#include "serialiser/rstlvtypes.h" +#include "serialiser/rstlvstring.h" #include "p3FeedReader.h"