diff options
| author | dartraiden <wowemuh@gmail.com> | 2017-12-22 02:32:41 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2017-12-22 02:32:41 +0300 |
| commit | af2d8955279a0373c79b45f740c27a99831d821d (patch) | |
| tree | 73c8a81c91c52854c97db7b72a3bfd0a10eb5536 | |
| parent | 83f747ed22629362d97dd01550dea04ef902235a (diff) | |
remove AIM support completely
39 files changed, 40 insertions, 243 deletions
@@ -6,7 +6,6 @@ fast. ## Protocol Support ##
-- AIM (AOL Instant Messenger)
- Discord
- Em-LAN
- Facebook
diff --git a/docs/mirandaboot.ini b/docs/mirandaboot.ini index f42e8ef5e3..bf45aa91ee 100644 --- a/docs/mirandaboot.ini +++ b/docs/mirandaboot.ini @@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList SkinSounds ;Unsafe
;A space-separated list of database module names that could be altered for
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System administrators may find it desirable to install settings without prompting
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 258883ff9d..cb81564614 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -706,7 +706,7 @@ [Transfer and virus scan complete]
;file \src\core\stdfile\src\ftmanager.cpp
[Outgoing]
-;file \src\core\stdidle\src\idle.cpp
+;file \src\core\stdidle\src\options.cpp
[Idle]
;file \src\core\stdmsg\src\chat_manager.cpp
[Chat module]
diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt index eeafaa842d..f80a6d08fa 100644 --- a/langpacks/english/Plugins/AssocMgr.txt +++ b/langpacks/english/Plugins/AssocMgr.txt @@ -5,7 +5,7 @@ ; Version: 0.2.1.0
; Authors: H. Herkenrath
;============================================================
-[Handles file type associations and URLs like aim, gg, mirpu, wpmsg, xmpp, ymsgr.]
+[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]
;file \plugins\AssocMgr\res\resource.rc
[Registered associations for Miranda NG:]
[Miscellaneous]
@@ -36,7 +36,6 @@ [Access failed:\n%.64hs(%.128s)\n%.250hs(%u)\n%.256hs (%u)]
[Registry warning]
;file \plugins\AssocMgr\src\test.cpp
-[AIM link protocol]
[ICQ link shortcut]
[&Add to contact list...]
[Yahoo link protocol]
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt index 32bdaaa3e7..0f5c87b4bf 100644 --- a/langpacks/english/Plugins/BasicHistory.txt +++ b/langpacks/english/Plugins/BasicHistory.txt @@ -40,7 +40,7 @@ [Only outgoing messages]
[Only selected group]
[All contacts]
-[Export to txt]
+[Export to text file]
[File encoding*]
[Export to plain HTML]
[Export to rich HTML]
diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt index 1f0cdf4185..09701fd25e 100644 --- a/langpacks/english/Plugins/Fingerprint.txt +++ b/langpacks/english/Plugins/Fingerprint.txt @@ -17,7 +17,6 @@ [Unicode overlay]
[Secure overlays]
[Select protocols]
-[AIM clients]
[Gadu-Gadu clients]
[ICQ clients]
[IRC clients]
@@ -63,7 +62,6 @@ [Client not found]
[Unknown client]
[Undetected client]
-[AIM overlay]
[ICQJ Plus Mod overlay]
[ICQJ overlay]
[IRC overlay]
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt index b625fe5723..dd31a4bb95 100644 --- a/langpacks/english/Plugins/Quotes.txt +++ b/langpacks/english/Plugins/Quotes.txt @@ -111,7 +111,7 @@ [Miranda could not load Quotes plugin. Microsoft HTML parser is missing.]
;file \plugins\Quotes\src\QuoteInfoDlg.cpp
;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
-[Error occurred during html parsing.]
+[Error occurred during HTML parsing.]
[Error occurred during site access.]
;file \plugins\Quotes\src\QuotesProviderVisitorFormatSpecificator.cpp
[Quote Symbol]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt index b205a5e32c..1f6d1cd4c6 100644 --- a/langpacks/english/Plugins/Tox.txt +++ b/langpacks/english/Plugins/Tox.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Tox.dll
; Plugin: Tox protocol
-; Version: 0.11.1.26
+; Version: 0.11.3.0
; Authors: Miranda NG Team
;============================================================
[Tox protocol support for Miranda NG.]
@@ -24,10 +24,14 @@ [Enable IPv6]
[Max connect retries:]
[Max reconnect retries:]
+[Enable UDP hole-punching]
+[Enable local network peer discovery]
+[Remove password]
+[Change password]
+[Set password]
[If this field contains Tox address (76 hex characters), you will be prompted to add it in your friend list. Otherwise, Miranda will search this query via Tox DNS discovery.]
[DNS name:]
[Enter password]
-[Save password]
[Cancel]
[Tox profile is encrypted. Enter the password to continue.]
[Add]
@@ -36,48 +40,25 @@ [IPv6 address (optional)]
[Port]
[Public key]
-[Multimedia]
-[Audio input device]
-[Audio output device]
-[Video input device]
-[Invite contacts to chat room]
-[&Invite]
-[&Cancel]
-[Call]
-[End]
-[Incoming call]
-[Answer]
-[Reject]
-[From:]
-[Date:]
-[&User menu]
-[User &details]
-[&History]
-[Outgoing call]
-[To:]
+[Old password:]
+[New password:]
+[Confirm password:]
;file \protocols\Tox\src\main.cpp
-[Current version of plugin is support Tox API version %i.%i.%i which is incompatible with %s]
-;file \protocols\Tox\src\tox_connection.cpp
-[Unable to initialize Tox core]
-;file \protocols\Tox\src\tox_events.cpp
[Profiles folder]
[Tox URI scheme]
-[Action]
+;file \protocols\Tox\src\tox_connection.cpp
+[Unable to initialize Tox core]
;file \protocols\Tox\src\tox_icons.cpp
[Protocol icon]
-[Audio call]
-[Audio ring]
-[Audio start]
-[Audio end]
[Protocols]
;file \protocols\Tox\src\tox_menus.cpp
[Request authorization]
[Grant authorization]
+[Password]
+[Create password]
;file \protocols\Tox\src\tox_messages.cpp
+[Action]
[You cannot send when you are offline.]
-;file \protocols\Tox\src\tox_multimedia.cpp
-[Incoming call from %s]
-[Outgoing call to %s]
;file \protocols\Tox\src\tox_netlib.cpp
[%s connection]
;file \protocols\Tox\src\tox_options.cpp
@@ -102,6 +83,10 @@ [Unable to open Tox profile]
[Unable to read Tox profile]
[Unable to decrypt Tox profile]
+[Removing the password will lead to decryption of the profile.\r\nAre you sure to remove password?]
+[New password is empty]
+[New password is not equal to confirmation]
+[Old password is not valid]
;file \protocols\Tox\src\tox_proto.cpp
[You cannot add yourself to your contact list]
[Contact already in your contact list]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index d6478f64f8..ce96b0c70b 100644 --- a/langpacks/english/Plugins/VKontakte.txt +++ b/langpacks/english/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.3.0
+; Version: 0.1.4.0
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -129,6 +129,7 @@ [Can't send messages for users from blacklist]
[Can't send messages for users without dialogs]
[Can't send messages to this user due to their privacy settings]
+[Message is too long]
[Enter the missing digits between %s and %s of the phone number linked to your account]
[Attention!]
[Enter confirmation code]
@@ -244,6 +245,8 @@ [Error loading message history for %s from server.]
[Loading messages for %s is completed.]
;file \protocols\VKontakte\src\vk_messages.cpp
+[Edited message:\n]
+[\nOriginal message:\n]
;file \protocols\VKontakte\src\vk_options.cpp
[Network]
[Account]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt index eda60b3db0..3b444d853a 100644 --- a/langpacks/english/Plugins/YAMN.txt +++ b/langpacks/english/Plugins/YAMN.txt @@ -11,7 +11,6 @@ [Version:]
[Description:]
[Copyright:]
-[E-mail:]
[Homepage:]
[Account]
[Name:]
diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp index 1175e20807..cce177b15f 100644 --- a/plugins/AssocMgr/src/test.cpp +++ b/plugins/AssocMgr/src/test.cpp @@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
/*
-#define AIM_SUPPORT_TEST
#define ICQ_SUPPORT_TEST
#define YAHOO_SUPPORT_TEST
#define MSN_SUPPORT_TEST
@@ -66,138 +65,6 @@ static int __inline AssocMgr_AddNewUrlType(const char *prefix, const char *desc, // -----------------------------------------
-#ifdef AIM_SUPPORT_TEST
-
-#define AIM_PROTOCOL_NAME "AIM"
-#define IDI_AOL 28
-#define MOD_KEY_CL "CList"
-#define AIM_KEY_NL "NotOnList"
-struct oscar_data { HINSTANCE hInstance; } static conn;
-static __inline HANDLE find_contact(const char *nick) { nick; return NULL; }
-static __inline HANDLE add_contact(const char *nick) { nick; return db_find_first(); }
-static __inline void aim_gchat_joinrequest(const char *room, int exchange) { room; exchange; MessageBoxA(NULL, "Join group chat!", room, MB_OK); return; }
-#include <m_protosvc.h>
-#include <m_message.h>
-
-#include "m_assocmgr.h"
-static HANDLE hHookModulesLoaded;
-static HANDLE hServiceParseLink;
-
-static int ServiceParseAimLink(WPARAM, LPARAM lParam)
-{
- char *arg = (char*)lParam;
- if (arg == NULL) return 1; /* sanity check */
- /* skip leading prefix */
- arg = strchr(arg, ':');
- if (arg == NULL) return 1; /* parse failed */
- for (++arg; *arg == '/'; ++arg);
- /*
- add user: aim:addbuddy?screenname=NICK&groupname=GROUP
- send message: aim:goim?screenname=NICK&message=MSG
- open chatroom: aim:gochat?roomname=ROOM&exchange=NUM
- */
- /* add a contact to the list */
- if (!_strnicmp(arg, "addbuddy?", 9)) {
- char *tok, *sn = NULL, *group = NULL;
- ADDCONTACTSTRUCT acs;
- PROTOSEARCHRESULT psr;
- if (*(arg += 9) == 0) return 1; /* parse failed */
- tok = strtok(arg, "&"); /* first token */
- while (tok != NULL) {
- if (!_strnicmp(tok, "screenname=", 11) && *(tok + 11) != 0)
- sn = Netlib_UrlDecode(tok + 11);
- if (!_strnicmp(tok, "groupname=", 10) && *(tok + 10) != 0)
- group = Netlib_UrlDecode(tok + 10); /* group is currently ignored */
- tok = strtok(NULL, "&"); /* next token */
- }
- if (sn == NULL) return 1; /* parse failed */
- if (find_contact(sn) == NULL) { /* does not yet check if sn is current user */
- acs.handleType = HANDLE_SEARCHRESULT;
- acs.szProto = AIM_PROTOCOL_NAME;
- acs.psr = &psr;
- memset(&psr, 0, sizeof(PROTOSEARCHRESULT));
- psr.cbSize = sizeof(PROTOSEARCHRESULT);
- psr.nick.w = sn;
- CallService(MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);
- }
- return 0;
- }
- /* send a message to a contact */
- else if (!_strnicmp(arg, "goim?", 5)) {
- char *tok, *sn = NULL, *msg = NULL;
- MCONTACT hContact;
- if (*(arg += 5) == 0) return 1; /* parse failed */
- tok = strtok(arg, "&"); /* first token */
- while (tok != NULL) {
- if (!_strnicmp(tok, "screenname=", 11) && *(tok + 11) != 0)
- sn = Netlib_UrlDecode(tok + 11);
- if (!_strnicmp(tok, "message=", 8) && *(tok + 8) != 0)
- msg = Netlib_UrlDecode(tok + 8);
- tok = strtok(NULL, "&"); /* next token */
- }
- if (sn == NULL) return 1; /* parse failed */
- if (ServiceExists(MS_MSG_SENDMESSAGE)) {
- hContact = find_contact(sn);
- if (hContact == NULL) {
- hContact = add_contact(sn); /* does not yet check if sn is current user */
- if (hContact != NULL)
- db_set_b(hContact, MOD_KEY_CL, AIM_KEY_NL, 1);
- }
- if (hContact != NULL)
- CallService(MS_MSG_SENDMESSAGE, hContact, (LPARAM)msg);
- }
- return 0;
- }
- /* open a chatroom */
- else if (!_strnicmp(arg, "gochat?", 7)) {
- char *tok, *rm = NULL;
- int exchange = 0;
- if (*(arg += 7) == 0) return 1; /* parse failed */
- tok = strtok(arg, "&"); /* first token */
- while (tok != NULL) {
- if (!_strnicmp(tok, "roomname=", 9) && *(tok + 9) != 0)
- rm = Netlib_UrlDecode(tok + 9);
- if (!_strnicmp(tok, "exchange=", 9))
- exchange = atoi(Netlib_UrlDecode(tok + 9));
- tok = strtok(NULL, "&"); /* next token */
- }
- if (rm == NULL || exchange <= 0) return 1; /* parse failed */
- aim_gchat_joinrequest(rm, exchange);
- return 0;
- }
- return 1; /* parse failed */
-}
-
-static int AimLinksModulesLoaded(WPARAM wParam, LPARAM lParam)
-{
- char service_name[MAXMODULELABELLENGTH];
- UNREFERENCED_PARAMETER(wParam);
- UNREFERENCED_PARAMETER(lParam);
- mir_snprintf(service_name, _countof(service_name), "%s%s", AIM_PROTOCOL_NAME, "ParseAimLink");
- /* or "AOL Instant Messenger Links" */
- AssocMgr_AddNewUrlType("aim:", Translate("AIM link protocol"), conn.hInstance, IDI_AOL, service_name, 0);
- return 0;
-}
-
-void aim_links_init()
-{
- char service_name[MAXMODULELABELLENGTH];
- //LOG(LOG_DEBUG,"Links: init");
- mir_snprintf(service_name, _countof(service_name), "%s%s", AIM_PROTOCOL_NAME, "ParseAimLink");
- hServiceParseLink = CreateServiceFunction(service_name, ServiceParseAimLink);
- hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, AimLinksModulesLoaded);
-}
-
-void aim_links_destroy()
-{
- //LOG(LOG_DEBUG,"Links: destroy");
- UnhookEvent(hHookModulesLoaded);
- DestroyServiceFunction(hServiceParseLink);
-}
-#endif
-
-// -----------------------------------------
-
#ifdef ICQ_SUPPORT_TEST
#define gpszICQProtoName "ICQ"
@@ -808,10 +675,6 @@ int JabberLinksUninit() void InitTest(void)
{
- #ifdef AIM_SUPPORT_TEST
- conn.hInstance = GetModuleHandleA("AIM");
- aim_links_init();
- #endif
#ifdef ICQ_SUPPORT_TEST
InitIcqFiles();
#endif
@@ -833,9 +696,6 @@ void InitTest(void) void UninitTest(void)
{
- #ifdef AIM_SUPPORT_TEST
- aim_links_destroy();
- #endif
#ifdef ICQ_SUPPORT_TEST
UninitIcqFiles();
#endif
diff --git a/plugins/AssocMgr/src/version.h b/plugins/AssocMgr/src/version.h index 2eb5508668..34cd557e93 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, wpmsg, xmpp, ymsgr."
+#define __DESCRIPTION "Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr."
#define __AUTHOR "H. Herkenrath"
#define __AUTHORWEB "https://miranda-ng.org/p/AssocMgr/"
#define __COPYRIGHT "© 2005-2007 H. Herkenrath"
diff --git a/plugins/FingerprintNG/iconpacks/res/AIM/AIM_6.x.ico b/plugins/FingerprintNG/iconpacks/res/AIM/AIM_6.x.ico Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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
diff --git a/plugins/Scriver/src/cmdlist.h b/plugins/Scriver/src/cmdlist.h index 9f2b89bb91..5495f5f103 100644 --- a/plugins/Scriver/src/cmdlist.h +++ b/plugins/Scriver/src/cmdlist.h @@ -1,6 +1,4 @@ /*
-AOL Instant Messenger Plugin for Miranda IM
-
Copyright (c) 2003 Robert Rainwater
This program is free software; you can redistribute it and/or
diff --git a/plugins/SmileyAdd/smileys/nova/AIM.msl b/plugins/SmileyAdd/smileys/nova/AIM.msl Binary files differdeleted file mode 100644 index f19834ee24..0000000000 --- a/plugins/SmileyAdd/smileys/nova/AIM.msl +++ /dev/null diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp index dac3cc202f..6600a853a0 100644 --- a/src/mir_app/src/db_ini.cpp +++ b/src/mir_app/src/db_ini.cpp @@ -516,7 +516,7 @@ static void DoAutoExec(void) if (!mir_wstrcmpi(szUse, L"no")) return;
GetPrivateProfileString(L"AutoExec", L"Safe", L"CLC Icons CLUI CList SkinSounds", buf, _countof(buf), mirandabootini);
ptrA szSafeSections(mir_u2a(buf));
- GetPrivateProfileString(L"AutoExec", L"Unsafe", L"AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte", buf, _countof(buf), mirandabootini);
+ GetPrivateProfileString(L"AutoExec", L"Unsafe", L"Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte", buf, _countof(buf), mirandabootini);
ptrA szUnsafeSections(mir_u2a(buf));
GetPrivateProfileString(L"AutoExec", L"Warn", L"notsafe", szSecurity, _countof(szSecurity), mirandabootini);
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt index 2d614c7e92..db0845e745 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt @@ -205,7 +205,6 @@ Scripts\winapi.dll Icons\flags_icons.dll Icons\fp_icons.dll Icons\historypp_icons.dll -Icons\proto_aim.dll Icons\proto_discord.dll Icons\proto_dummy.dll Icons\proto_facebook.dll diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt index 8b2decb06d..195eff681f 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt @@ -203,7 +203,6 @@ Scripts\winapi.dll Icons\flags_icons.dll Icons\fp_icons.dll Icons\historypp_icons.dll -Icons\proto_aim.dll Icons\proto_discord.dll Icons\proto_dummy.dll Icons\proto_facebook.dll diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini index 15ec526273..f569997e66 100644 --- a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini +++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini @@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar ;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System admins may find it desirable to install settings without prompting
diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini index e0497130f8..1868a973b0 100644 --- a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini +++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini @@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar ;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System admins may find it desirable to install settings without prompting
diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini index 15ec526273..f569997e66 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini @@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar ;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System admins may find it desirable to install settings without prompting
diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini index e0497130f8..1868a973b0 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini @@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar ;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+;Default: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System admins may find it desirable to install settings without prompting
diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js index 2dbe58325c..4c3134f03f 100644 --- a/tools/lpgen/lpgen.js +++ b/tools/lpgen/lpgen.js @@ -487,7 +487,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]|AOL|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|S.ms|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|MSN|NickServ|OSD|OTR|PCS|PGP|S.ms|SMS|SSL|Steam|Steam Guard|Tox|Twitter|Yahoo|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;
@@ -546,7 +546,7 @@ function ParseSourceFile(FileTextVar, array) { //filter _T() function results
function filter_T(string) {
//filter for exact matched strings
- var filter1 = /^(&?[Oo][Kk]|AOL|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|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|MSN|NickServ|OSD|OTR|PCS|PGP|SMS|SSL|SteamID|Steam Guard|Tox|Twitter|Yahoo|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
|