diff options
46 files changed, 14 insertions, 440 deletions
@@ -14,7 +14,6 @@ It's very light on system resources and extremely fast. - XMPP (Jabber)
- MinecraftDynmap
- Sametime
-- Skype
- Steam
- Telegram
- Tox
diff --git a/docs/mirandaboot.ini b/docs/mirandaboot.ini index eda96074a0..8ddc5b5426 100644 --- a/docs/mirandaboot.ini +++ b/docs/mirandaboot.ini @@ -74,8 +74,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: Facebook GG IRC JABBER SKYPE TWITTER VKontakte
-Unsafe=Facebook GG IRC JABBER SKYPE TWITTER VKontakte
+;Default: Facebook GG IRC JABBER TWITTER VKontakte
+Unsafe=Facebook GG IRC JABBER TWITTER VKontakte
;OverrideSecurityFilename
;System administrators may find it desirable to install settings without prompting
diff --git a/langpacks/belarusian/Plugins/SkypeStatusChange.txt b/langpacks/belarusian/Deprecated/SkypeStatusChange.txt index 42b14243f1..42b14243f1 100644 --- a/langpacks/belarusian/Plugins/SkypeStatusChange.txt +++ b/langpacks/belarusian/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/belarusian/Plugins/SkypeWeb.txt b/langpacks/belarusian/Deprecated/SkypeWeb.txt index 1c8e3d4e8b..1c8e3d4e8b 100644 --- a/langpacks/belarusian/Plugins/SkypeWeb.txt +++ b/langpacks/belarusian/Deprecated/SkypeWeb.txt diff --git a/langpacks/belarusian/Untranslated/SkypeWeb.txt b/langpacks/belarusian/Untranslated/SkypeWeb.txt deleted file mode 100644 index b73ece0753..0000000000 --- a/langpacks/belarusian/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1,31 +0,0 @@ -[Skypename:]
-[Enter new nickname]
-[Change nick...]
-[Incoming call]
-[Moji]
-[SkypeWeb error: Invalid data!]
-[Call]
-[Call missed]
-[Call ended (%s)]
-[Full image]
-[Unknown event, please send this text for developer: "%s"]
-[Create new chat icon]
-[Block user icon]
-[Unblock user icon]
-[Incoming call icon]
-[Notification icon]
-[Error icon]
-[Action icon]
-[Set own mood]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Celebrating]
-[At the gym]
-[Working from home]
-[Calls]
-[Incoming call canceled]
-[Skypename]
diff --git a/langpacks/bulgarian/Plugins/SkypeStatusChange.txt b/langpacks/bulgarian/Deprecated/SkypeStatusChange.txt index 4f991589d5..4f991589d5 100644 --- a/langpacks/bulgarian/Plugins/SkypeStatusChange.txt +++ b/langpacks/bulgarian/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/bulgarian/Plugins/SkypeWeb.txt b/langpacks/bulgarian/Deprecated/SkypeWeb.txt index 4e4c8064ea..4e4c8064ea 100644 --- a/langpacks/bulgarian/Plugins/SkypeWeb.txt +++ b/langpacks/bulgarian/Deprecated/SkypeWeb.txt diff --git a/langpacks/bulgarian/Untranslated/SkypeStatusChange.txt b/langpacks/bulgarian/Untranslated/SkypeStatusChange.txt deleted file mode 100644 index bf71673ee7..0000000000 --- a/langpacks/bulgarian/Untranslated/SkypeStatusChange.txt +++ /dev/null @@ -1,5 +0,0 @@ -[Skype status change according to Miranda status.]
-[Synchronize status message]
-[&Check any protocol or any status to exclude it from synchronization:]
-[Synchronize if current status differs from previous one]
-[Change Skype status]
diff --git a/langpacks/bulgarian/Untranslated/SkypeWeb.txt b/langpacks/bulgarian/Untranslated/SkypeWeb.txt deleted file mode 100644 index e99aa50446..0000000000 --- a/langpacks/bulgarian/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1,50 +0,0 @@ -[Skype protocol support for Miranda NG. Based on new Skype for Web.]
-[Create group chat]
-[Mark users you want to invite to a new chat]
-[Invite user to chat]
-[Choose one of your contacts to be invited:]
-[Skypename:]
-[Automatic messages synchronization]
-[Use BBCode]
-[Use hostname]
-[Enter new nickname]
-[This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]
-[&Change topic...]
-[Kick &user]
-[Change nick...]
-[Enter new chatroom topic]
-[Call information]
-[File transfer information]
-[Moji]
-[SkypeWeb error: Invalid data!]
-[Call missed]
-[Call ended (%s)]
-[Full image]
-[Unknown event, please send this text for developer: "%s"]
-[Create new chat icon]
-[Block user icon]
-[Unblock user icon]
-[Incoming call icon]
-[Notification icon]
-[Error icon]
-[Action icon]
-[Authentication failed. Invalid username.]
-[Authentication failed. Bad username or password.]
-[Too many failed authentication attempts with given username or IP.]
-[Authentication failed. Unknown error.]
-[Unblock contact]
-[Set own mood]
-[Unknown error!]
-[Network error!]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Celebrating]
-[At the gym]
-[Working from home]
-[Calls]
-[Incoming call canceled]
-[Skypename]
diff --git a/langpacks/czech/Plugins/SkypeStatusChange.txt b/langpacks/czech/Deprecated/SkypeStatusChange.txt index 329bae41bb..329bae41bb 100644 --- a/langpacks/czech/Plugins/SkypeStatusChange.txt +++ b/langpacks/czech/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/czech/Plugins/SkypeWeb.txt b/langpacks/czech/Deprecated/SkypeWeb.txt index 070f2096bb..070f2096bb 100644 --- a/langpacks/czech/Plugins/SkypeWeb.txt +++ b/langpacks/czech/Deprecated/SkypeWeb.txt diff --git a/langpacks/czech/Untranslated/SkypeWeb.txt b/langpacks/czech/Untranslated/SkypeWeb.txt deleted file mode 100644 index 289b26eb96..0000000000 --- a/langpacks/czech/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1,12 +0,0 @@ -[Full image]
-[Set own mood]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Celebrating]
-[At the gym]
-[Working from home]
-[Incoming call canceled]
diff --git a/langpacks/english/Plugins/SkypeStatusChange.txt b/langpacks/english/Plugins/SkypeStatusChange.txt deleted file mode 100644 index 34818f07e2..0000000000 --- a/langpacks/english/Plugins/SkypeStatusChange.txt +++ /dev/null @@ -1,15 +0,0 @@ -#muuid {2925520b-6677-4658-8bad-5661d13e4692}
-;============================================================
-; File: SkypeStatusChange.dll
-; Plugin: Skype status change
-; Version: 0.0.0.18
-; Authors: Dioksin
-;============================================================
-[Skype status change according to Miranda status.]
-;file \plugins\SkypeStatusChange\res\SkypeStatusChange.rc
-[Synchronize status message]
-[&Check any protocol or any status to exclude it from synchronization:]
-[Synchronize if current status differs from previous one]
-;file \plugins\SkypeStatusChange\src\options.cpp
-[Change Skype status]
-[Plugins]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt deleted file mode 100644 index a365023af0..0000000000 --- a/langpacks/english/Plugins/SkypeWeb.txt +++ /dev/null @@ -1,110 +0,0 @@ -#muuid {57e90ac6-1067-423b-8ca3-70a39d200d4f}
-;============================================================
-; File: SkypeWeb.dll
-; Plugin: Skype protocol (Web)
-; Version: 0.96.6.1
-; Authors: Miranda NG team
-;============================================================
-[Skype protocol support for Miranda NG. Based on new Skype for Web.]
-;file \protocols\SkypeWeb\res\resource.rc
-[Create group chat]
-[Cancel]
-[Mark users you want to invite to a new chat]
-[Invite user to chat]
-[Choose one of your contacts to be invited:]
-[Skypename:]
-[Password:]
-[Default group:]
-[Account]
-[Others]
-[Automatic messages synchronization]
-[Use BBCode]
-[Place:]
-[Use hostname]
-[Change password]
-[Set mood]
-[Mood]
-[Text]
-;file \protocols\SkypeWeb\src\main.cpp
-[Skype Link Protocol]
-;file \protocols\SkypeWeb\src\skype_chatrooms.cpp
-[Admin]
-[User]
-[Enter new nickname]
-[This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]
-[Warning]
-[&Invite user...]
-[&Leave chat session]
-[&Change topic...]
-[Kick &user]
-[Set &role]
-[&Admin]
-[&User]
-[Change nick...]
-[Enter new chatroom topic]
-;file \protocols\SkypeWeb\src\skype_contacts.cpp
-[(You)]
-[Are you sure?]
-;file \protocols\SkypeWeb\src\skype_db.cpp
-[Incoming call]
-[Action]
-[Call information]
-[File transfer information]
-[Moji]
-[Unknown event]
-;file \protocols\SkypeWeb\src\skype_events.cpp
-[SkypeWeb error: Invalid data!]
-[Call]
-[Call missed]
-[Call ended (%s)]
-[File transfer:\n\tFile name: %s \n\tSize: %lld bytes \n]
-[Preview]
-[Full image]
-[Unknown event, please send this text for developer: "%s"]
-;file \protocols\SkypeWeb\src\skype_icons.cpp
-[Protocol icon]
-[Create new chat icon]
-[Block user icon]
-[Unblock user icon]
-[Incoming call icon]
-[Notification icon]
-[Error icon]
-[Action icon]
-[Protocols]
-;file \protocols\SkypeWeb\src\skype_login.cpp
-[Authentication failed. Invalid username.]
-[Authentication failed. Bad username or password.]
-[Too many failed authentication attempts with given username or IP.]
-[Authentication failed. Unknown error.]
-;file \protocols\SkypeWeb\src\skype_menus.cpp
-[Block contact]
-[Unblock contact]
-[Create new chat]
-[Set own mood]
-;file \protocols\SkypeWeb\src\skype_messages.cpp
-[Unknown error!]
-[Network error!]
-;file \protocols\SkypeWeb\src\skype_mood.cpp
-[None]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Traveling]
-[Celebrating]
-[Driving]
-[At the gym]
-[Working from home]
-;file \protocols\SkypeWeb\src\skype_options.cpp
-[Network]
-;file \protocols\SkypeWeb\src\skype_popups.cpp
-[Notifications]
-[Errors]
-[Calls]
-;file \protocols\SkypeWeb\src\skype_proto.cpp
-[Incoming call canceled]
-[Skypename]
-;file \protocols\SkypeWeb\src\skype_utils.cpp
-[wrote]
diff --git a/langpacks/english_gb/Plugins/SkypeStatusChange.txt b/langpacks/english_gb/Plugins/SkypeStatusChange.txt deleted file mode 100644 index c1b76e950b..0000000000 --- a/langpacks/english_gb/Plugins/SkypeStatusChange.txt +++ /dev/null @@ -1,13 +0,0 @@ -#muuid {2925520b-6677-4658-8bad-5661d13e4692}
-;============================================================
-; File: SkypeStatusChange.dll
-; Plugin: Skype status change
-; Version: 0.0.0.18
-; Authors: Dioksin
-;============================================================
-[Synchronize status message]
-Synchronise status message
-[&Check any protocol or any status to exclude it from synchronization:]
-&Check any protocol or any status to exclude it from synchronisation:
-[Synchronize if current status differs from previous one]
-Synchronise if current status differs from previous one
diff --git a/langpacks/english_gb/Plugins/SkypeWeb.txt b/langpacks/english_gb/Plugins/SkypeWeb.txt deleted file mode 100644 index f9c8f223e3..0000000000 --- a/langpacks/english_gb/Plugins/SkypeWeb.txt +++ /dev/null @@ -1,11 +0,0 @@ -#muuid {57e90ac6-1067-423b-8ca3-70a39d200d4f}
-;============================================================
-; File: SkypeWeb.dll
-; Plugin: Skype protocol (Web)
-; Version: 0.96.6.1
-; Authors: Miranda NG team
-;============================================================
-[Automatic messages synchronization]
-Automatic messages synchronisation
-[Traveling]
-Travelling
diff --git a/langpacks/french/Plugins/SkypeStatusChange.txt b/langpacks/french/Deprecated/SkypeStatusChange.txt index 00d51bbdf7..00d51bbdf7 100644 --- a/langpacks/french/Plugins/SkypeStatusChange.txt +++ b/langpacks/french/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/french/Plugins/SkypeWeb.txt b/langpacks/french/Deprecated/SkypeWeb.txt index 41495452e2..41495452e2 100644 --- a/langpacks/french/Plugins/SkypeWeb.txt +++ b/langpacks/french/Deprecated/SkypeWeb.txt diff --git a/langpacks/french/Untranslated/SkypeStatusChange.txt b/langpacks/french/Untranslated/SkypeStatusChange.txt deleted file mode 100644 index bf71673ee7..0000000000 --- a/langpacks/french/Untranslated/SkypeStatusChange.txt +++ /dev/null @@ -1,5 +0,0 @@ -[Skype status change according to Miranda status.]
-[Synchronize status message]
-[&Check any protocol or any status to exclude it from synchronization:]
-[Synchronize if current status differs from previous one]
-[Change Skype status]
diff --git a/langpacks/french/Untranslated/SkypeWeb.txt b/langpacks/french/Untranslated/SkypeWeb.txt deleted file mode 100644 index 86e29a5897..0000000000 --- a/langpacks/french/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1,66 +0,0 @@ -[Skype protocol support for Miranda NG. Based on new Skype for Web.]
-[Create group chat]
-[Mark users you want to invite to a new chat]
-[Invite user to chat]
-[Choose one of your contacts to be invited:]
-[Skypename:]
-[Automatic messages synchronization]
-[Use BBCode]
-[Place:]
-[Use hostname]
-[Set mood]
-[Mood]
-[Admin]
-[Enter new nickname]
-[This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]
-[&Leave chat session]
-[&Change topic...]
-[Kick &user]
-[Set &role]
-[&Admin]
-[Change nick...]
-[Enter new chatroom topic]
-[Incoming call]
-[Action]
-[Call information]
-[File transfer information]
-[Moji]
-[SkypeWeb error: Invalid data!]
-[Call]
-[Call missed]
-[Call ended (%s)]
-[File transfer:\n\tFile name: %s \n\tSize: %lld bytes \n]
-[Full image]
-[Unknown event, please send this text for developer: "%s"]
-[Protocol icon]
-[Create new chat icon]
-[Block user icon]
-[Unblock user icon]
-[Incoming call icon]
-[Notification icon]
-[Error icon]
-[Action icon]
-[Authentication failed. Invalid username.]
-[Authentication failed. Bad username or password.]
-[Too many failed authentication attempts with given username or IP.]
-[Authentication failed. Unknown error.]
-[Block contact]
-[Unblock contact]
-[Create new chat]
-[Set own mood]
-[Unknown error!]
-[Network error!]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Traveling]
-[Celebrating]
-[Driving]
-[At the gym]
-[Working from home]
-[Calls]
-[Incoming call canceled]
-[Skypename]
diff --git a/langpacks/german/Plugins/SkypeStatusChange.txt b/langpacks/german/Deprecated/SkypeStatusChange.txt index 65af43577e..65af43577e 100644 --- a/langpacks/german/Plugins/SkypeStatusChange.txt +++ b/langpacks/german/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/german/Plugins/SkypeWeb.txt b/langpacks/german/Deprecated/SkypeWeb.txt index 11f0302de1..11f0302de1 100644 --- a/langpacks/german/Plugins/SkypeWeb.txt +++ b/langpacks/german/Deprecated/SkypeWeb.txt diff --git a/langpacks/polish/Plugins/SkypeStatusChange.txt b/langpacks/polish/Deprecated/SkypeStatusChange.txt index 1ca3fe3275..1ca3fe3275 100644 --- a/langpacks/polish/Plugins/SkypeStatusChange.txt +++ b/langpacks/polish/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/polish/Plugins/SkypeWeb.txt b/langpacks/polish/Deprecated/SkypeWeb.txt index ae80ad8a27..ae80ad8a27 100644 --- a/langpacks/polish/Plugins/SkypeWeb.txt +++ b/langpacks/polish/Deprecated/SkypeWeb.txt diff --git a/langpacks/polish/Untranslated/SkypeWeb.txt b/langpacks/polish/Untranslated/SkypeWeb.txt deleted file mode 100644 index 289b26eb96..0000000000 --- a/langpacks/polish/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1,12 +0,0 @@ -[Full image]
-[Set own mood]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Celebrating]
-[At the gym]
-[Working from home]
-[Incoming call canceled]
diff --git a/langpacks/russian/Plugins/SkypeStatusChange.txt b/langpacks/russian/Deprecated/SkypeStatusChange.txt index 023695cf9f..023695cf9f 100644 --- a/langpacks/russian/Plugins/SkypeStatusChange.txt +++ b/langpacks/russian/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Deprecated/SkypeWeb.txt index c9c1b1a8ae..c9c1b1a8ae 100644 --- a/langpacks/russian/Plugins/SkypeWeb.txt +++ b/langpacks/russian/Deprecated/SkypeWeb.txt diff --git a/langpacks/russian/Untranslated/SkypeWeb.txt b/langpacks/russian/Untranslated/SkypeWeb.txt deleted file mode 100644 index 3ad180c013..0000000000 --- a/langpacks/russian/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1,10 +0,0 @@ -[Set own mood]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Celebrating]
-[At the gym]
-[Working from home]
diff --git a/langpacks/spanish/Plugins/SkypeStatusChange.txt b/langpacks/spanish/Deprecated/SkypeStatusChange.txt index 4e28a4ec0b..4e28a4ec0b 100644 --- a/langpacks/spanish/Plugins/SkypeStatusChange.txt +++ b/langpacks/spanish/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/spanish/Plugins/SkypeWeb.txt b/langpacks/spanish/Deprecated/SkypeWeb.txt index 87e758cfb9..87e758cfb9 100644 --- a/langpacks/spanish/Plugins/SkypeWeb.txt +++ b/langpacks/spanish/Deprecated/SkypeWeb.txt diff --git a/langpacks/spanish/Untranslated/SkypeWeb.txt b/langpacks/spanish/Untranslated/SkypeWeb.txt deleted file mode 100644 index a2aa906363..0000000000 --- a/langpacks/spanish/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1,70 +0,0 @@ -[Skype protocol support for Miranda NG. Based on new Skype for Web.]
-[Create group chat]
-[Mark users you want to invite to a new chat]
-[Invite user to chat]
-[Choose one of your contacts to be invited:]
-[Skypename:]
-[Others]
-[Automatic messages synchronization]
-[Use BBCode]
-[Use hostname]
-[Set mood]
-[Mood]
-[Skype Link Protocol]
-[Admin]
-[User]
-[Enter new nickname]
-[This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]
-[&Change topic...]
-[Kick &user]
-[Set &role]
-[&Admin]
-[&User]
-[Change nick...]
-[Enter new chatroom topic]
-[Are you sure?]
-[Incoming call]
-[Action]
-[Call information]
-[File transfer information]
-[Moji]
-[Unknown event]
-[SkypeWeb error: Invalid data!]
-[Call]
-[Call missed]
-[Call ended (%s)]
-[File transfer:\n\tFile name: %s \n\tSize: %lld bytes \n]
-[Full image]
-[Unknown event, please send this text for developer: "%s"]
-[Protocol icon]
-[Create new chat icon]
-[Block user icon]
-[Unblock user icon]
-[Incoming call icon]
-[Notification icon]
-[Error icon]
-[Action icon]
-[Authentication failed. Invalid username.]
-[Authentication failed. Bad username or password.]
-[Too many failed authentication attempts with given username or IP.]
-[Authentication failed. Unknown error.]
-[Block contact]
-[Unblock contact]
-[Create new chat]
-[Set own mood]
-[Unknown error!]
-[Network error!]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Traveling]
-[Celebrating]
-[Driving]
-[At the gym]
-[Working from home]
-[Calls]
-[Incoming call canceled]
-[Skypename]
diff --git a/langpacks/ukrainian/Plugins/SkypeStatusChange.txt b/langpacks/ukrainian/Deprecated/SkypeStatusChange.txt index 0caab04634..0caab04634 100644 --- a/langpacks/ukrainian/Plugins/SkypeStatusChange.txt +++ b/langpacks/ukrainian/Deprecated/SkypeStatusChange.txt diff --git a/langpacks/ukrainian/Plugins/SkypeWeb.txt b/langpacks/ukrainian/Deprecated/SkypeWeb.txt index 05651f1493..05651f1493 100644 --- a/langpacks/ukrainian/Plugins/SkypeWeb.txt +++ b/langpacks/ukrainian/Deprecated/SkypeWeb.txt diff --git a/langpacks/ukrainian/Untranslated/SkypeWeb.txt b/langpacks/ukrainian/Untranslated/SkypeWeb.txt deleted file mode 100644 index 3a190886ae..0000000000 --- a/langpacks/ukrainian/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1,11 +0,0 @@ -[Full image]
-[Set own mood]
-[Custom emoji]
-[Be right back]
-[Out for lunch]
-[In meetings]
-[At school]
-[At the movies]
-[Celebrating]
-[At the gym]
-[Working from home]
diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp index 15e7879c32..62a01e4aed 100644 --- a/plugins/ClientChangeNotify/src/OptDlg.cpp +++ b/plugins/ClientChangeNotify/src/OptDlg.cpp @@ -194,6 +194,6 @@ void InitOptions() g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_DEFAULT, IDC_POPUPOPTDLG_POPUPNOTIFY));
g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_INFINITE, IDC_POPUPOPTDLG_POPUPNOTIFY));
g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_IGNORESTRINGS, IDC_POPUPOPTDLG_POPUPNOTIFY));
- g_PopupOptPage.Items.AddElem(new COptItem_Edit(IDC_POPUPOPTDLG_IGNORESTRINGS, DB_IGNORESUBSTRINGS, IGNORESTRINGS_MAX_LEN, L"gmail;skype;/Miranda[0-9A-F]{8}/", IDC_POPUPOPTDLG_POPUPNOTIFY));
+ g_PopupOptPage.Items.AddElem(new COptItem_Edit(IDC_POPUPOPTDLG_IGNORESTRINGS, DB_IGNORESUBSTRINGS, IGNORESTRINGS_MAX_LEN, L"gmail;teams;/Miranda[0-9A-F]{8}/", IDC_POPUPOPTDLG_POPUPNOTIFY));
g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_REGEXP, IDC_POPUPOPTDLG_POPUPNOTIFY));
}
diff --git a/plugins/FingerprintNG/iconpacks/res/Others/Skype.ico b/plugins/FingerprintNG/iconpacks/res/Others/Skype.ico Binary files differdeleted file mode 100644 index 031d8afb97..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/Others/Skype.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index fc12e52339..491cad0506 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -457,7 +457,6 @@ IDI_VK_MESSENGER ICON "VKontakte\\vkmessenger.ico" IDI_VK_PHOENIX_FULL ICON "VKontakte\\phoenix_full.ico"
IDI_VK_PHOENIX_LITE ICON "VKontakte\\phoenix_lite.ico"
IDI_DISCORD ICON "others\\Discord.ico"
-IDI_SKYPE ICON "others\\Skype.ico"
IDI_TEAMS ICON "others\\Teams.ico"
IDI_TWITTER ICON "others\\Twitter.ico"
IDI_HANGOUTS ICON "others\\Google+ Hangouts.ico"
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 31faadfd50..a3d710ffdf 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -520,8 +520,6 @@ static KN_FP_MASK def_kn_fp_mask[] = { "client_Twitter", L"*Twitter*", L"Twitter", IDI_TWITTER, OTHER_PROTOS_CASE, TRUE },
- { "client_Skype", L"*Skype**", L"Skype", IDI_SKYPE, OTHER_PROTOS_CASE },
-
{ "client_Steam", L"*Steam*", L"Steam", IDI_STEAM, OTHER_PROTOS_CASE },
{ "client_Teams", L"*Teams**", L"Teams", IDI_TEAMS, OTHER_PROTOS_CASE },
diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index a5aa3e58c7..98c61d3eca 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt @@ -7,7 +7,6 @@ add_subdirectory(IRCG) add_subdirectory(JabberG)
#add_subdirectory(MinecraftDynmap)
#add_subdirectory(Sametime)
-add_subdirectory(SkypeWeb)
add_subdirectory(Steam)
#add_subdirectory(Tox)
#add_subdirectory(Twitter)
diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp index b48d77e8a7..5b624fd237 100644 --- a/src/mir_app/src/db_ini.cpp +++ b/src/mir_app/src/db_ini.cpp @@ -515,7 +515,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 IRC JABBER SKYPE TWITTER VKontakte");
+ Profile_GetSetting(L"AutoExec/Unsafe", buf, L"Facebook GG IRC JABBER TWITTER VKontakte");
ptrA szUnsafeSections(mir_u2a(buf));
Profile_GetSetting(L"AutoExec/Warn", szSecurity, L"notsafe");
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt index 63540640a6..1fe805943c 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt @@ -204,6 +204,7 @@ Icons\proto_discord.dll Icons\proto_dummy.dll
Icons\proto_facebook.dll
Icons\proto_gg.dll
+Icons\proto_icq.dll
Icons\proto_irc.dll
Icons\proto_jabber.dll
Icons\proto_metacontacts.dll
@@ -211,7 +212,6 @@ Icons\proto_minecraftdynmap.dll Icons\proto_mradio.dll
Icons\proto_newsaggregator.dll
Icons\proto_sametime.dll
-Icons\proto_skype.dll
Icons\proto_steam.dll
Icons\proto_teams.dll
Icons\proto_tox.dll
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt index 0a9d61014d..adb82dc2e9 100644 --- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt +++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt @@ -203,6 +203,7 @@ Icons\proto_discord.dll Icons\proto_dummy.dll
Icons\proto_facebook.dll
Icons\proto_gg.dll
+Icons\proto_icq.dll
Icons\proto_irc.dll
Icons\proto_jabber.dll
Icons\proto_metacontacts.dll
@@ -210,7 +211,6 @@ Icons\proto_minecraftdynmap.dll Icons\proto_mradio.dll
Icons\proto_newsaggregator.dll
Icons\proto_sametime.dll
-Icons\proto_skype.dll
Icons\proto_steam.dll
Icons\proto_teams.dll
Icons\proto_tox.dll
diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini index 4a0ecb2efd..2e22349032 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 altered for
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: Facebook GG IRC JABBER SKYPE TWITTER VKontakte
-Unsafe=Facebook GG IRC JABBER SKYPE TWITTER VKontakte
+;Default: Facebook GG IRC JABBER TWITTER VKontakte
+Unsafe=Facebook GG IRC JABBER TWITTER VKontakte
;OverrideSecurityFilename
;System administrators 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 5521418a58..983602e8fc 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 altered for
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: Facebook GG IRC JABBER SKYPE TWITTER VKontakte
-Unsafe=Facebook GG IRC JABBER SKYPE TWITTER VKontakte
+;Default: Facebook GG IRC JABBER TWITTER VKontakte
+Unsafe=Facebook GG IRC JABBER TWITTER VKontakte
;OverrideSecurityFilename
;System administrators 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 4a0ecb2efd..2e22349032 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 altered for
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: Facebook GG IRC JABBER SKYPE TWITTER VKontakte
-Unsafe=Facebook GG IRC JABBER SKYPE TWITTER VKontakte
+;Default: Facebook GG IRC JABBER TWITTER VKontakte
+Unsafe=Facebook GG IRC JABBER TWITTER VKontakte
;OverrideSecurityFilename
;System administrators 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 5521418a58..983602e8fc 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 altered for
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: Facebook GG IRC JABBER SKYPE TWITTER VKontakte
-Unsafe=Facebook GG IRC JABBER SKYPE TWITTER VKontakte
+;Default: Facebook GG IRC JABBER TWITTER VKontakte
+Unsafe=Facebook GG IRC JABBER TWITTER VKontakte
;OverrideSecurityFilename
;System administrators may find it desirable to install settings without prompting
|