remove Tlen completely

20 files changed, 5 insertions, 60 deletions

diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp
index 0337c30753..85bab9265a 100644
--- a/plugins/AddContactPlus/src/addcontact.cpp
+++ b/plugins/AddContactPlus/src/addcontact.cpp
@@ -31,12 +31,6 @@ struct AddDialogParam : public MZeroedObject
 	PROTOSEARCHRESULT *psr;

 };

 

-// Tlen protocol

-struct TLEN_SEARCH_RESULT : public PROTOSEARCHRESULT

-{

-	char jid[256];

-};

-

 void AddContactDlgOpts(HWND hdlg, const char* szProto, BOOL bAuthOptsOnly = FALSE)

 {

 	DWORD flags = (szProto) ? CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) : 0;

@@ -249,22 +243,8 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM)
 				}

 

 				PROTOSEARCHRESULT *psr;

-				if (strstr(acs->proto, "TLEN")) { // Tlen protocol

-					if (wcschr(szUserId, '@') == nullptr) {

-						MessageBox(nullptr,

-							TranslateT("The contact cannot be added to your contact list. Please make sure the contact ID is entered correctly."),

-							TranslateT("Add contact"), MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);

-						break;

-					}

-					psr = (PROTOSEARCHRESULT*)mir_calloc(sizeof(TLEN_SEARCH_RESULT));

-					psr->cbSize = sizeof(TLEN_SEARCH_RESULT);

-					mir_snprintf(((TLEN_SEARCH_RESULT*)psr)->jid, _countof(((TLEN_SEARCH_RESULT*)psr)->jid), "%S", szUserId);

-				}

-				else {

-					psr = (PROTOSEARCHRESULT*)mir_calloc(sizeof(PROTOSEARCHRESULT));

-					psr->cbSize = sizeof(PROTOSEARCHRESULT);

-				}

-

+				psr = (PROTOSEARCHRESULT*)mir_calloc(sizeof(PROTOSEARCHRESULT));

+				psr->cbSize = sizeof(PROTOSEARCHRESULT);

 				psr->flags = PSR_UNICODE;

 				psr->id.w = mir_wstrdup(szUserId);

 				acs->psr = psr;

diff --git a/plugins/AssocMgr/src/version.h b/plugins/AssocMgr/src/version.h
index 0ca2ab609c..a44ef73797 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 aim, gg, mirpu, tlen, wpmsg, xmpp, ymsgr."

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

 #define __AUTHOR                 "H. Herkenrath"

 #define __AUTHOREMAIL            "hrathh@users.sourceforge.net"

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

diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Tlen.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Tlen.ico
deleted file mode 100644
index 2ae790eada..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Tlen.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/Tlen.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/Tlen.ico
deleted file mode 100644
index 0ff15c93c5..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/Tlen.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v5.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v5.ico
deleted file mode 100644
index 538b14dfcf..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v5.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v6.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v6.ico
deleted file mode 100644
index 2180a6d17c..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v6.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v7.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v7.ico
deleted file mode 100644
index a416896eaa..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v7.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v8.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v8.ico
deleted file mode 100644
index 74e53fd11d..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v8.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index 08bbb0e0ca..498d408065 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -492,11 +492,6 @@ IDI_ATOM3               ICON                    "rss\\Atom 3.ico"
 IDI_RSS09               ICON                    "rss\\RSS 0.9.ico"

 IDI_RSS1                ICON                    "rss\\RSS 1.ico"

 IDI_RSS2                ICON                    "rss\\RSS 2.ico"

-IDI_TLEN                ICON                    "Tlen\\Tlen.ico"

-IDI_TLEN5_OVERLAY       ICON                    "Tlen\\overlay_Tlen_v5.ico"

-IDI_TLEN6_OVERLAY       ICON                    "Tlen\\overlay_Tlen_v6.ico"

-IDI_TLEN7_OVERLAY       ICON                    "Tlen\\overlay_Tlen_v7.ico"

