From 40ea120ddb5ab1ccedd8df0df8d21fa98e036cb8 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Tue, 27 Nov 2018 23:29:00 +0300 Subject: Remove some MRA-related code --- README.md | 1 - langpacks/russian/Untranslated/MRA.txt | 1 - protocols/CMakeLists.txt | 1 - src/mir_app/src/db_ini.cpp | 2 +- tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini | 4 ++-- tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini | 4 ++-- .../installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini | 4 ++-- .../Common/Files/Settings/mirandaboot_portable.ini | 4 ++-- 8 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 langpacks/russian/Untranslated/MRA.txt diff --git a/README.md b/README.md index 4de8ef0b20..73d8fe08c0 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ fast. - IRC (Internet Relay Chat) - Jabber - MinecraftDynmap -- MRA - MSN - Omegle - Sametime diff --git a/langpacks/russian/Untranslated/MRA.txt b/langpacks/russian/Untranslated/MRA.txt deleted file mode 100644 index 556fc296e2..0000000000 --- a/langpacks/russian/Untranslated/MRA.txt +++ /dev/null @@ -1 +0,0 @@ -[Inviter] diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index 91d9fc272c..e19a912a23 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt @@ -8,7 +8,6 @@ add_subdirectory(IcqOscarJ) add_subdirectory(IRCG) add_subdirectory(JabberG) #add_subdirectory(MinecraftDynmap) -#add_subdirectory(MRA) add_subdirectory(MSN) #add_subdirectory(Omegle) #add_subdirectory(Sametime) diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp index a03aabc333..7f2408a63e 100644 --- a/src/mir_app/src/db_ini.cpp +++ b/src/mir_app/src/db_ini.cpp @@ -501,7 +501,7 @@ static void DoAutoExec(void) Profile_GetSetting(L"AutoExec/Safe", buf, L"CLC Icons CLUI CList SkinSounds"); ptrA szSafeSections(mir_u2a(buf)); - Profile_GetSetting(L"AutoExec/Unsafe", buf, L"Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte"); + Profile_GetSetting(L"AutoExec/Unsafe", buf, L"Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte"); ptrA szUnsafeSections(mir_u2a(buf)); Profile_GetSetting(L"AutoExec/Warn", szSecurity, L"notsafe"); diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini index 9ccc56185b..f882174693 100644 --- a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini +++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini @@ -74,8 +74,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: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte -Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte +;Default: Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte +Unsafe=Facebook GG ICQ IRC JABBER 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 70e5e7a2f8..783deba013 100644 --- a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini +++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini @@ -74,8 +74,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: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte -Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte +;Default: Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte +Unsafe=Facebook GG ICQ IRC JABBER 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 9ccc56185b..f882174693 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini @@ -74,8 +74,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: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte -Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte +;Default: Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte +Unsafe=Facebook GG ICQ IRC JABBER 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 70e5e7a2f8..783deba013 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini @@ -74,8 +74,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: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte -Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte +;Default: Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte +Unsafe=Facebook GG ICQ IRC JABBER MSN SKYPE TWITTER VKontakte ;OverrideSecurityFilename ;System admins may find it desirable to install settings without prompting -- cgit v1.2.3