From dae0eee5cac2a349102d78f71c03686a83866bb7 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Mon, 24 Jan 2022 17:50:56 +0300 Subject: We do not need to translate account names --- plugins/MirFox/src/MirandaUtils.cpp | 2 +- plugins/PackUpdater/Src/Utils.cpp | 2 +- plugins/PasteIt/src/PasteIt.cpp | 2 +- plugins/PluginUpdater/src/PluginUpdater.cpp | 2 +- plugins/SendScreenshotPlus/src/Main.cpp | 2 +- plugins/SmileyAdd/src/download.cpp | 2 +- plugins/Watrack_MPD/src/init.cpp | 2 +- plugins/mRadio/mradio.dpr | 4 +--- protocols/CurrencyRates/src/HTTPSession.cpp | 2 +- protocols/Facebook/src/proto.cpp | 5 +---- protocols/Gadu-Gadu/src/gg_proto.cpp | 5 +---- protocols/GmailNotifier/src/main.cpp | 2 +- protocols/ICQ-WIM/src/proto.cpp | 4 +--- protocols/ICQCorp/src/corp.cpp | 3 +-- protocols/IRCG/src/ircproto.cpp | 2 +- protocols/JabberG/src/jabber_ws.cpp | 4 +--- protocols/MinecraftDynmap/src/proto.cpp | 5 +---- protocols/NewsAggregator/Src/Utils.cpp | 2 +- protocols/Omegle/src/proto.cpp | 4 +--- protocols/Sametime/src/sametime_proto.cpp | 5 +---- protocols/SkypeWeb/src/skype_proto.cpp | 3 +-- protocols/Steam/src/steam_proto.cpp | 5 +---- protocols/Tox/src/tox_netlib.cpp | 5 +---- protocols/Twitter/src/proto.cpp | 2 +- protocols/VKontakte/src/vk_proto.cpp | 5 +---- protocols/Weather/src/weather_http.cpp | 2 +- protocols/WebView/src/main.cpp | 5 +---- protocols/WhatsAppWeb/src/main.cpp | 2 +- protocols/YAMN/src/proto/netlib.cpp | 6 +----- protocols/YAMN/src/proto/pop3/pop3comm.cpp | 2 +- 30 files changed, 30 insertions(+), 68 deletions(-) diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp index 552263339c..599c148faa 100644 --- a/plugins/MirFox/src/MirandaUtils.cpp +++ b/plugins/MirFox/src/MirandaUtils.cpp @@ -32,7 +32,7 @@ void MirandaUtils::netlibRegister() { NETLIBUSER nlu = {}; nlu.flags = NUF_UNICODE | NUF_NOOPTIONS; nlu.szSettingsModule = MODULENAME; - nlu.szDescriptiveName.w = TranslateT("MirFox log"); + nlu.szDescriptiveName.w = MODULENAME; netlibHandle = Netlib_RegisterUser(&nlu); } diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp index 0bdf946a8c..384498b98c 100644 --- a/plugins/PackUpdater/Src/Utils.cpp +++ b/plugins/PackUpdater/Src/Utils.cpp @@ -50,7 +50,7 @@ BOOL NetlibInit() { NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = TranslateT("Pack Updater"); + nlu.szDescriptiveName.w = MODULENAME; nlu.szSettingsModule = MODULENAME; hNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index 0cfc630cee..ec291aae07 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -354,7 +354,7 @@ int CMPlugin::Load() NETLIBUSER nlu = {}; nlu.flags = NUF_UNICODE | NUF_OUTGOING | NUF_HTTPCONNS; nlu.szSettingsModule = MODULENAME; - nlu.szDescriptiveName.w = TranslateT("Paste It"); + nlu.szDescriptiveName.w = MODULENAME; g_hNetlibUser = Netlib_RegisterUser(&nlu); pasteToWebs[0] = new PasteToWeb1(); diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index 95afed2a1d..cf570d9076 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -97,7 +97,7 @@ int CMPlugin::Load() // Netlib initialization NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = TranslateT("Plugin Updater"); + nlu.szDescriptiveName.w = MODULENAME; nlu.szSettingsModule = MODULENAME; g_hNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index fb8c92ed28..1807303205 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -210,7 +210,7 @@ int hook_ModulesLoaded(WPARAM, LPARAM) // Netlib register NETLIBUSER nlu = {}; nlu.szSettingsModule = __PLUGIN_NAME; - nlu.szDescriptiveName.w = TranslateT("SendSS"); + nlu.szDescriptiveName.w = __PLUGIN_NAME; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; //|NUF_NOHTTPSOPTION; g_hNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/plugins/SmileyAdd/src/download.cpp b/plugins/SmileyAdd/src/download.cpp index 4e3094b4de..85e65a536c 100644 --- a/plugins/SmileyAdd/src/download.cpp +++ b/plugins/SmileyAdd/src/download.cpp @@ -228,7 +228,7 @@ void DownloadInit(void) NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE; nlu.szSettingsModule = MODULENAME; - nlu.szDescriptiveName.w = TranslateT("SmileyAdd"); + nlu.szDescriptiveName.w = MODULENAME; hNetlibUser = Netlib_RegisterUser(&nlu); hFolderPacks = FoldersRegisterCustomPathW(LPGEN("SmileyAdd"), LPGEN("Smiley packs' folder"), L"%miranda_path%"); diff --git a/plugins/Watrack_MPD/src/init.cpp b/plugins/Watrack_MPD/src/init.cpp index 9d8b044a07..e6792ff2a7 100755 --- a/plugins/Watrack_MPD/src/init.cpp +++ b/plugins/Watrack_MPD/src/init.cpp @@ -49,7 +49,7 @@ static int OnModulesLoaded(WPARAM, LPARAM) { NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = TranslateT("Watrack MPD connection"); + nlu.szDescriptiveName.w = __PLUGIN_NAME; nlu.szSettingsModule = __PLUGIN_NAME; ghNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/plugins/mRadio/mradio.dpr b/plugins/mRadio/mradio.dpr index ac7ef6a97c..1ef63d88cc 100644 --- a/plugins/mRadio/mradio.dpr +++ b/plugins/mRadio/mradio.dpr @@ -54,9 +54,7 @@ begin //-- network (for proxy) FillChar(nlu,SizeOf(nlu),0); - StrCopy(szTemp,Translate('%s (server)')); - StrReplace(szTemp,'%s',PluginName); - nlu.szDescriptiveName.a:=szTemp; + nlu.szDescriptiveName.a:=PluginName; nlu.flags :=NUF_HTTPCONNS or NUF_NOHTTPSOPTION or NUF_OUTGOING; nlu.szSettingsModule :=PluginName; hNetLib:=Netlib_RegisterUser(@nlu); diff --git a/protocols/CurrencyRates/src/HTTPSession.cpp b/protocols/CurrencyRates/src/HTTPSession.cpp index 74f3a32e25..6fbee42c34 100644 --- a/protocols/CurrencyRates/src/HTTPSession.cpp +++ b/protocols/CurrencyRates/src/HTTPSession.cpp @@ -82,7 +82,7 @@ bool CHTTPSession::Init() NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE; nlu.szSettingsModule = MODULENAME; - nlu.szDescriptiveName.w = TranslateT("CurrencyRates"); + nlu.szDescriptiveName.w = MODULENAME; g_hNetLib = Netlib_RegisterUser(&nlu); return (nullptr != g_hNetLib); } diff --git a/protocols/Facebook/src/proto.cpp b/protocols/Facebook/src/proto.cpp index b6e841a703..7a1d8b1c93 100644 --- a/protocols/Facebook/src/proto.cpp +++ b/protocols/Facebook/src/proto.cpp @@ -88,13 +88,10 @@ FacebookProto::FacebookProto(const char *proto_name, const wchar_t *username) : m_szSyncToken = getMStringA(DBKEY_SYNC_TOKEN); // Create standard network connection - wchar_t descr[512]; - mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName); - NETLIBUSER nlu = {}; nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; nlu.szSettingsModule = m_szModuleName; - nlu.szDescriptiveName.w = descr; + nlu.szDescriptiveName.w = m_tszUserName; m_hNetlibUser = Netlib_RegisterUser(&nlu); db_set_resident(m_szModuleName, "UpdateNeeded"); diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index 3858be5c8e..8cbccc1d90 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -40,13 +40,10 @@ GaduProto::GaduProto(const char *pszProtoName, const wchar_t *tszUserName) : InitializeCriticalSection(&sessions_mutex); // Register m_hNetlibUser user - wchar_t name[128]; - mir_snwprintf(name, TranslateT("%s"), m_tszUserName); - NETLIBUSER nlu = {}; nlu.flags = NUF_UNICODE | NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS; nlu.szSettingsModule = m_szModuleName; - nlu.szDescriptiveName.w = name; + nlu.szDescriptiveName.w = m_tszUserName; m_hNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/protocols/GmailNotifier/src/main.cpp b/protocols/GmailNotifier/src/main.cpp index 0efc236c6d..98b6071fbc 100644 --- a/protocols/GmailNotifier/src/main.cpp +++ b/protocols/GmailNotifier/src/main.cpp @@ -91,7 +91,7 @@ int CMPlugin::Load() NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE; nlu.szSettingsModule = MODULENAME; - nlu.szDescriptiveName.w = TranslateT("Gmail Notifier"); + nlu.szDescriptiveName.w = MODULENAME; hNetlibUser = Netlib_RegisterUser(&nlu); CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, GetCaps); diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index 7098cd8492..755b4ee775 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -89,12 +89,10 @@ CIcqProto::CIcqProto(const char *aProtoName, const wchar_t *aUserName) : Chat_Register(&gcr); // netlib handle - CMStringW descr(FORMAT, TranslateT("%s (server)"), m_tszUserName); - NETLIBUSER nlu = {}; nlu.szSettingsModule = m_szModuleName; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = descr.GetBuffer(); + nlu.szDescriptiveName.w = m_tszUserName; m_hNetlibUser = Netlib_RegisterUser(&nlu); // this was previously an old ICQ account diff --git a/protocols/ICQCorp/src/corp.cpp b/protocols/ICQCorp/src/corp.cpp index f848fb257c..69c777089b 100644 --- a/protocols/ICQCorp/src/corp.cpp +++ b/protocols/ICQCorp/src/corp.cpp @@ -61,11 +61,10 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC int CMPlugin::Load() { - CMStringA szDescr(FORMAT, "%s", protoName); NETLIBUSER nlu = {}; nlu.flags = NUF_INCOMING | NUF_OUTGOING; nlu.szSettingsModule = protoName; - nlu.szDescriptiveName.a = szDescr.GetBuffer(); + nlu.szDescriptiveName.a = protoName; hNetlibUser = Netlib_RegisterUser(&nlu); LoadServices(); diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index d2644eec4c..e64a3b420e 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -182,7 +182,7 @@ void CIrcProto::OnModulesLoaded() char szTemp2[256]; mir_snprintf(szTemp2, "%s DCC", m_szModuleName); nlu.szSettingsModule = szTemp2; - mir_snwprintf(name, TranslateT("%s client-to-client connections"), m_tszUserName); + mir_snwprintf(name, TranslateT("%s (client-to-client)"), m_tszUserName); nlu.szDescriptiveName.w = name; hNetlibDCC = Netlib_RegisterUser(&nlu); diff --git a/protocols/JabberG/src/jabber_ws.cpp b/protocols/JabberG/src/jabber_ws.cpp index 9d8b31cfb0..95893f3384 100644 --- a/protocols/JabberG/src/jabber_ws.cpp +++ b/protocols/JabberG/src/jabber_ws.cpp @@ -28,12 +28,10 @@ bool CJabberProto::WsInit(void) { m_lastTicks = ::GetTickCount(); - wchar_t name[128]; - mir_snwprintf(name, TranslateT("%s connection"), m_tszUserName); NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = name; + nlu.szDescriptiveName.w = m_tszUserName; nlu.szSettingsModule = m_szModuleName; m_hNetlibUser = Netlib_RegisterUser(&nlu); return m_hNetlibUser != nullptr; diff --git a/protocols/MinecraftDynmap/src/proto.cpp b/protocols/MinecraftDynmap/src/proto.cpp index 0ca0852bbe..e787b831da 100644 --- a/protocols/MinecraftDynmap/src/proto.cpp +++ b/protocols/MinecraftDynmap/src/proto.cpp @@ -41,13 +41,10 @@ MinecraftDynmapProto::MinecraftDynmapProto(const char* proto_name, const wchar_t HookProtoEvent(ME_GC_EVENT, &MinecraftDynmapProto::OnChatEvent); // Create standard network connection - wchar_t descr[512]; - mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName); - NETLIBUSER nlu = {}; nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; nlu.szSettingsModule = m_szModuleName; - nlu.szDescriptiveName.w = descr; + nlu.szDescriptiveName.w = m_tszUserName; m_hNetlibUser = Netlib_RegisterUser(&nlu); if (m_hNetlibUser == nullptr) { wchar_t error[200]; diff --git a/protocols/NewsAggregator/Src/Utils.cpp b/protocols/NewsAggregator/Src/Utils.cpp index f5a0bf17cf..11722b0d0f 100644 --- a/protocols/NewsAggregator/Src/Utils.cpp +++ b/protocols/NewsAggregator/Src/Utils.cpp @@ -33,7 +33,7 @@ void NetlibInit() { NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = TranslateT("NewsAggregator"); + nlu.szDescriptiveName.w = MODULENAME; nlu.szSettingsModule = MODULENAME; hNetlibUser = Netlib_RegisterUser(&nlu); } diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp index 7a446f36b8..ccc0cb9173 100644 --- a/protocols/Omegle/src/proto.cpp +++ b/protocols/Omegle/src/proto.cpp @@ -42,12 +42,10 @@ OmegleProto::OmegleProto(const char* proto_name, const wchar_t* username) : HookProtoEvent(ME_GC_EVENT, &OmegleProto::OnChatEvent); // Create standard network connection - wchar_t descr[512]; NETLIBUSER nlu = {}; nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; nlu.szSettingsModule = m_szModuleName; - mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName); - nlu.szDescriptiveName.w = descr; + nlu.szDescriptiveName.w = m_tszUserName; m_hNetlibUser = Netlib_RegisterUser(&nlu); if (m_hNetlibUser == nullptr) { wchar_t error[200]; diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp index 425445fc67..46b583cddb 100644 --- a/protocols/Sametime/src/sametime_proto.cpp +++ b/protocols/Sametime/src/sametime_proto.cpp @@ -14,13 +14,10 @@ CSametimeProto::CSametimeProto(const char* pszProtoName, const wchar_t* tszUserN server_connection(nullptr) { // Register m_hNetlibUser user - wchar_t name[128]; - mir_snwprintf(name, TranslateT("%s connection"), m_tszUserName); - NETLIBUSER nlu = {}; nlu.flags = NUF_UNICODE | NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS; nlu.szSettingsModule = m_szModuleName; - nlu.szDescriptiveName.w = name; + nlu.szDescriptiveName.w = m_tszUserName; m_hNetlibUser = Netlib_RegisterUser(&nlu); RegisterGLibLogger(); diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index c49a7a39f3..d99fe64b61 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -33,9 +33,8 @@ CSkypeProto::CSkypeProto(const char* protoName, const wchar_t* userName) : wstrPlace(this, "Place", L"") { NETLIBUSER nlu = {}; - CMStringW name(FORMAT, TranslateT("%s connection"), m_tszUserName); nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = name.GetBuffer(); + nlu.szDescriptiveName.w = m_tszUserName; nlu.szSettingsModule = m_szModuleName; m_hNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp index 801c6cf49c..f41797f9d3 100644 --- a/protocols/Steam/src/steam_proto.cpp +++ b/protocols/Steam/src/steam_proto.cpp @@ -69,12 +69,9 @@ CSteamProto::CSteamProto(const char *protoName, const wchar_t *userName) : HookProtoEvent(ME_OPT_INITIALISE, &CSteamProto::OnOptionsInit); // netlib support - wchar_t name[128]; - mir_snwprintf(name, TranslateT("%s connection"), m_tszUserName); - NETLIBUSER nlu = {}; nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = name; + nlu.szDescriptiveName.w = m_tszUserName; nlu.szSettingsModule = m_szModuleName; m_hNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/protocols/Tox/src/tox_netlib.cpp b/protocols/Tox/src/tox_netlib.cpp index 0ba87ed391..8380334078 100644 --- a/protocols/Tox/src/tox_netlib.cpp +++ b/protocols/Tox/src/tox_netlib.cpp @@ -2,12 +2,9 @@ void CToxProto::InitNetlib() { - wchar_t name[128]; - mir_snwprintf(name, TranslateT("%s connection"), m_tszUserName); - NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE; - nlu.szDescriptiveName.w = name; + nlu.szDescriptiveName.w = m_tszUserName; nlu.szSettingsModule = m_szModuleName; m_hNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 4bfdd34c87..df7fa2f46b 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -80,7 +80,7 @@ CTwitterProto::CTwitterProto(const char *proto_name, const wchar_t *username) : char module[512]; mir_snprintf(module, "%sAv", m_szModuleName); nlu.szSettingsModule = module; - mir_snwprintf(descr, TranslateT("%s avatar connection"), m_tszUserName); + mir_snwprintf(descr, TranslateT("%s (avatar)"), m_tszUserName); nlu.szDescriptiveName.w = descr; hAvatarNetlib_ = Netlib_RegisterUser(&nlu); if (hAvatarNetlib_ == nullptr) { diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 38e632c88e..489615b0c3 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -55,13 +55,10 @@ CVkProto::CVkProto(const char *szModuleName, const wchar_t *pwszUserName) : HookProtoEvent(ME_OPT_INITIALISE, &CVkProto::OnOptionsInit); - wchar_t descr[512]; - mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName); - NETLIBUSER nlu = {}; nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; nlu.szSettingsModule = m_szModuleName; - nlu.szDescriptiveName.w = descr; + nlu.szDescriptiveName.w = m_tszUserName; m_hNetlibUser = Netlib_RegisterUser(&nlu); CMStringA szListeningTo(FORMAT, "%sEnabled", m_szModuleName); diff --git a/protocols/Weather/src/weather_http.cpp b/protocols/Weather/src/weather_http.cpp index f0bf2ccc81..248f183fdb 100644 --- a/protocols/Weather/src/weather_http.cpp +++ b/protocols/Weather/src/weather_http.cpp @@ -139,6 +139,6 @@ void NetlibInit(void) NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE; nlu.szSettingsModule = MODULENAME; - nlu.szDescriptiveName.w = TranslateT("Weather"); + nlu.szDescriptiveName.w = MODULENAME; hNetlibUser = Netlib_RegisterUser(&nlu); } diff --git a/protocols/WebView/src/main.cpp b/protocols/WebView/src/main.cpp index ed6adaac30..1d5fe29cb6 100644 --- a/protocols/WebView/src/main.cpp +++ b/protocols/WebView/src/main.cpp @@ -108,13 +108,10 @@ int CMPlugin::Load() InitialiseGlobals(); // register netlib handle - char tempNdesc[50]; - mir_snprintf(tempNdesc, "%s connection settings", MODULENAME); - NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS; nlu.szSettingsModule = MODULENAME; - nlu.szDescriptiveName.a = tempNdesc; + nlu.szDescriptiveName.a = MODULENAME; hNetlibUser = Netlib_RegisterUser(&nlu); //protocol services diff --git a/protocols/WhatsAppWeb/src/main.cpp b/protocols/WhatsAppWeb/src/main.cpp index 6dc159f077..175b644e5a 100644 --- a/protocols/WhatsAppWeb/src/main.cpp +++ b/protocols/WhatsAppWeb/src/main.cpp @@ -82,7 +82,7 @@ int CMPlugin::Load() NETLIBUSER nlu = {}; nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; nlu.szSettingsModule = "WhatsApp"; - nlu.szDescriptiveName.w = TranslateT("WhatsApp HTTP connections"); + nlu.szDescriptiveName.w = TranslateT("WhatsApp (HTTP)"); hAvatarUser = Netlib_RegisterUser(&nlu); ////////////////////////////////////////////////////////////////////////////////////// diff --git a/protocols/YAMN/src/proto/netlib.cpp b/protocols/YAMN/src/proto/netlib.cpp index 54a40ba4cd..a2f924294e 100644 --- a/protocols/YAMN/src/proto/netlib.cpp +++ b/protocols/YAMN/src/proto/netlib.cpp @@ -33,17 +33,13 @@ void __stdcall SSL_DebugLog(const char *fmt, ...) HANDLE RegisterNLClient(const char *name) { - char desc[128]; - - mir_snprintf(desc, Translate("%s connection"), name); - #ifdef DEBUG_COMM DebugLog(CommFile, ""); #endif NETLIBUSER nlu = {}; nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS; - nlu.szDescriptiveName.a = desc; + nlu.szDescriptiveName.a = name; nlu.szSettingsModule = (char *)name; hNetlibUser = Netlib_RegisterUser(&nlu); diff --git a/protocols/YAMN/src/proto/pop3/pop3comm.cpp b/protocols/YAMN/src/proto/pop3/pop3comm.cpp index fbb89eaa78..4d5f7c9fa8 100644 --- a/protocols/YAMN/src/proto/pop3/pop3comm.cpp +++ b/protocols/YAMN/src/proto/pop3/pop3comm.cpp @@ -194,7 +194,7 @@ int RegisterPOP3Plugin(WPARAM, LPARAM) } //Register new pop3 user in netlib - if (nullptr == (hNetLib = RegisterNLClient("YAMN-POP3"))) + if (nullptr == (hNetLib = RegisterNLClient("YAMN (POP3)"))) { UnLoadPOP3(nullptr); return 0; } -- cgit v1.2.3