summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/ExternalAPI/delphi/m_ieview.inc2
-rw-r--r--plugins/ExternalAPI/delphi/m_smileyadd.inc6
-rw-r--r--plugins/ExternalAPI/m_smileyadd.h8
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/MSN Mac.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/MSN v4.5-v5.x.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/MSN v6.x.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/MSN v7.x.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/MSN v8.x.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/MSN.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/WLM10-11.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/WLM9.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/WebMessenger.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/MSN/aMSN.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_msn.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/fp_icons.rc11
-rw-r--r--plugins/FingerprintNG/res/resource.rc1
-rw-r--r--plugins/FingerprintNG/src/finger_groups.h5
-rw-r--r--plugins/FingerprintNG/src/masks.cpp16
-rw-r--r--plugins/FingerprintNG/src/options.cpp4
-rw-r--r--plugins/FingerprintNG/src/resource.h12
-rw-r--r--plugins/FingerprintNG/src/stdafx.h1
-rw-r--r--plugins/Nudge/res/NudgeMSN.icobin1150 -> 0 bytes
-rw-r--r--plugins/Nudge/res/resource.rc1
-rw-r--r--plugins/Nudge/src/resource.h1
-rw-r--r--plugins/PluginUpdater/src/DlgUpdate.cpp1
-rw-r--r--plugins/SmileyAdd/smileys/nova/MSN.mslbin11390 -> 0 bytes
-rw-r--r--plugins/SmileyAdd/src/smileys.cpp10
-rw-r--r--plugins/Variables/src/stdafx.h2
28 files changed, 12 insertions, 69 deletions
diff --git a/plugins/ExternalAPI/delphi/m_ieview.inc b/plugins/ExternalAPI/delphi/m_ieview.inc
index c0e203241c..23993ffe76 100644
--- a/plugins/ExternalAPI/delphi/m_ieview.inc
+++ b/plugins/ExternalAPI/delphi/m_ieview.inc
@@ -178,7 +178,7 @@ type
// u can use your own protocol name. Smiley add will
// automatically select the smileypack that is
// defined for your protocol. Or, use "Standard" for
- // standard smiley set. Or "ICQ", "MSN" if you
+ // standard smiley set. Or "ICQ" if you
// prefer those icons. If not found or NULL:
// "Standard" will be used
xPosition : int; // Postition to place the selectwindow
diff --git a/plugins/ExternalAPI/delphi/m_smileyadd.inc b/plugins/ExternalAPI/delphi/m_smileyadd.inc
index 0cc064ea8f..0f54f3f989 100644
--- a/plugins/ExternalAPI/delphi/m_smileyadd.inc
+++ b/plugins/ExternalAPI/delphi/m_smileyadd.inc
@@ -36,7 +36,7 @@ type
Protocolname :PAnsiChar; // protocol to use... if you have defined a
// protocol, u can use your own protocol name. SmileyAdd will
// automatically select the smileypack that is defined for your protocol.
- // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"
+ // Or, use "Standard" for standard smiley set. Or "ICQ"
// if you prefer those icons.
// If not found or NULL, "Standard" will be used
flags :uint; // Flags (SAFLRE_*) that define the behaivior
@@ -60,7 +60,7 @@ type
Protocolname : PAnsiChar; // protocol to use... if you have defined a protocol,
// you can use your own protocol name. Smiley add will automatically
// select the smileypack that is defined for your protocol.
- // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"
+ // Or, use "Standard" for standard smiley set. Or "ICQ"
// if you prefer those icons.
// If not found or NULL: "Standard" will be used
xPosition : int; // Postition to place the selectwindow
@@ -120,7 +120,7 @@ type
Protocolname:PAnsiChar; // protocol to use... if you have defined a protocol, u can
// use your own protocol name. Smiley add wil automatically
// select the smileypack that is defined for your protocol.
- // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"
+ // Or, use "Standard" for standard smiley set. Or "ICQ"
// if you prefer those icons.
// If not found or NULL: "Standard" will be used
str :TChar; // String to parse
diff --git a/plugins/ExternalAPI/m_smileyadd.h b/plugins/ExternalAPI/m_smileyadd.h
index f878cf8bf7..667ac2fea3 100644
--- a/plugins/ExternalAPI/m_smileyadd.h
+++ b/plugins/ExternalAPI/m_smileyadd.h
@@ -35,7 +35,7 @@ typedef struct
const char* Protocolname; //protocol to use... if you have defined a protocol, u can
//use your own protocol name. SmileyAdd will automatically
//select the smileypack that is defined for your protocol.
- //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"
+ //Or, use "Standard" for standard smiley set. Or "ICQ"
//if you prefer those icons.
//If not found or NULL, "Standard" will be used
unsigned flags; //Flags (SAFLRE_*) that define the behaivior
@@ -56,8 +56,8 @@ typedef struct
char* Protocolname; //protocol to use... if you have defined a protocol, you can
//use your own protocol name. Smiley add will automatically
//select the smileypack that is defined for your protocol.
- //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"
- //if you prefer those icons.
+ //Or, use "Standard" for standard smiley set. Or "ICQ"
+ //if you prefer those icons.
//If not found or NULL: "Standard" will be used
int xPosition; //Postition to place the selectwindow
int yPosition; // "
@@ -120,7 +120,7 @@ typedef struct
const char* Protocolname; //protocol to use... if you have defined a protocol, u can
//use your own protocol name. Smiley add wil automatically
//select the smileypack that is defined for your protocol.
- //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"
+ //Or, use "Standard" for standard smiley set. Or "ICQ"
//if you prefer those icons.
//If not found or NULL: "Standard" will be used
union {
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN Mac.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN Mac.ico
deleted file mode 100644
index 4be8abe317..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/MSN Mac.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v4.5-v5.x.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN v4.5-v5.x.ico
deleted file mode 100644
index 2f1bb589d4..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v4.5-v5.x.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v6.x.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN v6.x.ico
deleted file mode 100644
index d4829d9294..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v6.x.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v7.x.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN v7.x.ico
deleted file mode 100644
index 960f8d36eb..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v7.x.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v8.x.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN v8.x.ico
deleted file mode 100644
index bbe052ed65..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v8.x.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN.ico
deleted file mode 100644
index 959950e703..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/MSN.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/WLM10-11.ico b/plugins/FingerprintNG/iconpacks/res/MSN/WLM10-11.ico
deleted file mode 100644
index 5f6e68d9ad..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/WLM10-11.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/WLM9.ico b/plugins/FingerprintNG/iconpacks/res/MSN/WLM9.ico
deleted file mode 100644
index 0ccef8c3b1..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/WLM9.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/WebMessenger.ico b/plugins/FingerprintNG/iconpacks/res/MSN/WebMessenger.ico
deleted file mode 100644
index 94909a4ce0..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/WebMessenger.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/aMSN.ico b/plugins/FingerprintNG/iconpacks/res/MSN/aMSN.ico
deleted file mode 100644
index 7bb8276bc5..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/MSN/aMSN.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_msn.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_msn.ico
deleted file mode 100644
index 9e28bf4e9e..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_msn.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index a116ca8a91..a2337b0882 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -445,16 +445,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_AMSN ICON "MSN\\aMSN.ico"
-IDI_MSN_MAC ICON "MSN\\MSN Mac.ico"
-IDI_MSN_45 ICON "MSN\\MSN v4.5-v5.x.ico"
-IDI_MSN_6 ICON "MSN\\MSN v6.x.ico"
-IDI_MSN_7 ICON "MSN\\MSN v7.x.ico"
-IDI_MSN_8 ICON "MSN\\MSN v8.x.ico"
-IDI_MSN ICON "MSN\\MSN v8.x.ico"
-IDI_WEBMESSENGER ICON "MSN\\WebMessenger.ico"
-IDI_WLM_9 ICON "MSN\\wlm9.ico"
-IDI_WLM_10 ICON "MSN\\WLM10-11.ico"
IDI_GG ICON "GG\\Gadu-Gadu.ico"
IDI_GG8_OVERLAY ICON "GG\\overlay_GG_v8.ico"
IDI_GG9_OVERLAY ICON "GG\\overlay_GG_v9.ico"
@@ -491,7 +481,6 @@ IDI_ICQ_OVERLAY ICON "overlays\\overlay_proto_ICQ.ico
IDI_IRC_OVERLAY ICON "overlays\\overlay_proto_IRC.ico"
IDI_JABBER_OVERLAY ICON "overlays\\overlay_proto_Jabber.ico"
IDI_JGTALK_OVERLAY ICON "overlays\\overlay_proto_JGTalk.ico"
-IDI_MSN_OVERLAY ICON "overlays\\overlay_proto_MSN.ico"
IDI_VK_OVERLAY ICON "overlays\\overlay_proto_VK.ico"
IDI_SKYPE_OVERLAY ICON "overlays\\overlay_proto_skype.ico"
IDI_DEBUG_OVERLAY ICON "overlays\\overlay_resource_debug.ico"
diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc
index bf2519d7d5..172afacd70 100644
--- a/plugins/FingerprintNG/res/resource.rc
+++ b/plugins/FingerprintNG/res/resource.rc
@@ -82,7 +82,6 @@ BEGIN
CONTROL "ICQ clients",IDC_GROUP_ICQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,110,120,10
CONTROL "IRC clients",IDC_GROUP_IRC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,120,120,10
CONTROL "Jabber clients",IDC_GROUP_JABBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,130,120,10
- CONTROL "MSN clients",IDC_GROUP_MSN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10
CONTROL "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10
CONTROL "VKontakte clients",IDC_GROUP_VK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10
CONTROL "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index 685fafb1f2..19dbcf4fc9 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -38,11 +38,6 @@ case JABBER_CASE:
return LPGENW("Client icons") L"/" LPGENW("Jabber clients");
break;
-case MSN_CASE:
- if (g_plugin.getByte("GroupMSN", 1))
- return LPGENW("Client icons") L"/" LPGENW("MSN clients");
- break;
-
case RSS_CASE:
if (g_plugin.getByte("GroupRSS", 1))
return LPGENW("Client icons") L"/" LPGENW("RSS clients");
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 57830d60d1..7e4be9c495 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -475,21 +475,6 @@ KN_FP_MASK def_kn_fp_mask[] =
{ "client_IRCUnknown", L"*IRC*", L"Unknown IRC client", IDI_IRC, IRC_CASE, TRUE },
//#########################################################################################################################################################################
- //################################# MSN ###############################################################################################################################
- //#########################################################################################################################################################################
- { "client_WLM11", L"WLM*2011*", L"Windows Live 11", IDI_WLM_10, MSN_CASE, TRUE },
- { "client_WLM10", L"WLM*2010*", L"Windows Live 10", IDI_WLM_10, MSN_CASE, TRUE },
- { "client_WLM9", L"WLM*9*", L"Windows Live v9.x", IDI_WLM_9, MSN_CASE, TRUE },
- { "client_MSN8", L"|WLM*8.*|MSN*8.*", L"Windows Live v8.x", IDI_MSN_8, MSN_CASE, TRUE },
- { "client_MSN7x", L"MSN*7.*", L"MSN Messenger v7.x", IDI_MSN_7, MSN_CASE, TRUE },
- { "client_MSN6x", L"MSN*6.*", L"MSN Messenger v6.x", IDI_MSN_6, MSN_CASE, TRUE },
- { "client_MSN45", L"MSN*4.x-5.x", L"MSN Messenger v4.x-5.x", IDI_MSN_45, MSN_CASE, TRUE },
- { "client_MSN4Mac", L"MSN*Mac*", L"MSN for Mac", IDI_MSN_MAC, MSN_CASE, TRUE },
- { "client_aMSN", L"*aMSN*", L"aMSN", IDI_AMSN, MSN_CASE, TRUE },
- { "client_MSN_Web", L"WebMessenger*", L"WebMessenger", IDI_WEBMESSENGER, MSN_CASE, TRUE },
- { "client_MSN", L"|WLM*|MSN*|Windows Live*", L"MSN", IDI_MSN, MSN_CASE, TRUE },
-
- //#########################################################################################################################################################################
//################################# WEATHER ###########################################################################################################################
//#########################################################################################################################################################################
{ "client_accu", L"*accuweather*", L"AccuWeather", IDI_ACCU, WEATHER_CASE, TRUE },
@@ -628,7 +613,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
{ "client_JGmail_overlay", L"*JGmail*", LPGENW("JGmail overlay"), IDI_GMAIL_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_JGTalk_overlay", L"*JGTalk*", LPGENW("JGTalk overlay"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE },
{ "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_VK_overlay", L"|Miranda*VKontakte*", LPGENW("VK overlay"), IDI_VK_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_Skype_overlay", L"|Miranda*Skype*", LPGENW("Skype overlay"), IDI_SKYPE_OVERLAY, OVERLAYS_PROTO_CASE },
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index 9344497aa2..c1e5f780e7 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -37,7 +37,6 @@ static settings[] =
{ IDC_GROUP_ICQ, TRUE, "GroupICQ" },
{ IDC_GROUP_IRC, TRUE, "GroupIRC" },
{ IDC_GROUP_JABBER, TRUE, "GroupJabber" },
- { IDC_GROUP_MSN, TRUE, "GroupMSN" },
{ IDC_GROUP_RSS, TRUE, "GroupRSS" },
{ IDC_GROUP_WEATHER, TRUE, "GroupWeather" },
{ IDC_GROUP_FACEBOOK, TRUE, "GroupFacebook" },
@@ -57,7 +56,7 @@ static settings[] =
class COptDialog : public CDlgBase
{
CCtrlCheck m_chkMiranda, m_chkMirandaPacks, m_chkMirandaVer, m_chkOverRes, m_chkOverPlatf, m_chkOverProto, m_chkOverUnicode, m_chkOverSecur,
- m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkMSN, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto,
+ m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto,
m_chkOthers, m_chkStatusBar;
void LoadDBCheckState(int idCtrl, LPCSTR szSetting, BYTE bDef)
@@ -88,7 +87,6 @@ public:
m_chkICQ(this, IDC_GROUP_ICQ),
m_chkIRC(this, IDC_GROUP_IRC),
m_chkJabber(this, IDC_GROUP_JABBER),
- m_chkMSN(this, IDC_GROUP_MSN),
m_chkRSS(this, IDC_GROUP_RSS),
m_chkVK(this, IDC_GROUP_VK),
m_chkWeather(this, IDC_GROUP_WEATHER),
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index a709145cb9..95787aa7b5 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -59,7 +59,6 @@
#define IDI_IRC_OVERLAY 82
#define IDI_JABBER_OVERLAY 83
#define IDI_JGTALK_OVERLAY 84
-#define IDI_MSN_OVERLAY 86
#define IDI_VK_OVERLAY 90
#define IDI_SKYPE_OVERLAY 91
#define IDI_SECUREIM_OVERLAY 95
@@ -380,16 +379,6 @@
#define IDI_GG9_OVERLAY 726
#define IDI_GG10_OVERLAY 727
#define IDI_GG11_OVERLAY 728
-#define IDI_AMSN 741
-#define IDI_MSN_MAC 742
-#define IDI_MSN_45 743
-#define IDI_MSN_6 744
-#define IDI_MSN_7 745
-#define IDI_MSN_8 746
-#define IDI_MSN 747
-#define IDI_WEBMESSENGER 748
-#define IDI_WLM_9 749
-#define IDI_WLM_10 750
#define IDI_ATOM1 761
#define IDI_ATOM3 762
#define IDI_RSS09 763
@@ -523,7 +512,6 @@
#define IDC_GROUP_ICQ 10032
#define IDC_GROUP_IRC 10033
#define IDC_GROUP_JABBER 10034
-#define IDC_GROUP_MSN 10035
#define IDC_GROUP_RSS 10038
#define IDC_GROUP_WEATHER 10040
#define IDC_GROUP_FACEBOOK 10042
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index ae7d2dfdd4..a41b4c7a0a 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -82,7 +82,6 @@ struct FOUNDINFO
#define ICQ_CASE 3008 // ICQ clients
#define IRC_CASE 3009 // IRC clients
#define JABBER_CASE 3010 // Jabber clients
-#define MSN_CASE 3012 // MSN clients
#define RSS_CASE 3014 // RSS clients
#define WEATHER_CASE 3016 // Weather clients
#define FACEBOOK_CASE 3018 // Facebook clients
diff --git a/plugins/Nudge/res/NudgeMSN.ico b/plugins/Nudge/res/NudgeMSN.ico
deleted file mode 100644
index 3ebbdcf87f..0000000000
--- a/plugins/Nudge/res/NudgeMSN.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc
index 071d5b48f3..1d76fa5601 100644
--- a/plugins/Nudge/res/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -181,7 +181,6 @@ END
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_META ICON "NudgeMeta.ico"
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Nudge/src/resource.h b/plugins/Nudge/src/resource.h
index 34b0d091fd..fbca447b46 100644
--- a/plugins/Nudge/src/resource.h
+++ b/plugins/Nudge/src/resource.h
@@ -6,7 +6,6 @@
#define IDI_NUDGE 102
#define IDI_NUGDE_YAHOO 107
#define IDI_NUDGE_IRC 109
-#define IDI_NUDGE_MSN 110
#define IDI_NUDGE_META 113
#define IDD_SHAKEOPT 126
#define IDD_OPT_NUDGE 126
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 8a9850804e..37357ceed3 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -569,6 +569,7 @@ static renameTable[] =
{ L"metacontacts.dll", nullptr },
{ L"mra.dll", nullptr },
{ L"modernopt.dll", nullptr },
+ { L"msn.dll", nullptr },
{ L"msvcp100.dll", nullptr },
{ L"msvcr100.dll", nullptr },
{ L"mtextcontrol.dll", nullptr },
diff --git a/plugins/SmileyAdd/smileys/nova/MSN.msl b/plugins/SmileyAdd/smileys/nova/MSN.msl
deleted file mode 100644
index d9c440f742..0000000000
--- a/plugins/SmileyAdd/smileys/nova/MSN.msl
+++ /dev/null
Binary files differ
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp
index 2f8ab68b0a..3264a36e2d 100644
--- a/plugins/SmileyAdd/src/smileys.cpp
+++ b/plugins/SmileyAdd/src/smileys.cpp
@@ -822,8 +822,6 @@ void SmileyCategoryListType::AddAccountAsCategory(PROTOACCOUNT *acc, const CMStr
const char *packnam = acc->szProtoName;
if (mir_strcmp(packnam, "JABBER") == 0)
packnam = "JGMail";
- else if (strstr(packnam, "SIP") != nullptr)
- packnam = "MSN";
wchar_t path[MAX_PATH];
mir_snwprintf(path, L"%s\\Smileys\\nova\\%S.msl", g_plugin.wszDefaultPath, packnam);
@@ -844,8 +842,6 @@ void SmileyCategoryListType::AddProtoAsCategory(char *acc, const CMStringW &defa
const char *packnam = acc;
if (mir_strcmp(packnam, "JABBER") == 0)
packnam = "JGMail";
- else if (strstr(packnam, "SIP") != nullptr)
- packnam = "MSN";
// assemble default path
CMStringW paths(FORMAT, L"%s\\Smileys\\nova\\%S.msl", g_plugin.wszDefaultPath, packnam);
@@ -902,16 +898,12 @@ void SmileyCategoryListType::AddContactTransportAsCategory(MCONTACT hContact, co
_strlwr(trsp);
const char *packname = nullptr;
- if (strstr(trsp, "msn") != nullptr)
- packname = "msn";
- else if (strstr(trsp, "icq") != nullptr)
+ if (strstr(trsp, "icq") != nullptr)
packname = "icq";
else if (strstr(trsp, "yahoo") != nullptr)
packname = "yahoo";
else if (strstr(trsp, "aim") != nullptr)
packname = "aim";
- else if (strstr(trsp, "lcs") != nullptr)
- packname = "msn";
mir_free(trsp);
diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h
index c124a6df5b..f7978e52b1 100644
--- a/plugins/Variables/src/stdafx.h
+++ b/plugins/Variables/src/stdafx.h
@@ -112,7 +112,7 @@ This will not parse the given string, any function, field or special character i
This will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n\
--- Contacts ---\r\n\r\n\
Whenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n\
-(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n\
+(1) Using a unique ID (UIN for ICQ, JID for Jabber) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <JABBER:miranda@jabber.com> or <ICQ:123456789>.\r\n\r\n\
(2) Using the contact function:\r\n\
?contact(x,y)\r\n\
A contact will be searched which will have value x for its property y, y can be one of the following:\r\n\
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 16:14:33 +0000