Remove more obsolete protocols

18 files changed, 22 insertions, 31 deletions

diff --git a/langpacks/belarusian/Plugins/AssocMgr.txt b/langpacks/belarusian/Plugins/AssocMgr.txt
index 76a58d650c..c0551404b1 100644
--- a/langpacks/belarusian/Plugins/AssocMgr.txt
+++ b/langpacks/belarusian/Plugins/AssocMgr.txt
@@ -5,8 +5,8 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

-Супастаўленне пашырэнняў файлаў і спасылак з пратаколамі: Gadu-Gadu, Jabber, MSN, PluginUpdater, Yahoo.

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

+Супастаўленне пашырэнняў файлаў і спасылак з пратаколамі: Gadu-Gadu, Jabber, PluginUpdater.

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 Зарэгістраваныя супастаўленні для Miranda NG:

diff --git a/langpacks/bulgarian/Plugins/AssocMgr.txt b/langpacks/bulgarian/Plugins/AssocMgr.txt
index 181ff41680..55798268df 100644
--- a/langpacks/bulgarian/Plugins/AssocMgr.txt
+++ b/langpacks/bulgarian/Plugins/AssocMgr.txt
@@ -5,8 +5,8 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

-Осигурява възможност за асоцииране на някои типове файлове и на URL-адреси водещи към gg, mirpu, wpmsg, xmpp, ymsgr.

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

+Осигурява възможност за асоцииране на някои типове файлове и на URL-адреси водещи към gg, mirpu, xmpp.

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 Регистрирани асоциации с Miranda NG:

diff --git a/langpacks/czech/Plugins/AssocMgr.txt b/langpacks/czech/Plugins/AssocMgr.txt
index 2cd7483747..0ee187b947 100644
--- a/langpacks/czech/Plugins/AssocMgr.txt
+++ b/langpacks/czech/Plugins/AssocMgr.txt
@@ -5,8 +5,8 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

-Spravuje asociace souborů a URL jako jsou gg, mirpu, wpmsg, xmpp, ymsgr.

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

+Spravuje asociace souborů a URL jako jsou gg, mirpu, xmpp.

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 Asociace registrované pro Mirandu NG:

diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index 76c0ba88fc..71f2aa169b 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 [Miscellaneous]

diff --git a/langpacks/french/Plugins/AssocMgr.txt b/langpacks/french/Plugins/AssocMgr.txt
index 723c8aa79c..b76f22b6fe 100644
--- a/langpacks/french/Plugins/AssocMgr.txt
+++ b/langpacks/french/Plugins/AssocMgr.txt
@@ -5,8 +5,8 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

-Permet de gérer les associations de fichier et d'ULR comme Gadu-Gadu, Jabber, MSN messenger, PluginUpdater et Yahoo messenger.

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

+Permet de gérer les associations de fichier et d'ULR comme Gadu-Gadu, Jabber et PluginUpdater.

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 Associations enregistrées pour Miranda-NG :

diff --git a/langpacks/german/Plugins/AssocMgr.txt b/langpacks/german/Plugins/AssocMgr.txt
index 49180e98ee..fc95daa1a1 100644
--- a/langpacks/german/Plugins/AssocMgr.txt
+++ b/langpacks/german/Plugins/AssocMgr.txt
@@ -5,8 +5,8 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

-Verwaltet Verknüpfungen mit Dateien und URLs wie gg, mirpu, wpmsg, xmpp, ymsgr.

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

+Verwaltet Verknüpfungen mit Dateien und URLs wie gg, mirpu, xmpp.

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 Mit Miranda NG registrierte Verknüpfungen:

diff --git a/langpacks/polish/Plugins/AssocMgr.txt b/langpacks/polish/Plugins/AssocMgr.txt
index c02ef840a7..f8e9ef7e9b 100644
--- a/langpacks/polish/Plugins/AssocMgr.txt
+++ b/langpacks/polish/Plugins/AssocMgr.txt
@@ -5,8 +5,8 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

-Obsługuje skojarzenia rozszerzeń plików i linków protokołów Gadu-Gadu, Jabber, MSN, PluginUpdater, Yahoo.

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

+Obsługuje skojarzenia rozszerzeń plików i linków protokołów Gadu-Gadu, Jabber, PluginUpdater.

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 Zarejestrowane powiązania dla Mirandy NG