-IDI_TLEN8_OVERLAY       ICON                    "Tlen\\overlay_Tlen_v8.ico"

 IDI_AMSN                ICON                    "MSN\\aMSN.ico"

 IDI_MSN_MAC             ICON                    "MSN\\MSN Mac.ico"

 IDI_MSN_45              ICON                    "MSN\\MSN v4.5-v5.x.ico"

@@ -558,7 +553,6 @@ IDI_JGTALK_OVERLAY      ICON                    "overlays\\overlay_proto_JGTalk.
 IDI_MAILRU_OVERLAY      ICON                    "overlays\\overlay_proto_MRA.ico"

 IDI_MSN_OVERLAY         ICON                    "overlays\\overlay_proto_MSN.ico"

 IDI_QQ_OVERLAY          ICON                    "overlays\\overlay_proto_QQ.ico"

-IDI_TLEN_OVERLAY        ICON                    "overlays\\overlay_proto_Tlen.ico"

 IDI_YAHOO_OVERLAY       ICON                    "overlays\\overlay_proto_Yahoo.ico"

 IDI_VK_OVERLAY          ICON                    "overlays\\overlay_proto_VK.ico"

 IDI_SKYPE_OVERLAY       ICON                    "overlays\\overlay_proto_skype.ico"

diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc
index f9f4c607b3..0187107716 100644
--- a/plugins/FingerprintNG/res/resource.rc
+++ b/plugins/FingerprintNG/res/resource.rc
@@ -87,7 +87,6 @@ BEGIN
     CONTROL         "MSN clients",IDC_GROUP_MSN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10

     CONTROL         "QQ clients",IDC_GROUP_QQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,120,10

     CONTROL         "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10

-    CONTROL         "Tlen clients",IDC_GROUP_TLEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10

     CONTROL         "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10

     CONTROL         "Yahoo clients",IDC_GROUP_YAHOO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,200,120,10

     CONTROL         "Facebook clients",IDC_GROUP_FACEBOOK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,90,120,10

diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index 965a1938f1..d0ac9b3b30 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -63,11 +63,6 @@ case RSS_CASE:
 		return LPGENW("Client icons") L"/" LPGENW("RSS clients");

 	break;

 

-case TLEN_CASE:

-	if (db_get_b(NULL, MODULENAME, "GroupTlen", 1))

-		return LPGENW("Client icons") L"/" LPGENW("Tlen clients");

-	break;

-

 case WEATHER_CASE:

 	if (db_get_b(NULL, MODULENAME, "GroupWeather", 1))

 		return LPGENW("Client icons") L"/" LPGENW("Weather clients");

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 19ed3f5950..53df4a768b 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -580,11 +580,6 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{ "client_GG", L"|Gadu-Gadu*|GG*", LPGENW("Gadu-Gadu client"), IDI_GG, GG_CASE },

 

 	//#########################################################################################################################################################################

-	//#################################   TLEN   ##############################################################################################################################

-	//#########################################################################################################################################################################

-	{ "client_Tlen", L"*Tlen*", LPGENW("Tlen.pl client"), IDI_TLEN, TLEN_CASE },

-

-	//#########################################################################################################################################################################

 	//#################################   Facebook   ##########################################################################################################################

 	//#########################################################################################################################################################################

 	{ "client_Facebook_other", L"*Facebook*other*", L"Facebook (other)", IDI_FACEBOOK_OTHER, FACEBOOK_CASE },

