summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/ConnectionNotify/src/ConnectionNotify.cpp8
-rw-r--r--protocols/EmLanProto/src/amdproto.cpp7
-rw-r--r--protocols/GmailNotifier/src/main.cpp7
-rw-r--r--protocols/ICQCorp/src/services.cpp9
-rw-r--r--protocols/LotusNotify/src/LotusNotify.cpp11
-rw-r--r--protocols/NewsAggregator/Src/NewsAggregator.cpp1
-rw-r--r--protocols/NewsAggregator/Src/Services.cpp10
-rw-r--r--protocols/NewsAggregator/Src/stdafx.h1
-rw-r--r--protocols/Non-IM Contact/src/main.cpp1
-rw-r--r--protocols/Non-IM Contact/src/services.cpp10
-rw-r--r--protocols/Non-IM Contact/src/stdafx.h1
-rw-r--r--protocols/Sametime/src/sametime.cpp11
-rw-r--r--protocols/Sametime/src/sametime_proto.cpp1
-rw-r--r--protocols/Sametime/src/sametime_proto.h1
-rw-r--r--protocols/Weather/src/stdafx.h1
-rw-r--r--protocols/Weather/src/weather_opt.cpp2
-rw-r--r--protocols/Weather/src/weather_svcs.cpp9
-rw-r--r--protocols/WebView/src/main.cpp1
-rw-r--r--protocols/WebView/src/webview.h1
-rw-r--r--protocols/YAMN/src/services.cpp7
20 files changed, 2 insertions, 98 deletions
diff --git a/protocols/ConnectionNotify/src/ConnectionNotify.cpp b/protocols/ConnectionNotify/src/ConnectionNotify.cpp
index d328c0bfab..c93ce046a6 100644
--- a/protocols/ConnectionNotify/src/ConnectionNotify.cpp
+++ b/protocols/ConnectionNotify/src/ConnectionNotify.cpp
@@ -167,13 +167,6 @@ INT_PTR GetCaps(WPARAM wParam, LPARAM)
return 0;
}
-// gives name to protocol module
-INT_PTR GetName(WPARAM wParam, LPARAM lParam)
-{
- mir_strncpy((char*)lParam, PLUGINNAME, wParam);
- return 0;
-}
-
// gives icon for proto module
INT_PTR TMLoadIcon(WPARAM wParam, LPARAM)
{
@@ -403,7 +396,6 @@ int CMPlugin::Load()
g_plugin.setWord(hContact, "status", ID_STATUS_OFFLINE);
CreateProtoServiceFunction(PLUGINNAME, PS_GETCAPS, GetCaps);
- CreateProtoServiceFunction(PLUGINNAME, PS_GETNAME, GetName);
CreateProtoServiceFunction(PLUGINNAME, PS_LOADICON, TMLoadIcon);
CreateProtoServiceFunction(PLUGINNAME, PS_SETSTATUS, SetStatus);
CreateProtoServiceFunction(PLUGINNAME, PS_GETSTATUS, GetStatus);
diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp
index 30f0bc886c..04e7197645 100644
--- a/protocols/EmLanProto/src/amdproto.cpp
+++ b/protocols/EmLanProto/src/amdproto.cpp
@@ -76,12 +76,6 @@ static INT_PTR __cdecl EMPGetCaps(WPARAM wParam, LPARAM)
}
}
-static INT_PTR __cdecl EMPGetName(WPARAM wParam, LPARAM lParam)
-{
- mir_strncpy((char*)lParam, "EmLan", wParam);
- return 0;
-}
-
static INT_PTR __cdecl EMPLoadIcon(WPARAM wParam, LPARAM)
{
if ((wParam & 0xFFFF) != PLI_PROTOCOL)
@@ -326,7 +320,6 @@ int CMPlugin::Load()
g_lan = new CMLan();
CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, EMPGetCaps);
- CreateProtoServiceFunction(MODULENAME, PS_GETNAME, EMPGetName);
CreateProtoServiceFunction(MODULENAME, PS_LOADICON, EMPLoadIcon);
CreateProtoServiceFunction(MODULENAME, PS_SETSTATUS, EMPSetStatus);
CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, EMPGetStatus);
diff --git a/protocols/GmailNotifier/src/main.cpp b/protocols/GmailNotifier/src/main.cpp
index 55f05feef0..c555c583f0 100644
--- a/protocols/GmailNotifier/src/main.cpp
+++ b/protocols/GmailNotifier/src/main.cpp
@@ -68,12 +68,6 @@ INT_PTR GetStatus(WPARAM, LPARAM)
return ID_STATUS_ONLINE;
}
-INT_PTR GetName(WPARAM wParam, LPARAM lParam)
-{
- mir_strncpy((char*)lParam, MODULENAME, wParam);
- return 0;
-}
-
void CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD)
{
PluginMenuCommand(0, 0);
@@ -106,7 +100,6 @@ int CMPlugin::Load()
CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, GetCaps);
CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, GetStatus);
- CreateProtoServiceFunction(MODULENAME, PS_GETNAME, GetName);
CreateServiceFunction("GmailMNotifier/Notifying", Notifying);
DBVARIANT dbv;
diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp
index 1457488d93..8dc6f047dd 100644
--- a/protocols/ICQCorp/src/services.cpp
+++ b/protocols/ICQCorp/src/services.cpp
@@ -41,14 +41,6 @@ static INT_PTR icqGetCaps(WPARAM wParam, LPARAM)
///////////////////////////////////////////////////////////////////////////////
-static INT_PTR icqGetName(WPARAM wParam, LPARAM lParam)
-{
- strncpy((char*)lParam, Translate(protoName), wParam);
- return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
static INT_PTR icqLoadIcon(WPARAM wParam, LPARAM)
{
int id;
@@ -421,7 +413,6 @@ int LoadServices()
HookEvent(ME_SYSTEM_MODULESLOADED, icqModulesLoaded);
CreateProtoServiceFunction(protoName, PS_GETCAPS, icqGetCaps);
- CreateProtoServiceFunction(protoName, PS_GETNAME, icqGetName);
CreateProtoServiceFunction(protoName, PS_LOADICON, icqLoadIcon);
CreateProtoServiceFunction(protoName, PS_SETSTATUS, icqSetStatus);
CreateProtoServiceFunction(protoName, PS_GETSTATUS, icqGetStatus);
diff --git a/protocols/LotusNotify/src/LotusNotify.cpp b/protocols/LotusNotify/src/LotusNotify.cpp
index 4c86622fa0..731fbc296d 100644
--- a/protocols/LotusNotify/src/LotusNotify.cpp
+++ b/protocols/LotusNotify/src/LotusNotify.cpp
@@ -847,15 +847,7 @@ INT_PTR GetCaps(WPARAM wParam, LPARAM)
return 0;
}
-//gives name to protocol module
-INT_PTR GetName(WPARAM wParam, LPARAM lParam)
-{
- strncpy((char *)lParam, MODULENAME, wParam);
- return 0;
-}
-
-
-//gives icon for proto module
+// gives icon for proto module
INT_PTR TMLoadIcon(WPARAM wParam, LPARAM)
{
UINT id;
@@ -1066,7 +1058,6 @@ int CMPlugin::Load()
g_plugin.setWord(hContact, "status", ID_STATUS_OFFLINE);
CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, GetCaps);
- CreateProtoServiceFunction(MODULENAME, PS_GETNAME, GetName);
CreateProtoServiceFunction(MODULENAME, PS_LOADICON, TMLoadIcon);
CreateProtoServiceFunction(MODULENAME, PS_SETSTATUS, SetStatus);
CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, GetStatus);
diff --git a/protocols/NewsAggregator/Src/NewsAggregator.cpp b/protocols/NewsAggregator/Src/NewsAggregator.cpp
index 32be6949e1..2ec6b4f5a0 100644
--- a/protocols/NewsAggregator/Src/NewsAggregator.cpp
+++ b/protocols/NewsAggregator/Src/NewsAggregator.cpp
@@ -62,7 +62,6 @@ int CMPlugin::Load()
hUpdateMutex = CreateMutex(nullptr, FALSE, nullptr);
- CreateProtoServiceFunction(MODULENAME, PS_GETNAME, NewsAggrGetName);
CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, NewsAggrGetCaps);
CreateProtoServiceFunction(MODULENAME, PS_SETSTATUS, NewsAggrSetStatus);
CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, NewsAggrGetStatus);
diff --git a/protocols/NewsAggregator/Src/Services.cpp b/protocols/NewsAggregator/Src/Services.cpp
index aa1005d285..f809cd4058 100644
--- a/protocols/NewsAggregator/Src/Services.cpp
+++ b/protocols/NewsAggregator/Src/Services.cpp
@@ -62,16 +62,6 @@ int NewsAggrPreShutdown(WPARAM, LPARAM)
return 0;
}
-INT_PTR NewsAggrGetName(WPARAM wParam, LPARAM lParam)
-{
- if(lParam) {
- mir_strncpy((char *)lParam, MODULENAME, wParam);
- return 0;
- }
-
- return 1;
-}
-
INT_PTR NewsAggrGetCaps(WPARAM wp, LPARAM)
{
switch(wp) {
diff --git a/protocols/NewsAggregator/Src/stdafx.h b/protocols/NewsAggregator/Src/stdafx.h
index de0f7ed33e..17c1796916 100644
--- a/protocols/NewsAggregator/Src/stdafx.h
+++ b/protocols/NewsAggregator/Src/stdafx.h
@@ -102,7 +102,6 @@ void NetlibUnInit();
void InitMenu();
void InitIcons();
-INT_PTR NewsAggrGetName(WPARAM wParam, LPARAM lParam);
INT_PTR NewsAggrGetCaps(WPARAM wp, LPARAM lp);
INT_PTR NewsAggrSetStatus(WPARAM wp, LPARAM /*lp*/);
INT_PTR NewsAggrGetStatus(WPARAM/* wp*/, LPARAM/* lp*/);
diff --git a/protocols/Non-IM Contact/src/main.cpp b/protocols/Non-IM Contact/src/main.cpp
index d2926c9893..89b0650a9c 100644
--- a/protocols/Non-IM Contact/src/main.cpp
+++ b/protocols/Non-IM Contact/src/main.cpp
@@ -120,7 +120,6 @@ int CMPlugin::Load()
// load services (the first 5 are the basic ones needed to make a new protocol)
CreateProtoServiceFunction(MODNAME, PS_GETCAPS, GetLCCaps);
- CreateProtoServiceFunction(MODNAME, PS_GETNAME, GetLCName);
CreateProtoServiceFunction(MODNAME, PS_LOADICON, LoadLCIcon);
CreateProtoServiceFunction(MODNAME, PS_GETSTATUS, GetLCStatus);
diff --git a/protocols/Non-IM Contact/src/services.cpp b/protocols/Non-IM Contact/src/services.cpp
index 4fda75ac4a..9d297343b5 100644
--- a/protocols/Non-IM Contact/src/services.cpp
+++ b/protocols/Non-IM Contact/src/services.cpp
@@ -16,16 +16,6 @@ INT_PTR GetLCCaps(WPARAM wParam, LPARAM)
}
//=======================================================
-// GetName
-//=======================================================
-//
-INT_PTR GetLCName(WPARAM wParam, LPARAM lParam)
-{
- mir_strncpy((char*)lParam, MODNAME, wParam);
- return 0;
-}
-
-//=======================================================
// BPLoadIcon
//=======================================================
//
diff --git a/protocols/Non-IM Contact/src/stdafx.h b/protocols/Non-IM Contact/src/stdafx.h
index eea3c27698..9e86855567 100644
--- a/protocols/Non-IM Contact/src/stdafx.h
+++ b/protocols/Non-IM Contact/src/stdafx.h
@@ -59,7 +59,6 @@ extern IconItem iconList[];
// Services.c
INT_PTR GetLCCaps(WPARAM wParam,LPARAM lParam);
-INT_PTR GetLCName(WPARAM wParam,LPARAM lParam);
INT_PTR LoadLCIcon(WPARAM wParam,LPARAM lParam);
int SetLCStatus(WPARAM wParam,LPARAM lParam);
INT_PTR GetLCStatus(WPARAM wParam,LPARAM lParam);
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index 27fa124bb6..58bdbb877f 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -36,17 +36,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
/////////////////////////////////////////////////////////////////////////////////////////
// protocol related services
-/** Copy the name of the protocol into lParam
-* @param wParam : max size of the name
-* @param lParam : reference to a char *, which will hold the name
-*/
-INT_PTR CSametimeProto::GetName(WPARAM wParam, LPARAM lParam)
-{
- strncpy((char*)lParam, m_szModuleName, wParam);
- return 0;
-}
-
-
/** Loads the icon corresponding to the status
* Called by the CList when the status changes.
* @param wParam : icon type
diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index 7f6c4e6cc5..1174ec9481 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -25,7 +25,6 @@ CSametimeProto::CSametimeProto(const char* pszProtoName, const wchar_t* tszUserN
SametimeInitIcons();
- CreateProtoService(PS_GETNAME, &CSametimeProto::GetName);
CreateProtoService(PS_LOADICON, &CSametimeProto::SametimeLoadIcon);
HookProtoEvent(ME_MSG_WINDOWEVENT, &CSametimeProto::OnWindowEvent);
diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index 44f6bcd3a8..11d5002beb 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -41,7 +41,6 @@ struct CSametimeProto : public PROTO<CSametimeProto>
bool OnContactDeleted(MCONTACT hContact, uint32_t flags) override;
// sametime.cpp
- INT_PTR __cdecl GetName(WPARAM wParam, LPARAM lParam);
INT_PTR __cdecl SametimeLoadIcon(WPARAM wParam, LPARAM lParam);
int __cdecl OnWindowEvent(WPARAM wParam, LPARAM lParam);
int __cdecl OnIdleChanged(WPARAM wParam, LPARAM lParam);
diff --git a/protocols/Weather/src/stdafx.h b/protocols/Weather/src/stdafx.h
index d61a64e71a..64993c86ef 100644
--- a/protocols/Weather/src/stdafx.h
+++ b/protocols/Weather/src/stdafx.h
@@ -67,7 +67,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// name
#define MODULENAME "Weather"
-#define WEATHERPROTOTEXT "Weather"
#define DEFCURRENTWEATHER "WeatherCondition"
#define WEATHERCONDITION "Current"
diff --git a/protocols/Weather/src/weather_opt.cpp b/protocols/Weather/src/weather_opt.cpp
index c4b42ede5c..1d92f20191 100644
--- a/protocols/Weather/src/weather_opt.cpp
+++ b/protocols/Weather/src/weather_opt.cpp
@@ -487,7 +487,7 @@ int OptInit(WPARAM wParam, LPARAM)
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pfnDlgProc = OptionsProc;
odp.szGroup.a = LPGEN("Network");
- odp.szTitle.a = WEATHERPROTOTEXT;
+ odp.szTitle.a = MODULENAME;
odp.szTab.a = LPGEN("General");
odp.flags = ODPF_BOLDGROUPS;
g_plugin.addOptions(wParam, &odp);
diff --git a/protocols/Weather/src/weather_svcs.cpp b/protocols/Weather/src/weather_svcs.cpp
index 3c4c775347..ced1ce5c71 100644
--- a/protocols/Weather/src/weather_svcs.cpp
+++ b/protocols/Weather/src/weather_svcs.cpp
@@ -81,14 +81,6 @@ INT_PTR WeatherGetCaps(WPARAM wParam, LPARAM)
return ret;
}
-// protocol service function to get weather protocol name
-INT_PTR WeatherGetName(WPARAM wParam, LPARAM lParam)
-{
- strncpy((char*)lParam, WEATHERPROTOTEXT, wParam - 1);
- *((char*)lParam + wParam - 1) = 0;
- return 0;
-}
-
// protocol service function to get the current status of the protocol
INT_PTR WeatherGetStatus(WPARAM, LPARAM)
{
@@ -264,7 +256,6 @@ static INT_PTR WeatherAdvancedStatusIcon(WPARAM hContact, LPARAM)
void InitServices(void)
{
CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, WeatherGetCaps);
- CreateProtoServiceFunction(MODULENAME, PS_GETNAME, WeatherGetName);
CreateProtoServiceFunction(MODULENAME, PS_LOADICON, WeatherLoadIcon);
CreateProtoServiceFunction(MODULENAME, PS_SETSTATUS, WeatherSetStatus);
CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, WeatherGetStatus);
diff --git a/protocols/WebView/src/main.cpp b/protocols/WebView/src/main.cpp
index 77375f0e63..a12a8640ab 100644
--- a/protocols/WebView/src/main.cpp
+++ b/protocols/WebView/src/main.cpp
@@ -58,7 +58,6 @@ CMPlugin::CMPlugin() :
void InitServices()
{
CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, GetCaps);
- CreateProtoServiceFunction(MODULENAME, PS_GETNAME, GetName);
CreateProtoServiceFunction(MODULENAME, PS_LOADICON, BPLoadIcon);
CreateProtoServiceFunction(MODULENAME, PS_SETSTATUS, SetStatus);
CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, GetStatus);
diff --git a/protocols/WebView/src/webview.h b/protocols/WebView/src/webview.h
index bc2f52ed5d..3ee6c9b88b 100644
--- a/protocols/WebView/src/webview.h
+++ b/protocols/WebView/src/webview.h
@@ -166,7 +166,6 @@ int SendToRichEdit(HWND hWindow, char *truncated, COLORREF rgbText, COLORREF rgb
// Services
INT_PTR GetCaps(WPARAM wParam, LPARAM lParam);
-INT_PTR GetName(WPARAM wParam, LPARAM lParam);
INT_PTR BPLoadIcon(WPARAM wParam, LPARAM lParam); // BPLoadIcon
INT_PTR SetStatus(WPARAM wParam, LPARAM lParam);
diff --git a/protocols/YAMN/src/services.cpp b/protocols/YAMN/src/services.cpp
index c7f1ea5f1c..153ce77c79 100644
--- a/protocols/YAMN/src/services.cpp
+++ b/protocols/YAMN/src/services.cpp
@@ -17,12 +17,6 @@ static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM)
return 0;
}
-static INT_PTR Service_GetName(WPARAM wParam, LPARAM lParam)
-{
- mir_strncpy((char *)lParam, YAMN_DBMODULE, wParam);
- return 0;
-}
-
static INT_PTR Service_LoadIcon(WPARAM wParam, LPARAM)
{
if (LOWORD(wParam) == PLI_PROTOCOL)
@@ -190,7 +184,6 @@ void CreateServiceFunctions(void)
{
// Standard 'protocol' services
CreateServiceFunction(YAMN_DBMODULE PS_GETCAPS, Service_GetCaps);
- CreateServiceFunction(YAMN_DBMODULE PS_GETNAME, Service_GetName);
CreateServiceFunction(YAMN_DBMODULE PS_LOADICON, Service_LoadIcon);
// Checks mail
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:43:31 +0000