diff --git a/langpacks/russian/Plugins/AssocMgr.txt b/langpacks/russian/Plugins/AssocMgr.txt
index 63251a8f60..cbfc4f0e40 100644
--- a/langpacks/russian/Plugins/AssocMgr.txt
+++ b/langpacks/russian/Plugins/AssocMgr.txt
@@ -5,8 +5,8 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

-Ассоциирует расширения файлов и URL-ссылок с протоколами: Gadu-Gadu, Jabber, MSN, PluginUpdater, Yahoo.

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

+Ассоциирует расширения файлов и URL-ссылок с протоколами: Gadu-Gadu, Jabber, PluginUpdater.

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 Зарегистрированные ассоциации для Miranda NG:

diff --git a/langpacks/spanish/Plugins/AssocMgr.txt b/langpacks/spanish/Plugins/AssocMgr.txt
index 05e54930d0..156e8c9b7f 100644
--- a/langpacks/spanish/Plugins/AssocMgr.txt
+++ b/langpacks/spanish/Plugins/AssocMgr.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

 

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

diff --git a/langpacks/spanish/Untranslated/AssocMgr.txt b/langpacks/spanish/Untranslated/AssocMgr.txt
index 6e533f01ab..caed61795b 100644
--- a/langpacks/spanish/Untranslated/AssocMgr.txt
+++ b/langpacks/spanish/Untranslated/AssocMgr.txt
@@ -1,4 +1,4 @@
-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

 [Registered associations for Miranda NG:]

 [&Start Miranda NG automatically when the computer starts (using current profile)]

 [Only associate with Miranda NG while it is &running]

diff --git a/langpacks/ukrainian/Plugins/AssocMgr.txt b/langpacks/ukrainian/Plugins/AssocMgr.txt
index 5f9c51d058..8d67562e9b 100644
--- a/langpacks/ukrainian/Plugins/AssocMgr.txt
+++ b/langpacks/ukrainian/Plugins/AssocMgr.txt
@@ -5,8 +5,8 @@
 ;  Version: 0.2.1.1

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

-Асоціація розширень файлів і URL-посилань з протоколами: Gadu-Gadu, Jabber, MSN, PluginUpdater, Yahoo.

+[Handles file type associations and URLs like gg, mirpu, xmpp.]

+Асоціація розширень файлів і URL-посилань з протоколами: Gadu-Gadu, Jabber, PluginUpdater.

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 Зареєстровані асоціації для Miranda NG:

diff --git a/plugins/AssocMgr/src/version.h b/plugins/AssocMgr/src/version.h
index 9aecdd58f2..14052c1320 100644
--- a/plugins/AssocMgr/src/version.h
+++ b/plugins/AssocMgr/src/version.h
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define __PLUGIN_NAME            "File association manager"

 #define __FILENAME               "AssocMgr.dll"

-#define __DESCRIPTION            "Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr."

+#define __DESCRIPTION            "Handles file type associations and URLs like gg, mirpu, xmpp."

 #define __AUTHOR                 "H. Herkenrath"

 #define __AUTHORWEB              "https://miranda-ng.org/p/AssocMgr/"

 #define __COPYRIGHT              "© 2005-2007 H. Herkenrath"

diff --git a/plugins/Nudge/res/NudgeYahoo.ico b/plugins/Nudge/res/NudgeYahoo.ico
deleted file mode 100644
index efa72afbc4..0000000000
--- a/plugins/Nudge/res/NudgeYahoo.ico
+++ /dev/null
diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc
index 1d76fa5601..0932763412 100644
--- a/plugins/Nudge/res/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -179,7 +179,6 @@ END
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_NUDGE               ICON                    "Nudge.ico"

-IDI_NUGDE_YAHOO         ICON                    "NudgeYahoo.ico"

 IDI_NUDGE_IRC           ICON                    "NudgeIRC.ico"

 IDI_NUDGE_META          ICON                    "NudgeMeta.ico"

 #endif    // Neutral resources

diff --git a/plugins/Nudge/src/resource.h b/plugins/Nudge/src/resource.h
index fbca447b46..2a899b9d3c 100644
--- a/plugins/Nudge/src/resource.h
+++ b/plugins/Nudge/src/resource.h
@@ -4,7 +4,6 @@
 //

 #define IDD_DIALOG1                     101

 #define IDI_NUDGE                       102

