remove AIM support completely

17 files changed, 0 insertions, 42 deletions

diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_6.x.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_6.x.ico
deleted file mode 100644
index 7676f25d65..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_6.x.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_7.x.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_7.x.ico
deleted file mode 100644
index 4e8ccf5377..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_7.x.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mac.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mac.ico
deleted file mode 100644
index 7f69db2598..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mac.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mobile.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mobile.ico
deleted file mode 100644
index 00bd08b486..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Mobile.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Triton.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Triton.ico
deleted file mode 100644
index a211a49df0..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_Triton.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/TerraIM.ico b/plugins/FingerprintNG/iconpacks/res/AIM/TerraIM.ico
deleted file mode 100644
index ce9b610cc7..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/AIM/TerraIM.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/miniaim.ico b/plugins/FingerprintNG/iconpacks/res/AIM/miniaim.ico
deleted file mode 100644
index 8268b726ff..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/AIM/miniaim.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/naim.ico b/plugins/FingerprintNG/iconpacks/res/AIM/naim.ico
deleted file mode 100644
index 0a8d916cfe..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/AIM/naim.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Jabber/PyAIMt.ico b/plugins/FingerprintNG/iconpacks/res/Jabber/PyAIMt.ico
deleted file mode 100644
index e5e4db6c9a..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Jabber/PyAIMt.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_AIM.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_AIM.ico
deleted file mode 100644
index e1b38aab85..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_AIM.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index 498d408065..0ce62fdc09 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -395,14 +395,6 @@ IDI_ICQ5_OVERLAY        ICON                    "ICQ\\overlay_ICQ_v5.ico"
 IDI_ICQ6_OVERLAY        ICON                    "ICQ\\overlay_ICQ_v6.ico"

 IDI_ICQ7_OVERLAY        ICON                    "ICQ\\overlay_ICQ_v7.ico"

 IDI_ICQ8_OVERLAY        ICON                    "ICQ\\overlay_ICQ_v8.ico"

-IDI_AIM_6               ICON                    "AIM\\AIM_6.x.ico"

-IDI_AIM_7               ICON                    "AIM\\AIM_7.x.ico"

-IDI_AIM_MAC             ICON                    "AIM\\AIM_Mac.ico"

-IDI_AIM_MOBILE          ICON                    "AIM\\AIM_Mobile.ico"

-IDI_AIM_TRITON          ICON                    "AIM\\AIM_Triton.ico"

-IDI_MINIAIM             ICON                    "AIM\\miniaim.ico"

-IDI_NAIM                ICON                    "AIM\\naim.ico"

-IDI_TERRAIM             ICON                    "AIM\\TerraIM.ico"

 IDI_AMIRC               ICON                    "IRC\\AmIRC.ico"

 IDI_AMULE               ICON                    "IRC\\aMule.ico"

 IDI_BABBEL              ICON                    "IRC\\Babbel.ico"

@@ -543,7 +535,6 @@ IDI_TWITTER             ICON                    "others\\Twitter.ico"
 IDI_HANGOUTS            ICON                    "others\\Google+ Hangouts.ico"

 IDI_WHATSAPP            ICON                    "others\\WhatsApp.ico"

 IDI_STEAM               ICON                    "others\\Steam.ico"

-IDI_AIM_OVERLAY         ICON                    "overlays\\overlay_proto_AIM.ico"

 IDI_GMAIL_OVERLAY       ICON                    "overlays\\overlay_proto_Gmail.ico"

 IDI_ICQJ_OVERLAY        ICON                    "overlays\\overlay_proto_ICQJ.ico"

 IDI_ICQJ_PLUS_OVERLAY   ICON                    "overlays\\overlay_proto_ICQJ_Plus.ico"

diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc
index 0187107716..59ab77eed4 100644
--- a/plugins/FingerprintNG/res/resource.rc
+++ b/plugins/FingerprintNG/res/resource.rc
@@ -78,7 +78,6 @@ BEGIN
     CONTROL         "Unicode overlay",IDC_GROUP_OVERLAYS_UNICODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,60,120,10

     CONTROL         "Secure overlays",IDC_GROUP_OVERLAYS_SECURITY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,50,140,10

     GROUPBOX        "Select protocols",IDC_STATIC,15,75,290,140

-    CONTROL         "AIM clients",IDC_GROUP_AIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,90,120,10

     CONTROL         "Gadu-Gadu clients",IDC_GROUP_GG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,100,120,10

     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

diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index d0ac9b3b30..10e6bff723 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -18,11 +18,6 @@ case MULTI_CASE:
 		return LPGENW("Client icons") L"/" LPGENW("Multi-proto clients");

 	break;

 

-case AIM_CASE:

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

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

-	break;

-

 case GG_CASE:

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

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

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 52cc5cb5ae..d2a49fca73 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -487,20 +487,6 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{ "client_IRCUnknown", L"*IRC*", L"Unknown IRC client", IDI_IRC, IRC_CASE, TRUE },

 

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

-	//#################################   AIM   ###############################################################################################################################

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

