summaryrefslogtreecommitdiff
path: root/plugins/NewsAggregator/Src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/NewsAggregator/Src')
-rw-r--r--plugins/NewsAggregator/Src/Common.h29
-rw-r--r--plugins/NewsAggregator/Src/Menus.cpp12
-rw-r--r--plugins/NewsAggregator/Src/NewsAggregator.cpp12
-rw-r--r--plugins/NewsAggregator/Src/Utils.cpp2
-rw-r--r--plugins/NewsAggregator/Src/Version.h6
5 files changed, 21 insertions, 40 deletions
diff --git a/plugins/NewsAggregator/Src/Common.h b/plugins/NewsAggregator/Src/Common.h
index bb58197897..059a732e42 100644
--- a/plugins/NewsAggregator/Src/Common.h
+++ b/plugins/NewsAggregator/Src/Common.h
@@ -17,48 +17,35 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-#define MIRANDA_VER 0x0A00
-
// Windows Header Files:
#include <windows.h>
#include <commctrl.h>
#include <time.h>
#include <fcntl.h>
#include <io.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
#include <sys\stat.h>
#include <mshtml.h>
// Miranda header files
#include <newpluginapi.h>
#include <m_clist.h>
-#include <m_skin.h>
#include <m_langpack.h>
#include <m_options.h>
#include <m_database.h>
-#include <m_utils.h>
-#include <m_system.h>
-#include <m_popup.h>
-#include <m_hotkeys.h>
#include <m_netlib.h>
#include <m_icolib.h>
#include <m_message.h>
#include <win2k.h>
-#include <m_protocols.h>
#include <m_protomod.h>
-#include <m_protosvc.h>
#include <m_xml.h>
#include <m_avatars.h>
#include <m_folders.h>
-#include <m_popup.h>
#include "version.h"
#include "resource.h"
-#define MODULE "NewsAggr"
+#define MODULE "NewsAggregator"
#define TAGSDEFAULT "#<title>#\r\n#<link>#\r\n#<description>#"
#define DEFAULT_AVATARS_FOLDER "NewsAggregator"
extern HINSTANCE hInst;
@@ -135,27 +122,27 @@ time_t __stdcall DateToUnixTime(TCHAR *stamp, BOOL FeedType);
VOID CheckCurrentFeed (HANDLE hContact);
TCHAR* CheckFeed(TCHAR* tszURL, HWND hwndDlg);
-// =============== NewsAggr SERVICES ================
+// =============== NewsAggregator SERVICES ================
// Check all Feeds info
// WPARAM = LPARAM = NULL
-#define MS_NEWSAGGR_CHECKALLFEEDS "NEWSAGGR/CheckAllFeeds"
+#define MS_NEWSAGGREGATOR_CHECKALLFEEDS "NewsAggregator/CheckAllFeeds"
// Add new Feed channel
// WPARAM = LPARAM = NULL
-#define MS_NEWSAGGR_ADDFEED "NEWSAGGR/AddNewsFeed"
+#define MS_NEWSAGGREGATOR_ADDFEED "NewsAggregator/AddNewsFeed"
// Add new Feed channel
// WPARAM = LPARAM = NULL
-#define MS_NEWSAGGR_CHANGEFEED "NEWSAGGR/ChangeNewsFeed"
+#define MS_NEWSAGGREGATOR_CHANGEFEED "NewsAggregator/ChangeNewsFeed"
// Import Feed chanels from file
// WPARAM = LPARAM = NULL
-#define MS_NEWSAGGR_IMPORTFEEDS "NEWSAGGR/ImportFeeds"
+#define MS_NEWSAGGREGATOR_IMPORTFEEDS "NewsAggregator/ImportFeeds"
// Export Feed chanels to file
// WPARAM = LPARAM = NULL
-#define MS_NEWSAGGR_EXPORTFEEDS "NEWSAGGR/ExportFeeds"
+#define MS_NEWSAGGREGATOR_EXPORTFEEDS "NewsAggregator/ExportFeeds"
// Check Feed info
// WPARAM = LPARAM = NULL
-#define MS_NEWSAGGR_CHECKFEED "NEWSAGGR/CheckFeed" \ No newline at end of file
+#define MS_NEWSAGGREGATOR_CHECKFEED "NewsAggregator/CheckFeed" \ No newline at end of file
diff --git a/plugins/NewsAggregator/Src/Menus.cpp b/plugins/NewsAggregator/Src/Menus.cpp
index a0217919ec..7ddd0c8a07 100644
--- a/plugins/NewsAggregator/Src/Menus.cpp
+++ b/plugins/NewsAggregator/Src/Menus.cpp
@@ -34,39 +34,39 @@ VOID InitMenu()
mi.position=10100001;
mi.icolibItem = GetIconHandle("main");
mi.ptszName = LPGENT("Check All Feeds");
- mi.pszService = MS_NEWSAGGR_CHECKALLFEEDS;
+ mi.pszService = MS_NEWSAGGREGATOR_CHECKALLFEEDS;
hService2[0] = Menu_AddMainMenuItem(&mi);
mi.position=10100002;
mi.icolibItem = GetIconHandle("addfeed");
mi.ptszName = LPGENT("Add Feed");
- mi.pszService = MS_NEWSAGGR_ADDFEED;
+ mi.pszService = MS_NEWSAGGREGATOR_ADDFEED;
hService2[1] = Menu_AddMainMenuItem(&mi);
mi.position=10100003;
mi.icolibItem = GetIconHandle("importfeeds");
mi.ptszName = LPGENT("Import Feeds");
- mi.pszService = MS_NEWSAGGR_IMPORTFEEDS;
+ mi.pszService = MS_NEWSAGGREGATOR_IMPORTFEEDS;
hService2[2] = Menu_AddMainMenuItem(&mi);
mi.position=10100004;
mi.icolibItem = GetIconHandle("exportfeeds");
mi.ptszName = LPGENT("Export Feeds");
- mi.pszService = MS_NEWSAGGR_EXPORTFEEDS;
+ mi.pszService = MS_NEWSAGGREGATOR_EXPORTFEEDS;
hService2[3] = Menu_AddMainMenuItem(&mi);
// adding contact menu items
mi.position=-0x7FFFFFFA;
mi.icolibItem = GetIconHandle("checkfeed");
mi.ptszName = LPGENT("Check feed");
- mi.pszService = MS_NEWSAGGR_CHECKFEED;
+ mi.pszService = MS_NEWSAGGREGATOR_CHECKFEED;
hService2[4] = Menu_AddContactMenuItem(&mi);
// adding contact menu items
mi.position=-0x7FFFFFFA;
//mi.icolibItem = GetIconHandle("checkfeed");
mi.ptszName = LPGENT("Change feed");
- mi.pszService = MS_NEWSAGGR_CHANGEFEED;
+ mi.pszService = MS_NEWSAGGREGATOR_CHANGEFEED;
hService2[5] = Menu_AddContactMenuItem(&mi);
ZeroMemory(&mi, sizeof(mi));
diff --git a/plugins/NewsAggregator/Src/NewsAggregator.cpp b/plugins/NewsAggregator/Src/NewsAggregator.cpp
index 57795ac15d..a1d62bf90b 100644
--- a/plugins/NewsAggregator/Src/NewsAggregator.cpp
+++ b/plugins/NewsAggregator/Src/NewsAggregator.cpp
@@ -100,12 +100,12 @@ extern "C" __declspec(dllexport) int Load(void)
hProtoService[6] = CreateProtoServiceFunction(MODULE, PS_GETAVATARINFOT, NewsAggrGetAvatarInfo);
hProtoService[7] = CreateProtoServiceFunction(MODULE, PSR_MESSAGE, NewsAggrRecvMessage);
- hService[0] = CreateServiceFunction(MS_NEWSAGGR_CHECKALLFEEDS, CheckAllFeeds);
- hService[1] = CreateServiceFunction(MS_NEWSAGGR_ADDFEED, AddFeed);
- hService[2] = CreateServiceFunction(MS_NEWSAGGR_IMPORTFEEDS, ImportFeeds);
- hService[3] = CreateServiceFunction(MS_NEWSAGGR_EXPORTFEEDS, ExportFeeds);
- hService[4] = CreateServiceFunction(MS_NEWSAGGR_CHECKFEED, CheckFeed);
- hService[5] = CreateServiceFunction(MS_NEWSAGGR_CHANGEFEED, ChangeFeed);
+ hService[0] = CreateServiceFunction(MS_NEWSAGGREGATOR_CHECKALLFEEDS, CheckAllFeeds);
+ hService[1] = CreateServiceFunction(MS_NEWSAGGREGATOR_ADDFEED, AddFeed);
+ hService[2] = CreateServiceFunction(MS_NEWSAGGREGATOR_IMPORTFEEDS, ImportFeeds);
+ hService[3] = CreateServiceFunction(MS_NEWSAGGREGATOR_EXPORTFEEDS, ExportFeeds);
+ hService[4] = CreateServiceFunction(MS_NEWSAGGREGATOR_CHECKFEED, CheckFeed);
+ hService[5] = CreateServiceFunction(MS_NEWSAGGREGATOR_CHANGEFEED, ChangeFeed);
return 0;
}
diff --git a/plugins/NewsAggregator/Src/Utils.cpp b/plugins/NewsAggregator/Src/Utils.cpp
index f28825d7e5..490f8d2464 100644
--- a/plugins/NewsAggregator/Src/Utils.cpp
+++ b/plugins/NewsAggregator/Src/Utils.cpp
@@ -33,7 +33,7 @@ VOID NetlibInit()
NETLIBUSER nlu = {0};
nlu.cbSize = sizeof(nlu);
nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_TCHAR; // | NUF_HTTPGATEWAY;
- nlu.ptszDescriptiveName = TranslateT("NewsAggr HTTP connection");
+ nlu.ptszDescriptiveName = TranslateT("NewsAggregator HTTP connection");
nlu.szSettingsModule = MODULE;
hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
}
diff --git a/plugins/NewsAggregator/Src/Version.h b/plugins/NewsAggregator/Src/Version.h
index 51809032fe..1c732bd7f2 100644
--- a/plugins/NewsAggregator/Src/Version.h
+++ b/plugins/NewsAggregator/Src/Version.h
@@ -4,14 +4,8 @@
#define __BUILD_NUM 1
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-
-#define __STRINGIFY_IMPL(x) #x
-#define __STRINGIFY(x) __STRINGIFY_IMPL(x)
-#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS)
#define __PLUGIN_NAME "News Aggregator"
-#define __INTERNAL_NAME "NewsAggregator"
#define __FILENAME "NewsAggregator.dll"
#define __DESCRIPTION "RSS/Atom news aggregator."
#define __AUTHOR "Mataes, FREAK_THEMIGHTY"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 13:23:22 +0000