-#define IDI_NUGDE_YAHOO                 107

 #define IDI_NUDGE_IRC                   109

 #define IDI_NUDGE_META                  113

 #define IDD_SHAKEOPT                    126

diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp
index 3264a36e2d..d23e77b2e5 100644
--- a/plugins/SmileyAdd/src/smileys.cpp
+++ b/plugins/SmileyAdd/src/smileys.cpp
@@ -900,10 +900,6 @@ void SmileyCategoryListType::AddContactTransportAsCategory(MCONTACT hContact, co
 		const char *packname = nullptr;
 		if (strstr(trsp, "icq") != nullptr)
 			packname = "icq";
-		else if (strstr(trsp, "yahoo") != nullptr)
-			packname = "yahoo";
-		else if (strstr(trsp, "aim") != nullptr)
-			packname = "aim";
 
 		mir_free(trsp);
 
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index f25d7db8f0..1c2b9b1887 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -46,10 +46,7 @@ struct CTransportProtoTableItem
 static CTransportProtoTableItem TransportProtoTable[] =

 {

 	{ "|*icq*|jit*",     "ICQ" },

-	{ "msn*",            "MSN" },

-	{ "yahoo*",          "YAHOO" },

 	{ "mrim*",           "MRA" },

-	{ "aim*",            "AIM" },

 	//request #3094

 	{ "|gg*|gadu*",      "GaduGadu" },

 	{ "tv*",             "TV" },

diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js
index 87a017ed20..eea84f5c42 100644
--- a/tools/lpgen/lpgen.js
+++ b/tools/lpgen/lpgen.js
@@ -493,7 +493,7 @@ function ParseRCFile(FileTextVar, array) {
     //now make a job, till end of matching regexp

     while ((string = find.exec(FileTextVar)) !== null) {

         // check for some garbage like "List1","Tab1" etc. in *.rc files, we do not need this.

-        onestring = string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|NickServ|OSD|OTR|PCS|PGP|S.ms|SASL|SMS|SSL|Steam|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400|&\w)|(%.(.*%)?))$/g, "");

+        onestring = string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|NickServ|OSD|OTR|PCS|PGP|S.ms|SASL|SMS|SSL|Steam|Steam Guard|Tox|Twitter|Winamp \(\*\)|Windows|X400|&\w)|(%.(.*%)?))$/g, "");

         // ignore some popup menu craps

         if (string[1] == "POPUP" && onestring.match(/^([a-zA-Z ]*(menu|context|popup(?!s)))|([A-Z][a-z]+([A-Z][a-z]*)+)|(new item)$/g)) {

             continue;

@@ -552,7 +552,7 @@ function ParseSourceFile(FileTextVar, array) {
 //filter _T() function results

 function filter_T(string) {

     //filter for exact matched strings

-    var filter1 = /^(&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|NickServ|OSD|OTR|PCS|PGP|SASL|SMS|SSL|SteamID|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400)$/g;

+    var filter1 = /^(&?[Oo][Kk]|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|NickServ|OSD|OTR|PCS|PGP|SASL|SMS|SSL|SteamID|Steam Guard|Tox|Twitter|Winamp \(\*\)|Windows|X400)$/g;

     //filter string starting from following words

     var filter2 = /^(SOFTWARE\\|SYSTEM\\|http|ftp|UTF-|utf-|TEXT|EXE|exe|txt|css|html|dat[^a]|txt|MS\x20|CLVM|TM_|CLCB|CLSID|CLUI|HKEY_|MButton|BUTTON|WindowClass|MHeader|RichEdit|RICHEDIT|STATIC|EDIT|CList|listbox|LISTBOX|combobox|COMBOBOX|TitleB|std\w|iso-|windows-|<div|<html|<img|<span|<hr|<a\x20|<table|<td|miranda_|kernel32|user32|muc|pubsub|shlwapi|Tahoma|NBRichEdit|CreatePopup|&?[Oo][Kk]|<\/|<\w>|\w\\\w|urn\:|<\?xml|<\!|h\d|\.!\.).*$/g;

     //filter string ending with following words