From 6b300536acfb035080d74429102e967f9b474b8c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 23 Nov 2023 18:46:15 +0300 Subject: =?UTF-8?q?fixes=20#3955=20(NewsAggregator:=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20RSS-=D1=84?= =?UTF-8?q?=D0=B8=D0=B4=20=D0=B4=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=20=D0=9C=D0=B8=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B4=D1=8B=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20"=D0=BD=D0=B5=20=D0=B2=20?= =?UTF-8?q?=D1=81=D0=B5=D1=82=D0=B8",=20=D0=B0=20=D0=BF=D0=BE=D1=81=D0=BB?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B7=D0=B0=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=20"=D0=B2=20=D1=81=D0=B5=D1=82=D0=B8")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/NewsAggregator/Src/FeedEditor.cpp | 2 +- protocols/NewsAggregator/Src/ImportFeed.cpp | 2 +- protocols/NewsAggregator/Src/stdafx.h | 1 + protocols/NewsAggregator/Src/version.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'protocols/NewsAggregator') diff --git a/protocols/NewsAggregator/Src/FeedEditor.cpp b/protocols/NewsAggregator/Src/FeedEditor.cpp index 74233edba6..e154b5a37a 100644 --- a/protocols/NewsAggregator/Src/FeedEditor.cpp +++ b/protocols/NewsAggregator/Src/FeedEditor.cpp @@ -197,7 +197,7 @@ bool CFeedEditor::OnApply() g_plugin.setWString(hContact, "URL", strfeedurl); g_plugin.setDword(hContact, "UpdateTime", m_checktime.GetInt()); g_plugin.setWString(hContact, "MsgFormat", strtagedit); - g_plugin.setWord(hContact, "Status", Proto_GetStatus(MODULENAME)); + g_plugin.setWord(hContact, "Status", g_nStatus); if (m_useauth.IsChecked()) { g_plugin.setByte(hContact, "UseAuth", 1); g_plugin.setWString(hContact, "Login", m_login.GetText()); diff --git a/protocols/NewsAggregator/Src/ImportFeed.cpp b/protocols/NewsAggregator/Src/ImportFeed.cpp index a906e27959..f4390cd30c 100644 --- a/protocols/NewsAggregator/Src/ImportFeed.cpp +++ b/protocols/NewsAggregator/Src/ImportFeed.cpp @@ -170,7 +170,7 @@ public: g_plugin.setByte(hContact, "CheckState", 1); g_plugin.setDword(hContact, "UpdateTime", DEFAULT_UPDATE_TIME); g_plugin.setWString(hContact, "MsgFormat", TAGSDEFAULT); - g_plugin.setWord(hContact, "Status", Proto_GetStatus(MODULENAME)); + g_plugin.setWord(hContact, "Status", g_nStatus); if (m_list != nullptr) { int iItem = m_list->AddItem(text, -1); diff --git a/protocols/NewsAggregator/Src/stdafx.h b/protocols/NewsAggregator/Src/stdafx.h index 388f83ade2..de0f7ed33e 100644 --- a/protocols/NewsAggregator/Src/stdafx.h +++ b/protocols/NewsAggregator/Src/stdafx.h @@ -66,6 +66,7 @@ extern UINT_PTR timerId; extern bool ThreadRunning; extern bool UpdateListFlag; extern wchar_t tszRoot[MAX_PATH]; +extern int g_nStatus; struct CMPlugin : public PLUGIN { diff --git a/protocols/NewsAggregator/Src/version.h b/protocols/NewsAggregator/Src/version.h index e9d19559e7..d98222f973 100644 --- a/protocols/NewsAggregator/Src/version.h +++ b/protocols/NewsAggregator/Src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 1 #define __RELEASE_NUM 0 -#define __BUILD_NUM 5 +#define __BUILD_NUM 6 #include -- cgit v1.2.3