@@ -693,7 +688,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{ "client_Jabber_overlay", L"|^jabber*|Miranda*Jabber*|py*jabb*", LPGENW("Jabber overlay"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_MSN_overlay", L"|^MSN*|*Miranda*MSN*", LPGENW("MSN overlay"), IDI_MSN_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_QQ_overlay", L"|Miranda*QQ*|MIM*QQ*", LPGENW("QQ overlay"), IDI_QQ_OVERLAY, OVERLAYS_PROTO_CASE },

-	{ "client_Tlen_overlay", L"|^tlen*|*tlen*", LPGENW("Tlen.pl overlay"), IDI_TLEN_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_Yahoo_overlay", L"|^Yahoo*|*yahoo*", LPGENW("Yahoo overlay"), IDI_YAHOO_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_MRA_overlay", L"|^MRA*|^Mail.ru*"

 							L"|*MRA*|*Mail.ru*IM*|Mrim*"

@@ -720,11 +714,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{ "client_GG_9", L"|Gadu-Gadu*9*|GG*9*", LPGENW("Gadu-Gadu v9 client"), IDI_GG9_OVERLAY, GG_CASE },

 	{ "client_GG_8", L"|Gadu-Gadu*8*|GG*8*", LPGENW("Gadu-Gadu v8 client"), IDI_GG8_OVERLAY, GG_CASE },

 

-	// {"client_Tlen_8",           L"Tlen Protocol 1?",                     LPGENW("Tlen 8.x overlay"),              IDI_TLEN8_OVERLAY,       TLEN_CASE                   },

-	{ "client_Tlen_7", L"Tlen Protocol 16", LPGENW("Tlen 7.x overlay"), IDI_TLEN7_OVERLAY, TLEN_CASE },

-	{ "client_Tlen_6", L"Tlen Protocol 10", LPGENW("Tlen 6.x overlay"), IDI_TLEN6_OVERLAY, TLEN_CASE },

-	{ "client_Tlen_5", L"Tlen Protocol 7", LPGENW("Tlen 5.x overlay"), IDI_TLEN5_OVERLAY, TLEN_CASE },

-

 	{ "client_QQ_2012", L"|QQ2012*|TM2012*", LPGENW("TM/QQ 2012 overlay"), IDI_QQ_2012_OVERLAY, QQ_CASE },

 	{ "client_QQ_2011", L"|QQ2011*|TM2011*", LPGENW("TM/QQ 2011 overlay"), IDI_QQ_2011_OVERLAY, QQ_CASE },

 	{ "client_QQ_2010", L"|QQ2010*|TM2010*", LPGENW("TM/QQ 2010 overlay"), IDI_QQ_2010_OVERLAY, QQ_CASE },

diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index dc99d8e59d..5ec7b7a793 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -42,7 +42,6 @@ static settings[] =
 	{ IDC_GROUP_MSN, TRUE, "GroupMSN" },

 	{ IDC_GROUP_QQ, TRUE, "GroupQQ" },

 	{ IDC_GROUP_RSS, TRUE, "GroupRSS" },

-	{ IDC_GROUP_TLEN, TRUE, "GroupTlen" },

 	{ IDC_GROUP_WEATHER, TRUE, "GroupWeather" },

 	{ IDC_GROUP_YAHOO, TRUE, "GroupYahoo" },

 	{ IDC_GROUP_FACEBOOK, TRUE, "GroupFacebook" },

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index bd597c7935..8420af7194 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -64,7 +64,6 @@
 #define IDI_MAILRU_OVERLAY              85

 #define IDI_MSN_OVERLAY                 86

 #define IDI_QQ_OVERLAY                  87

-#define IDI_TLEN_OVERLAY                88

 #define IDI_YAHOO_OVERLAY               89

 #define IDI_VK_OVERLAY                  90

 #define IDI_SKYPE_OVERLAY               91

@@ -413,11 +412,6 @@
 #define IDI_GG9_OVERLAY                 726

 #define IDI_GG10_OVERLAY                727

 #define IDI_GG11_OVERLAY                728

-#define IDI_TLEN                        731

-#define IDI_TLEN5_OVERLAY               732

-#define IDI_TLEN6_OVERLAY               733

-#define IDI_TLEN7_OVERLAY               734

-#define IDI_TLEN8_OVERLAY               735

 #define IDI_AMSN                        741

 #define IDI_MSN_MAC                     742

 #define IDI_MSN_45                      743

@@ -600,7 +594,6 @@
 #define IDC_GROUP_MRA                   10036

 #define IDC_GROUP_QQ                    10037

 #define IDC_GROUP_RSS                   10038

-#define IDC_GROUP_TLEN                  10039

 #define IDC_GROUP_WEATHER               10040

 #define IDC_GROUP_YAHOO                 10041

 #define IDC_GROUP_FACEBOOK              10042

diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index f19c447c67..a44ede6da4 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -83,7 +83,6 @@ typedef struct _foundInfo
 #define MSN_CASE					3012	//	MSN clients

 #define QQ_CASE						3013	//	QQ clients (+ versions)

 #define RSS_CASE					3014	//	RSS clients

-#define TLEN_CASE					3015	//	Tlen clients (+ versions)

 #define WEATHER_CASE				3016	//	Weather clients

 #define YAHOO_CASE					3017	//	Yahoo clients (+ versions)

 #define FACEBOOK_CASE               3018    //  Facebook clients

diff --git a/plugins/IEHistory/src/version.h b/plugins/IEHistory/src/version.h
index e84bd1a658..34d50e6bcf 100644
--- a/plugins/IEHistory/src/version.h
+++ b/plugins/IEHistory/src/version.h
@@ -30,8 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define __DESC                  "Shows the history for a given contact using IEView."
 #define __AUTHOR                "Cristian Libotean, Miranda NG team"
-//#define __AUTHOREMAIL           "eblis102@yahoo.com"
-#define __AUTHOREMAIL           ""
+#define __AUTHOREMAIL           "eblis102@yahoo.com"
 #define __COPYRIGHT             "© 2006 Cristian Libotean, 2014-17 Miranda NG team"
 #define __AUTHORWEB             "https://miranda-ng.org/p/IEHistory"
 #define __PLUGIN_DISPLAY_NAME   "IEView history viewer"
diff --git a/plugins/Nudge/res/NudgeTlen.ico b/plugins/Nudge/res/NudgeTlen.ico
deleted file mode 100644
index 8f0d89dda9..0000000000
--- a/plugins/Nudge/res/NudgeTlen.ico
+++ /dev/null
diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc
index ae06a8dd88..6cda0a870b 100644
--- a/plugins/Nudge/res/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -184,7 +184,6 @@ IDI_NUDGE               ICON                    "Nudge.ico"
 IDI_NUGDE_YAHOO         ICON                    "NudgeYahoo.ico"

 IDI_NUDGE_IRC           ICON                    "NudgeIRC.ico"

 IDI_NUDGE_MSN           ICON                    "NudgeMSN.ico"

-IDI_NUDGE_TLEN          ICON                    "NudgeTlen.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 f12f8b8e40..6236ae9500 100644
--- a/plugins/Nudge/src/resource.h
+++ b/plugins/Nudge/src/resource.h
@@ -7,7 +7,6 @@
 #define IDI_NUGDE_YAHOO                 107

 #define IDI_NUDGE_IRC                   109

 #define IDI_NUDGE_MSN                   110

-#define IDI_NUDGE_TLEN                  111

 #define IDI_NUDGE_META                  113

 #define IDD_SHAKEOPT                    126

 #define IDD_OPT_NUDGE                   126

diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h
index 87b596ae77..9f62ae75ec 100644
--- a/plugins/Variables/src/stdafx.h
+++ b/plugins/Variables/src/stdafx.h
@@ -118,7 +118,7 @@ The contact function will return either a unique contact according to the argume
 // Messages you can send to the help window:

 #define VARM_PARSE              (WM_APP+11) // wParam=lParam=0

 #define VARM_SETINPUTTEXT       (WM_APP+12)

-#define VARM_GETINPUTTEXT	     (WM_APP+13)

+#define VARM_GETINPUTTEXT	    (WM_APP+13)

 #define VARM_GETINPUTTEXTLENGTH (WM_APP+14)

 #define VARM_SETSUBJECT         (WM_APP+15)

 #define VARM_GETSUBJECT         (WM_APP+16) // wParam=MCONTACT hContact