diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index b8fdd5a43..e1ebff88c 100755 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -13,6 +13,7 @@ Added: Fixed: ▪ Fixed some problems, that "Add category to selected account" was enabled when it shouldn't be. ▪ ♥ Auto-updating of feeds fixed (again?!). ♥ +▪ Fixed problem with adding feeds in TT-RSS accounts. (bug #154) Changed: diff --git a/src/services/tt-rss/definitions.h b/src/services/tt-rss/definitions.h index 4372e646e..6b15b60ad 100755 --- a/src/services/tt-rss/definitions.h +++ b/src/services/tt-rss/definitions.h @@ -33,7 +33,7 @@ // Subscribe to feed. #define STF_UNKNOWN -1 -#define STF_UPDATED 0 +#define STF_EXISTS 0 #define STF_INVALID_URL 2 #define STF_UNREACHABLE_URL 5 #define STF_URL_NO_FEED 3 diff --git a/src/services/tt-rss/gui/formeditfeed.cpp b/src/services/tt-rss/gui/formeditfeed.cpp index 0a9530d84..89b5c16e2 100755 --- a/src/services/tt-rss/gui/formeditfeed.cpp +++ b/src/services/tt-rss/gui/formeditfeed.cpp @@ -218,7 +218,7 @@ void FormEditFeed::addNewFeed() { m_ui->m_txtUsername->lineEdit()->text(), m_ui->m_txtPassword->lineEdit()->text()); - if (response.code() == STF_INSERTED || response.code() == STF_UPDATED) { + if (response.code() == STF_INSERTED) { // Feed was added online. accept(); qApp->showGuiMessage(tr("Feed added"), tr("Feed was added, triggering sync in now."), QSystemTrayIcon::Information); diff --git a/src/services/tt-rss/network/ttrssnetworkfactory.cpp b/src/services/tt-rss/network/ttrssnetworkfactory.cpp index 43e28e9d2..44cd0008f 100755 --- a/src/services/tt-rss/network/ttrssnetworkfactory.cpp +++ b/src/services/tt-rss/network/ttrssnetworkfactory.cpp @@ -575,7 +575,7 @@ TtRssSubscribeToFeedResponse::~TtRssSubscribeToFeedResponse() { int TtRssSubscribeToFeedResponse::code() const { if (m_rawContent.contains(QSL("content"))) { - return m_rawContent["content"].toMap()["code"].toInt(); + return m_rawContent["content"].toMap()["status"].toMap()["code"].toInt(); } else { return STF_UNKNOWN;