-	{ "client_Aim7", L"AIM*7.*", L"AIM v7.x", IDI_AIM_7, AIM_CASE, TRUE },

-	{ "client_Aim6", L"AIM*6.*", L"AIM v6.x", IDI_AIM_6, AIM_CASE, TRUE },

-

-	{ "client_AIM_Triton", L"*AIM*Triton*", L"AIM Triton", IDI_AIM_TRITON, AIM_CASE, TRUE },

-	{ "client_AimMac", L"AIM*Mac*", L"AIM for MacOS", IDI_AIM_MAC, AIM_CASE, TRUE },

-	{ "client_AimMobile", L"|AIM*Mobile*|AIM*gprs*|Aim*sms*", L"AIM Mobile", IDI_AIM_MOBILE, AIM_CASE, TRUE },

-	{ "client_Naim", L"*naim*", L"Naim", IDI_NAIM, AIM_CASE, TRUE },

-	{ "client_miniaim", L"*miniaim*", L"miniaim", IDI_MINIAIM, AIM_CASE, TRUE },

-	{ "client_TerraIM", L"*Terra*", L"TerraIM", IDI_TERRAIM, AIM_CASE, TRUE },

-	{ "client_AIM", L"AIM*", L"AIM", IDI_AIM_7, AIM_CASE, TRUE },

-

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

 	//#################################   MSN   ###############################################################################################################################

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

 	{ "client_WLM11", L"WLM*2011*", L"Windows Live 11", IDI_WLM_10, MSN_CASE, TRUE },

@@ -679,7 +665,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	//#########################################################################################################################################################################

 	//#################################   PROTO OVERLAYS   ####################################################################################################################

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

-	{ "client_AIM_overlay", L"|^AIM*|*AIM*", LPGENW("AIM overlay"), IDI_AIM_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_ICQJ_Plus_over", L"*ICQ*Plus*", LPGENW("ICQJ Plus Mod overlay"), IDI_ICQJ_PLUS_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_ICQJ_overlay", L"|^ICQ|^ICQ*|*ICQ*|MRA client", LPGENW("ICQJ overlay"), IDI_ICQJ_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_IRC_overlay", L"|^IRC*|Miranda*IRC*", LPGENW("IRC overlay"), IDI_IRC_OVERLAY, OVERLAYS_PROTO_CASE },

diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index 5ec7b7a793..e6f262d8f2 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -33,7 +33,6 @@ static settings[] =
 	{ IDC_GROUP_MIRANDA_PACKS, TRUE, "GroupMirandaPacks" },

 

 	{ IDC_GROUP_MULTI, TRUE, "GroupMulti" },

-	{ IDC_GROUP_AIM, TRUE, "GroupAIM" },

 	{ IDC_GROUP_GG, TRUE, "GroupGG" },

 	{ IDC_GROUP_ICQ, TRUE, "GroupICQ" },

 	{ IDC_GROUP_IRC, TRUE, "GroupIRC" },

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index 8420af7194..df9580af53 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -54,7 +54,6 @@
 #define IDI_UNICODE_CLIENT              75

 #define IDI_PLATFORM_X32                76

 #define IDI_PLATFORM_X64                77

-#define IDI_AIM_OVERLAY                 78

 #define IDI_GMAIL_OVERLAY               79

 #define IDI_ICQJ_OVERLAY                80

 #define IDI_ICQJ_PLUS_OVERLAY           81

@@ -399,14 +398,6 @@
 #define IDI_MAIL_RU_OFFICIAL            702

 #define IDI_MAIL_RU_UNKNOWN             703

 #define IDI_MAIL_RU_WEBAGENT            704

-#define IDI_AIM_6                       714

-#define IDI_AIM_7                       715

-#define IDI_AIM_MAC                     716

-#define IDI_AIM_MOBILE                  717

-#define IDI_AIM_TRITON                  718

-#define IDI_MINIAIM                     719

-#define IDI_NAIM                        720

-#define IDI_TERRAIM                     721

 #define IDI_GG                          724

 #define IDI_GG8_OVERLAY                 725

 #define IDI_GG9_OVERLAY                 726

@@ -585,7 +576,6 @@
 #define IDC_GROUP_MIRANDA_VERSION       10026

 #define IDC_GROUP_MIRANDA_PACKS         10027

 #define IDC_GROUP_MULTI                 10028

-#define IDC_GROUP_AIM                   10029

 #define IDC_GROUP_GG                    10030

 #define IDC_GROUP_ICQ                   10032

 #define IDC_GROUP_IRC                   10033

diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index a44ede6da4..08f0b72fa7 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -74,7 +74,6 @@ typedef struct _foundInfo
 #define MIRANDA_PACKS_CASE			3003	//	Miranda packs overlays

 

 #define MULTI_CASE					3004	//	multi-protocol clients

-#define AIM_CASE					3005	//	AIM clients

 #define GG_CASE						3006	//	Gadu-Gadu clients

 #define ICQ_CASE					3008	//	ICQ clients

 #define IRC_CASE					3009	//	IRC clients