diff options
author | Vadim Dashevskiy <watcherhd@gmail.com> | 2014-09-05 12:08:52 +0000 |
---|---|---|
committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2014-09-05 12:08:52 +0000 |
commit | f82091b2af907fb1d120c305da75c57b09cb0e7b (patch) | |
tree | f76f25019d39f634696021d2d391669fec633f9c | |
parent | 387bba529b2a8878a6c66661c09fc02622fe32ea (diff) |
SkypeKit based Skype plugin is moved to deprecated and will be deleted from Plugins folder by PluginUpdater
git-svn-id: http://svn.miranda-ng.org/main/trunk@10372 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r-- | bin10/mir_full.sln | 6 | ||||
-rw-r--r-- | bin10/mir_full_pro.sln | 7 | ||||
-rw-r--r-- | bin12/mir_full.sln | 8 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/Skype_10.vcxproj (renamed from protocols/Skype/Skype_10.vcxproj) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/Skype_10.vcxproj.filters (renamed from protocols/Skype/Skype_10.vcxproj.filters) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/Skype_12.vcxproj (renamed from protocols/Skype/Skype_12.vcxproj) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/Skype_12.vcxproj.filters (renamed from protocols/Skype/Skype_12.vcxproj.filters) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/docs/readme.txt (renamed from protocols/Skype/docs/readme.txt) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/docs/todo_list.txt (renamed from protocols/Skype/docs/todo_list.txt) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/aes/aes.c (renamed from protocols/Skype/keypacker/aes/aes.c) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/aes/aes.h (renamed from protocols/Skype/keypacker/aes/aes.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/keypacker.cpp (renamed from protocols/Skype/keypacker/keypacker.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/keypacker_10.sln (renamed from protocols/Skype/keypacker/keypacker_10.sln) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/keypacker_10.vcxproj (renamed from protocols/Skype/keypacker/keypacker_10.vcxproj) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/keypacker_10.vcxproj.filters (renamed from protocols/Skype/keypacker/keypacker_10.vcxproj.filters) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/keypacker_11.sln (renamed from protocols/Skype/keypacker/keypacker_11.sln) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/keypacker_12.vcxproj (renamed from protocols/Skype/keypacker/keypacker_12.vcxproj) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/keypacker_12.vcxproj.filters (renamed from protocols/Skype/keypacker/keypacker_12.vcxproj.filters) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/keypacker/stdafx.h (renamed from protocols/Skype/keypacker/stdafx.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj (renamed from protocols/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj.filters (renamed from protocols/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj.filters) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj (renamed from protocols/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj.filters (renamed from protocols/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj.filters) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_conn_skype/res/1.ico (renamed from protocols/Skype/proto_conn_skype/res/1.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_conn_skype/res/2.ico (renamed from protocols/Skype/proto_conn_skype/res/2.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_conn_skype/res/3.ico (renamed from protocols/Skype/proto_conn_skype/res/3.ico) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_conn_skype/res/resource.rc (renamed from protocols/Skype/proto_conn_skype/res/resource.rc) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/Proto_Skype_10.vcxproj (renamed from protocols/Skype/proto_skype/Proto_Skype_10.vcxproj) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/Proto_Skype_10.vcxproj.filters (renamed from protocols/Skype/proto_skype/Proto_Skype_10.vcxproj.filters) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/Proto_Skype_12.vcxproj (renamed from protocols/Skype/proto_skype/Proto_Skype_12.vcxproj) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/Proto_Skype_12.vcxproj.filters (renamed from protocols/Skype/proto_skype/Proto_Skype_12.vcxproj.filters) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/res/Away.ico (renamed from protocols/Skype/proto_skype/res/Away.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/res/DND.ico (renamed from protocols/Skype/proto_skype/res/DND.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/res/Invisible.ico (renamed from protocols/Skype/proto_skype/res/Invisible.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/res/Offline.ico (renamed from protocols/Skype/proto_skype/res/Offline.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/res/Online.ico (renamed from protocols/Skype/proto_skype/res/Online.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/res/Phone.ico (renamed from protocols/Skype/proto_skype/res/Phone.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/res/Proto_Skype.rc (renamed from protocols/Skype/proto_skype/res/Proto_Skype.rc) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/proto_skype/src/resource.h (renamed from protocols/Skype/proto_skype/src/resource.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/res/Resource.rc (renamed from protocols/Skype/res/Resource.rc) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/res/Version.rc (renamed from protocols/Skype/res/Version.rc) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/res/add_contacts.ico (renamed from protocols/Skype/res/add_contacts.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/res/block.ico (renamed from protocols/Skype/res/block.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/res/call.ico (renamed from protocols/Skype/res/call.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/res/conference.ico (renamed from protocols/Skype/res/conference.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/res/contact.ico (renamed from protocols/Skype/res/contact.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/res/delete.ico (renamed from protocols/Skype/res/delete.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/res/send_contacts.ico (renamed from protocols/Skype/res/send_contacts.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/res/skype.ico (renamed from protocols/Skype/res/skype.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | plugins/!Deprecated/Skype/src/aes/aes.cpp (renamed from protocols/Skype/src/aes/aes.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/aes/aes.h (renamed from protocols/Skype/src/aes/aes.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/resource.h (renamed from protocols/Skype/src/resource.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype.cpp (renamed from protocols/Skype/src/skype.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype.h (renamed from protocols/Skype/src/skype.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_account.cpp (renamed from protocols/Skype/src/skype_account.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_avatars.cpp (renamed from protocols/Skype/src/skype_avatars.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_blocked.cpp (renamed from protocols/Skype/src/skype_blocked.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_bookmarks.cpp (renamed from protocols/Skype/src/skype_bookmarks.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_chat.cpp (renamed from protocols/Skype/src/skype_chat.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_chat.h (renamed from protocols/Skype/src/skype_chat.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_contacts.cpp (renamed from protocols/Skype/src/skype_contacts.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_database.cpp (renamed from protocols/Skype/src/skype_database.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_dialogs.cpp (renamed from protocols/Skype/src/skype_dialogs.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_events.cpp (renamed from protocols/Skype/src/skype_events.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_hooks.cpp (renamed from protocols/Skype/src/skype_hooks.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_icons.cpp (renamed from protocols/Skype/src/skype_icons.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_ignore_list.cpp (renamed from protocols/Skype/src/skype_ignore_list.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_instances.cpp (renamed from protocols/Skype/src/skype_instances.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_menus.cpp (renamed from protocols/Skype/src/skype_menus.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_messages.cpp (renamed from protocols/Skype/src/skype_messages.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_netlib.cpp (renamed from protocols/Skype/src/skype_netlib.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_own_info.cpp (renamed from protocols/Skype/src/skype_own_info.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_profile.cpp (renamed from protocols/Skype/src/skype_profile.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_proto.cpp (renamed from protocols/Skype/src/skype_proto.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_proto.h (renamed from protocols/Skype/src/skype_proto.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_runtime.cpp (renamed from protocols/Skype/src/skype_runtime.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_services.cpp (renamed from protocols/Skype/src/skype_services.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_settings.cpp (renamed from protocols/Skype/src/skype_settings.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_skype.cpp (renamed from protocols/Skype/src/skype_skype.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_transfers.cpp (renamed from protocols/Skype/src/skype_transfers.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skype_utils.cpp (renamed from protocols/Skype/src/skype_utils.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/account.cpp (renamed from protocols/Skype/src/skypekit/account.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/account.h (renamed from protocols/Skype/src/skypekit/account.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/common.h (renamed from protocols/Skype/src/skypekit/common.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/contact.cpp (renamed from protocols/Skype/src/skypekit/contact.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/contact.h (renamed from protocols/Skype/src/skypekit/contact.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/conversation.cpp (renamed from protocols/Skype/src/skypekit/conversation.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/conversation.h (renamed from protocols/Skype/src/skypekit/conversation.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/group.cpp (renamed from protocols/Skype/src/skypekit/group.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/group.h (renamed from protocols/Skype/src/skypekit/group.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/message.cpp (renamed from protocols/Skype/src/skypekit/message.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/message.h (renamed from protocols/Skype/src/skypekit/message.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/participant.cpp (renamed from protocols/Skype/src/skypekit/participant.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/participant.h (renamed from protocols/Skype/src/skypekit/participant.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/search.cpp (renamed from protocols/Skype/src/skypekit/search.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/search.h (renamed from protocols/Skype/src/skypekit/search.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/transfer.cpp (renamed from protocols/Skype/src/skypekit/transfer.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/skypekit/transfer.h (renamed from protocols/Skype/src/skypekit/transfer.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/stdafx.cpp (renamed from protocols/Skype/src/stdafx.cpp) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/string_list.h (renamed from protocols/Skype/src/string_list.h) | 0 | ||||
-rw-r--r-- | plugins/!Deprecated/Skype/src/version.h (renamed from protocols/Skype/src/version.h) | 0 | ||||
-rw-r--r-- | plugins/PluginUpdater/src/DlgUpdate.cpp | 2 |
102 files changed, 3 insertions, 20 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index f84225d05e..6af787ac97 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -385,8 +385,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConnectionNotify", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Exchange", "..\plugins\Exchange\Exchange_10.vcxproj", "{F462FDA1-BDCD-49B2-B996-D7DE71D07393}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Skype", "..\protocols\Skype\Skype_10.vcxproj", "{F5282DBC-756B-4071-B186-3E82C0E8E1F7}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebView", "..\plugins\WebView\webview_10.vcxproj", "{475ED6ED-C311-4188-ACB2-1C41830B22EE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShlExt", "..\plugins\ShellExt\shellext_10.vcxproj", "{B27B85B5-0EF1-496D-99D7-0702A98A342A}"
@@ -1727,10 +1725,6 @@ Global {F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|Win32.Build.0 = Release|Win32
{F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|x64.ActiveCfg = Release|x64
{F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|x64.Build.0 = Release|x64
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Debug|Win32.ActiveCfg = Debug|Win32
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Debug|x64.ActiveCfg = Debug|x64
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Release|Win32.ActiveCfg = Release|Win32
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Release|x64.ActiveCfg = Release|x64
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|Win32.ActiveCfg = Debug|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|Win32.Build.0 = Debug|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index a501ba0b98..f299a27b30 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -419,8 +419,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConnectionNotify", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Exchange", "..\plugins\Exchange\Exchange_10.vcxproj", "{F462FDA1-BDCD-49B2-B996-D7DE71D07393}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Skype", "..\protocols\Skype\Skype_10.vcxproj", "{F5282DBC-756B-4071-B186-3E82C0E8E1F7}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebView", "..\plugins\WebView\webview_10.vcxproj", "{475ED6ED-C311-4188-ACB2-1C41830B22EE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShlExt", "..\plugins\ShellExt\shellext_10.vcxproj", "{B27B85B5-0EF1-496D-99D7-0702A98A342A}"
@@ -1759,10 +1757,6 @@ Global {F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|Win32.Build.0 = Release|Win32
{F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|x64.ActiveCfg = Release|x64
{F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|x64.Build.0 = Release|x64
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Debug|Win32.ActiveCfg = Debug|Win32
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Debug|x64.ActiveCfg = Debug|x64
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Release|Win32.ActiveCfg = Release|Win32
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Release|x64.ActiveCfg = Release|x64
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|Win32.ActiveCfg = Debug|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|Win32.Build.0 = Debug|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|x64.ActiveCfg = Debug|x64
@@ -1971,7 +1965,6 @@ Global {2115FEBC-1EC4-4F95-A058-A523ED5295A4} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{A556E0B5-73A1-4676-BA1F-133820DE7D5A} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{0E046380-14CA-4C23-A807-8C678519A605} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{475ED6ED-C311-4188-ACB2-1C41830B22EE} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{BF6E1942-7E42-4564-9DF5-FD0A00D71173} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{5F9243AE-C6C9-4F42-B670-67A97767A50B} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index d985ba59b2..b96e4b128a 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32_12.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
ProjectSection(ProjectDependencies) = postProject
@@ -387,8 +387,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConnectionNotify", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Exchange", "..\plugins\Exchange\Exchange_12.vcxproj", "{F462FDA1-BDCD-49B2-B996-D7DE71D07393}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Skype", "..\protocols\Skype\Skype_12.vcxproj", "{F5282DBC-756B-4071-B186-3E82C0E8E1F7}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebView", "..\plugins\WebView\webview_12.vcxproj", "{475ED6ED-C311-4188-ACB2-1C41830B22EE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShlExt", "..\plugins\ShellExt\shellext_12.vcxproj", "{B27B85B5-0EF1-496D-99D7-0702A98A342A}"
@@ -1729,10 +1727,6 @@ Global {F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|Win32.Build.0 = Release|Win32
{F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|x64.ActiveCfg = Release|x64
{F462FDA1-BDCD-49B2-B996-D7DE71D07393}.Release|x64.Build.0 = Release|x64
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Debug|Win32.ActiveCfg = Debug|Win32
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Debug|x64.ActiveCfg = Debug|x64
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Release|Win32.ActiveCfg = Release|Win32
- {F5282DBC-756B-4071-B186-3E82C0E8E1F7}.Release|x64.ActiveCfg = Release|x64
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|Win32.ActiveCfg = Debug|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|Win32.Build.0 = Debug|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/protocols/Skype/Skype_10.vcxproj b/plugins/!Deprecated/Skype/Skype_10.vcxproj index 763fcd9f65..763fcd9f65 100644 --- a/protocols/Skype/Skype_10.vcxproj +++ b/plugins/!Deprecated/Skype/Skype_10.vcxproj diff --git a/protocols/Skype/Skype_10.vcxproj.filters b/plugins/!Deprecated/Skype/Skype_10.vcxproj.filters index f44a2b7302..f44a2b7302 100644 --- a/protocols/Skype/Skype_10.vcxproj.filters +++ b/plugins/!Deprecated/Skype/Skype_10.vcxproj.filters diff --git a/protocols/Skype/Skype_12.vcxproj b/plugins/!Deprecated/Skype/Skype_12.vcxproj index 2106fee3ae..2106fee3ae 100644 --- a/protocols/Skype/Skype_12.vcxproj +++ b/plugins/!Deprecated/Skype/Skype_12.vcxproj diff --git a/protocols/Skype/Skype_12.vcxproj.filters b/plugins/!Deprecated/Skype/Skype_12.vcxproj.filters index f44a2b7302..f44a2b7302 100644 --- a/protocols/Skype/Skype_12.vcxproj.filters +++ b/plugins/!Deprecated/Skype/Skype_12.vcxproj.filters diff --git a/protocols/Skype/docs/readme.txt b/plugins/!Deprecated/Skype/docs/readme.txt index 8a6e71cea5..8a6e71cea5 100644 --- a/protocols/Skype/docs/readme.txt +++ b/plugins/!Deprecated/Skype/docs/readme.txt diff --git a/protocols/Skype/docs/todo_list.txt b/plugins/!Deprecated/Skype/docs/todo_list.txt index 581db42afa..581db42afa 100644 --- a/protocols/Skype/docs/todo_list.txt +++ b/plugins/!Deprecated/Skype/docs/todo_list.txt diff --git a/protocols/Skype/keypacker/aes/aes.c b/plugins/!Deprecated/Skype/keypacker/aes/aes.c index 7e15f1547b..7e15f1547b 100644 --- a/protocols/Skype/keypacker/aes/aes.c +++ b/plugins/!Deprecated/Skype/keypacker/aes/aes.c diff --git a/protocols/Skype/keypacker/aes/aes.h b/plugins/!Deprecated/Skype/keypacker/aes/aes.h index af81401a0f..af81401a0f 100644 --- a/protocols/Skype/keypacker/aes/aes.h +++ b/plugins/!Deprecated/Skype/keypacker/aes/aes.h diff --git a/protocols/Skype/keypacker/keypacker.cpp b/plugins/!Deprecated/Skype/keypacker/keypacker.cpp index c9833a41ac..c9833a41ac 100644 --- a/protocols/Skype/keypacker/keypacker.cpp +++ b/plugins/!Deprecated/Skype/keypacker/keypacker.cpp diff --git a/protocols/Skype/keypacker/keypacker_10.sln b/plugins/!Deprecated/Skype/keypacker/keypacker_10.sln index a84639cde2..a84639cde2 100644 --- a/protocols/Skype/keypacker/keypacker_10.sln +++ b/plugins/!Deprecated/Skype/keypacker/keypacker_10.sln diff --git a/protocols/Skype/keypacker/keypacker_10.vcxproj b/plugins/!Deprecated/Skype/keypacker/keypacker_10.vcxproj index 0db7de2c58..0db7de2c58 100644 --- a/protocols/Skype/keypacker/keypacker_10.vcxproj +++ b/plugins/!Deprecated/Skype/keypacker/keypacker_10.vcxproj diff --git a/protocols/Skype/keypacker/keypacker_10.vcxproj.filters b/plugins/!Deprecated/Skype/keypacker/keypacker_10.vcxproj.filters index e2b466d4e0..e2b466d4e0 100644 --- a/protocols/Skype/keypacker/keypacker_10.vcxproj.filters +++ b/plugins/!Deprecated/Skype/keypacker/keypacker_10.vcxproj.filters diff --git a/protocols/Skype/keypacker/keypacker_11.sln b/plugins/!Deprecated/Skype/keypacker/keypacker_11.sln index 505fc4ea89..505fc4ea89 100644 --- a/protocols/Skype/keypacker/keypacker_11.sln +++ b/plugins/!Deprecated/Skype/keypacker/keypacker_11.sln diff --git a/protocols/Skype/keypacker/keypacker_12.vcxproj b/plugins/!Deprecated/Skype/keypacker/keypacker_12.vcxproj index ee84077558..ee84077558 100644 --- a/protocols/Skype/keypacker/keypacker_12.vcxproj +++ b/plugins/!Deprecated/Skype/keypacker/keypacker_12.vcxproj diff --git a/protocols/Skype/keypacker/keypacker_12.vcxproj.filters b/plugins/!Deprecated/Skype/keypacker/keypacker_12.vcxproj.filters index e2b466d4e0..e2b466d4e0 100644 --- a/protocols/Skype/keypacker/keypacker_12.vcxproj.filters +++ b/plugins/!Deprecated/Skype/keypacker/keypacker_12.vcxproj.filters diff --git a/protocols/Skype/keypacker/stdafx.h b/plugins/!Deprecated/Skype/keypacker/stdafx.h index d63a19340e..d63a19340e 100644 --- a/protocols/Skype/keypacker/stdafx.h +++ b/plugins/!Deprecated/Skype/keypacker/stdafx.h diff --git a/protocols/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj b/plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj index 6d2347b5fd..6d2347b5fd 100644 --- a/protocols/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj +++ b/plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj diff --git a/protocols/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj.filters b/plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj.filters index 876836c2da..876836c2da 100644 --- a/protocols/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj.filters +++ b/plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_10.vcxproj.filters diff --git a/protocols/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj b/plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj index 7a513c66d5..7a513c66d5 100644 --- a/protocols/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj +++ b/plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj diff --git a/protocols/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj.filters b/plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj.filters index 876836c2da..876836c2da 100644 --- a/protocols/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj.filters +++ b/plugins/!Deprecated/Skype/proto_conn_skype/Proto_conn_Skype_12.vcxproj.filters diff --git a/protocols/Skype/proto_conn_skype/res/1.ico b/plugins/!Deprecated/Skype/proto_conn_skype/res/1.ico Binary files differindex 9175679a3d..9175679a3d 100644 --- a/protocols/Skype/proto_conn_skype/res/1.ico +++ b/plugins/!Deprecated/Skype/proto_conn_skype/res/1.ico diff --git a/protocols/Skype/proto_conn_skype/res/2.ico b/plugins/!Deprecated/Skype/proto_conn_skype/res/2.ico Binary files differindex 41508e7829..41508e7829 100644 --- a/protocols/Skype/proto_conn_skype/res/2.ico +++ b/plugins/!Deprecated/Skype/proto_conn_skype/res/2.ico diff --git a/protocols/Skype/proto_conn_skype/res/3.ico b/plugins/!Deprecated/Skype/proto_conn_skype/res/3.ico Binary files differindex e87888acd8..e87888acd8 100644 --- a/protocols/Skype/proto_conn_skype/res/3.ico +++ b/plugins/!Deprecated/Skype/proto_conn_skype/res/3.ico diff --git a/protocols/Skype/proto_conn_skype/res/resource.rc b/plugins/!Deprecated/Skype/proto_conn_skype/res/resource.rc index 649c7f7e9b..649c7f7e9b 100644 --- a/protocols/Skype/proto_conn_skype/res/resource.rc +++ b/plugins/!Deprecated/Skype/proto_conn_skype/res/resource.rc diff --git a/protocols/Skype/proto_skype/Proto_Skype_10.vcxproj b/plugins/!Deprecated/Skype/proto_skype/Proto_Skype_10.vcxproj index 7a3e7f8208..7a3e7f8208 100644 --- a/protocols/Skype/proto_skype/Proto_Skype_10.vcxproj +++ b/plugins/!Deprecated/Skype/proto_skype/Proto_Skype_10.vcxproj diff --git a/protocols/Skype/proto_skype/Proto_Skype_10.vcxproj.filters b/plugins/!Deprecated/Skype/proto_skype/Proto_Skype_10.vcxproj.filters index 05bc2ab938..05bc2ab938 100644 --- a/protocols/Skype/proto_skype/Proto_Skype_10.vcxproj.filters +++ b/plugins/!Deprecated/Skype/proto_skype/Proto_Skype_10.vcxproj.filters diff --git a/protocols/Skype/proto_skype/Proto_Skype_12.vcxproj b/plugins/!Deprecated/Skype/proto_skype/Proto_Skype_12.vcxproj index f2afa9a94f..f2afa9a94f 100644 --- a/protocols/Skype/proto_skype/Proto_Skype_12.vcxproj +++ b/plugins/!Deprecated/Skype/proto_skype/Proto_Skype_12.vcxproj diff --git a/protocols/Skype/proto_skype/Proto_Skype_12.vcxproj.filters b/plugins/!Deprecated/Skype/proto_skype/Proto_Skype_12.vcxproj.filters index 05bc2ab938..05bc2ab938 100644 --- a/protocols/Skype/proto_skype/Proto_Skype_12.vcxproj.filters +++ b/plugins/!Deprecated/Skype/proto_skype/Proto_Skype_12.vcxproj.filters diff --git a/protocols/Skype/proto_skype/res/Away.ico b/plugins/!Deprecated/Skype/proto_skype/res/Away.ico Binary files differindex 3d53035e78..3d53035e78 100644 --- a/protocols/Skype/proto_skype/res/Away.ico +++ b/plugins/!Deprecated/Skype/proto_skype/res/Away.ico diff --git a/protocols/Skype/proto_skype/res/DND.ico b/plugins/!Deprecated/Skype/proto_skype/res/DND.ico Binary files differindex 2646d9ba60..2646d9ba60 100644 --- a/protocols/Skype/proto_skype/res/DND.ico +++ b/plugins/!Deprecated/Skype/proto_skype/res/DND.ico diff --git a/protocols/Skype/proto_skype/res/Invisible.ico b/plugins/!Deprecated/Skype/proto_skype/res/Invisible.ico Binary files differindex d76c3c0eb9..d76c3c0eb9 100644 --- a/protocols/Skype/proto_skype/res/Invisible.ico +++ b/plugins/!Deprecated/Skype/proto_skype/res/Invisible.ico diff --git a/protocols/Skype/proto_skype/res/Offline.ico b/plugins/!Deprecated/Skype/proto_skype/res/Offline.ico Binary files differindex 09a98487a0..09a98487a0 100644 --- a/protocols/Skype/proto_skype/res/Offline.ico +++ b/plugins/!Deprecated/Skype/proto_skype/res/Offline.ico diff --git a/protocols/Skype/proto_skype/res/Online.ico b/plugins/!Deprecated/Skype/proto_skype/res/Online.ico Binary files differindex 140b9704af..140b9704af 100644 --- a/protocols/Skype/proto_skype/res/Online.ico +++ b/plugins/!Deprecated/Skype/proto_skype/res/Online.ico diff --git a/protocols/Skype/proto_skype/res/Phone.ico b/plugins/!Deprecated/Skype/proto_skype/res/Phone.ico Binary files differindex 8903209986..8903209986 100644 --- a/protocols/Skype/proto_skype/res/Phone.ico +++ b/plugins/!Deprecated/Skype/proto_skype/res/Phone.ico diff --git a/protocols/Skype/proto_skype/res/Proto_Skype.rc b/plugins/!Deprecated/Skype/proto_skype/res/Proto_Skype.rc index 3506f4708d..3506f4708d 100644 --- a/protocols/Skype/proto_skype/res/Proto_Skype.rc +++ b/plugins/!Deprecated/Skype/proto_skype/res/Proto_Skype.rc diff --git a/protocols/Skype/proto_skype/src/resource.h b/plugins/!Deprecated/Skype/proto_skype/src/resource.h index e206585288..e206585288 100644 --- a/protocols/Skype/proto_skype/src/resource.h +++ b/plugins/!Deprecated/Skype/proto_skype/src/resource.h diff --git a/protocols/Skype/res/Resource.rc b/plugins/!Deprecated/Skype/res/Resource.rc index 1b1e0bca3c..1b1e0bca3c 100644 --- a/protocols/Skype/res/Resource.rc +++ b/plugins/!Deprecated/Skype/res/Resource.rc diff --git a/protocols/Skype/res/Version.rc b/plugins/!Deprecated/Skype/res/Version.rc index d741488c4f..d741488c4f 100644 --- a/protocols/Skype/res/Version.rc +++ b/plugins/!Deprecated/Skype/res/Version.rc diff --git a/protocols/Skype/res/add_contacts.ico b/plugins/!Deprecated/Skype/res/add_contacts.ico Binary files differindex d2b5d6a477..d2b5d6a477 100644 --- a/protocols/Skype/res/add_contacts.ico +++ b/plugins/!Deprecated/Skype/res/add_contacts.ico diff --git a/protocols/Skype/res/block.ico b/plugins/!Deprecated/Skype/res/block.ico Binary files differindex e92c4d4bce..e92c4d4bce 100644 --- a/protocols/Skype/res/block.ico +++ b/plugins/!Deprecated/Skype/res/block.ico diff --git a/protocols/Skype/res/call.ico b/plugins/!Deprecated/Skype/res/call.ico Binary files differindex 41e984fc6b..41e984fc6b 100644 --- a/protocols/Skype/res/call.ico +++ b/plugins/!Deprecated/Skype/res/call.ico diff --git a/protocols/Skype/res/conference.ico b/plugins/!Deprecated/Skype/res/conference.ico Binary files differindex 7d535835c0..7d535835c0 100644 --- a/protocols/Skype/res/conference.ico +++ b/plugins/!Deprecated/Skype/res/conference.ico diff --git a/protocols/Skype/res/contact.ico b/plugins/!Deprecated/Skype/res/contact.ico Binary files differindex 241bb8a83b..241bb8a83b 100644 --- a/protocols/Skype/res/contact.ico +++ b/plugins/!Deprecated/Skype/res/contact.ico diff --git a/protocols/Skype/res/delete.ico b/plugins/!Deprecated/Skype/res/delete.ico Binary files differindex 81a38441b1..81a38441b1 100644 --- a/protocols/Skype/res/delete.ico +++ b/plugins/!Deprecated/Skype/res/delete.ico diff --git a/protocols/Skype/res/send_contacts.ico b/plugins/!Deprecated/Skype/res/send_contacts.ico Binary files differindex c29ed475e0..c29ed475e0 100644 --- a/protocols/Skype/res/send_contacts.ico +++ b/plugins/!Deprecated/Skype/res/send_contacts.ico diff --git a/protocols/Skype/res/skype.ico b/plugins/!Deprecated/Skype/res/skype.ico Binary files differindex 140b9704af..140b9704af 100644 --- a/protocols/Skype/res/skype.ico +++ b/plugins/!Deprecated/Skype/res/skype.ico diff --git a/protocols/Skype/src/aes/aes.cpp b/plugins/!Deprecated/Skype/src/aes/aes.cpp index e3dfa1261f..e3dfa1261f 100644 --- a/protocols/Skype/src/aes/aes.cpp +++ b/plugins/!Deprecated/Skype/src/aes/aes.cpp diff --git a/protocols/Skype/src/aes/aes.h b/plugins/!Deprecated/Skype/src/aes/aes.h index 8bc958b410..8bc958b410 100644 --- a/protocols/Skype/src/aes/aes.h +++ b/plugins/!Deprecated/Skype/src/aes/aes.h diff --git a/protocols/Skype/src/resource.h b/plugins/!Deprecated/Skype/src/resource.h index e155854f36..e155854f36 100644 --- a/protocols/Skype/src/resource.h +++ b/plugins/!Deprecated/Skype/src/resource.h diff --git a/protocols/Skype/src/skype.cpp b/plugins/!Deprecated/Skype/src/skype.cpp index 0416d8f473..0416d8f473 100644 --- a/protocols/Skype/src/skype.cpp +++ b/plugins/!Deprecated/Skype/src/skype.cpp diff --git a/protocols/Skype/src/skype.h b/plugins/!Deprecated/Skype/src/skype.h index d27c7564ab..d27c7564ab 100644 --- a/protocols/Skype/src/skype.h +++ b/plugins/!Deprecated/Skype/src/skype.h diff --git a/protocols/Skype/src/skype_account.cpp b/plugins/!Deprecated/Skype/src/skype_account.cpp index d3729f317a..d3729f317a 100644 --- a/protocols/Skype/src/skype_account.cpp +++ b/plugins/!Deprecated/Skype/src/skype_account.cpp diff --git a/protocols/Skype/src/skype_avatars.cpp b/plugins/!Deprecated/Skype/src/skype_avatars.cpp index 25db2a32df..25db2a32df 100644 --- a/protocols/Skype/src/skype_avatars.cpp +++ b/plugins/!Deprecated/Skype/src/skype_avatars.cpp diff --git a/protocols/Skype/src/skype_blocked.cpp b/plugins/!Deprecated/Skype/src/skype_blocked.cpp index b1a25dc4db..b1a25dc4db 100644 --- a/protocols/Skype/src/skype_blocked.cpp +++ b/plugins/!Deprecated/Skype/src/skype_blocked.cpp diff --git a/protocols/Skype/src/skype_bookmarks.cpp b/plugins/!Deprecated/Skype/src/skype_bookmarks.cpp index 29f3cc89d4..29f3cc89d4 100644 --- a/protocols/Skype/src/skype_bookmarks.cpp +++ b/plugins/!Deprecated/Skype/src/skype_bookmarks.cpp diff --git a/protocols/Skype/src/skype_chat.cpp b/plugins/!Deprecated/Skype/src/skype_chat.cpp index 2f2f166566..2f2f166566 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/plugins/!Deprecated/Skype/src/skype_chat.cpp diff --git a/protocols/Skype/src/skype_chat.h b/plugins/!Deprecated/Skype/src/skype_chat.h index d63d7c9da2..d63d7c9da2 100644 --- a/protocols/Skype/src/skype_chat.h +++ b/plugins/!Deprecated/Skype/src/skype_chat.h diff --git a/protocols/Skype/src/skype_contacts.cpp b/plugins/!Deprecated/Skype/src/skype_contacts.cpp index 0561db0e04..0561db0e04 100644 --- a/protocols/Skype/src/skype_contacts.cpp +++ b/plugins/!Deprecated/Skype/src/skype_contacts.cpp diff --git a/protocols/Skype/src/skype_database.cpp b/plugins/!Deprecated/Skype/src/skype_database.cpp index 6ad9166e11..6ad9166e11 100644 --- a/protocols/Skype/src/skype_database.cpp +++ b/plugins/!Deprecated/Skype/src/skype_database.cpp diff --git a/protocols/Skype/src/skype_dialogs.cpp b/plugins/!Deprecated/Skype/src/skype_dialogs.cpp index a3aa8df4dc..a3aa8df4dc 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/plugins/!Deprecated/Skype/src/skype_dialogs.cpp diff --git a/protocols/Skype/src/skype_events.cpp b/plugins/!Deprecated/Skype/src/skype_events.cpp index ba7ea1d311..ba7ea1d311 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/plugins/!Deprecated/Skype/src/skype_events.cpp diff --git a/protocols/Skype/src/skype_hooks.cpp b/plugins/!Deprecated/Skype/src/skype_hooks.cpp index 13dc08c95b..13dc08c95b 100644 --- a/protocols/Skype/src/skype_hooks.cpp +++ b/plugins/!Deprecated/Skype/src/skype_hooks.cpp diff --git a/protocols/Skype/src/skype_icons.cpp b/plugins/!Deprecated/Skype/src/skype_icons.cpp index 5822cf2b37..5822cf2b37 100644 --- a/protocols/Skype/src/skype_icons.cpp +++ b/plugins/!Deprecated/Skype/src/skype_icons.cpp diff --git a/protocols/Skype/src/skype_ignore_list.cpp b/plugins/!Deprecated/Skype/src/skype_ignore_list.cpp index b37f6787e0..b37f6787e0 100644 --- a/protocols/Skype/src/skype_ignore_list.cpp +++ b/plugins/!Deprecated/Skype/src/skype_ignore_list.cpp diff --git a/protocols/Skype/src/skype_instances.cpp b/plugins/!Deprecated/Skype/src/skype_instances.cpp index 66b8447fbc..66b8447fbc 100644 --- a/protocols/Skype/src/skype_instances.cpp +++ b/plugins/!Deprecated/Skype/src/skype_instances.cpp diff --git a/protocols/Skype/src/skype_menus.cpp b/plugins/!Deprecated/Skype/src/skype_menus.cpp index a051d24911..a051d24911 100644 --- a/protocols/Skype/src/skype_menus.cpp +++ b/plugins/!Deprecated/Skype/src/skype_menus.cpp diff --git a/protocols/Skype/src/skype_messages.cpp b/plugins/!Deprecated/Skype/src/skype_messages.cpp index b212959f98..b212959f98 100644 --- a/protocols/Skype/src/skype_messages.cpp +++ b/plugins/!Deprecated/Skype/src/skype_messages.cpp diff --git a/protocols/Skype/src/skype_netlib.cpp b/plugins/!Deprecated/Skype/src/skype_netlib.cpp index 6a958d0217..6a958d0217 100644 --- a/protocols/Skype/src/skype_netlib.cpp +++ b/plugins/!Deprecated/Skype/src/skype_netlib.cpp diff --git a/protocols/Skype/src/skype_own_info.cpp b/plugins/!Deprecated/Skype/src/skype_own_info.cpp index f56178229a..f56178229a 100644 --- a/protocols/Skype/src/skype_own_info.cpp +++ b/plugins/!Deprecated/Skype/src/skype_own_info.cpp diff --git a/protocols/Skype/src/skype_profile.cpp b/plugins/!Deprecated/Skype/src/skype_profile.cpp index 0a6686303d..0a6686303d 100644 --- a/protocols/Skype/src/skype_profile.cpp +++ b/plugins/!Deprecated/Skype/src/skype_profile.cpp diff --git a/protocols/Skype/src/skype_proto.cpp b/plugins/!Deprecated/Skype/src/skype_proto.cpp index 8931a48498..8931a48498 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/plugins/!Deprecated/Skype/src/skype_proto.cpp diff --git a/protocols/Skype/src/skype_proto.h b/plugins/!Deprecated/Skype/src/skype_proto.h index 5f6bb13e2d..5f6bb13e2d 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/plugins/!Deprecated/Skype/src/skype_proto.h diff --git a/protocols/Skype/src/skype_runtime.cpp b/plugins/!Deprecated/Skype/src/skype_runtime.cpp index ed966b1f34..ed966b1f34 100644 --- a/protocols/Skype/src/skype_runtime.cpp +++ b/plugins/!Deprecated/Skype/src/skype_runtime.cpp diff --git a/protocols/Skype/src/skype_services.cpp b/plugins/!Deprecated/Skype/src/skype_services.cpp index 9f2ac62434..9f2ac62434 100644 --- a/protocols/Skype/src/skype_services.cpp +++ b/plugins/!Deprecated/Skype/src/skype_services.cpp diff --git a/protocols/Skype/src/skype_settings.cpp b/plugins/!Deprecated/Skype/src/skype_settings.cpp index 4b4c7482c9..4b4c7482c9 100644 --- a/protocols/Skype/src/skype_settings.cpp +++ b/plugins/!Deprecated/Skype/src/skype_settings.cpp diff --git a/protocols/Skype/src/skype_skype.cpp b/plugins/!Deprecated/Skype/src/skype_skype.cpp index 65df7f98f7..65df7f98f7 100644 --- a/protocols/Skype/src/skype_skype.cpp +++ b/plugins/!Deprecated/Skype/src/skype_skype.cpp diff --git a/protocols/Skype/src/skype_transfers.cpp b/plugins/!Deprecated/Skype/src/skype_transfers.cpp index a6f5fc5cab..a6f5fc5cab 100644 --- a/protocols/Skype/src/skype_transfers.cpp +++ b/plugins/!Deprecated/Skype/src/skype_transfers.cpp diff --git a/protocols/Skype/src/skype_utils.cpp b/plugins/!Deprecated/Skype/src/skype_utils.cpp index f8c410513d..f8c410513d 100644 --- a/protocols/Skype/src/skype_utils.cpp +++ b/plugins/!Deprecated/Skype/src/skype_utils.cpp diff --git a/protocols/Skype/src/skypekit/account.cpp b/plugins/!Deprecated/Skype/src/skypekit/account.cpp index 8ec02e08e8..8ec02e08e8 100644 --- a/protocols/Skype/src/skypekit/account.cpp +++ b/plugins/!Deprecated/Skype/src/skypekit/account.cpp diff --git a/protocols/Skype/src/skypekit/account.h b/plugins/!Deprecated/Skype/src/skypekit/account.h index a7128598ee..a7128598ee 100644 --- a/protocols/Skype/src/skypekit/account.h +++ b/plugins/!Deprecated/Skype/src/skypekit/account.h diff --git a/protocols/Skype/src/skypekit/common.h b/plugins/!Deprecated/Skype/src/skypekit/common.h index de00501ba3..de00501ba3 100644 --- a/protocols/Skype/src/skypekit/common.h +++ b/plugins/!Deprecated/Skype/src/skypekit/common.h diff --git a/protocols/Skype/src/skypekit/contact.cpp b/plugins/!Deprecated/Skype/src/skypekit/contact.cpp index c7a1a3247d..c7a1a3247d 100644 --- a/protocols/Skype/src/skypekit/contact.cpp +++ b/plugins/!Deprecated/Skype/src/skypekit/contact.cpp diff --git a/protocols/Skype/src/skypekit/contact.h b/plugins/!Deprecated/Skype/src/skypekit/contact.h index 4a79ba723d..4a79ba723d 100644 --- a/protocols/Skype/src/skypekit/contact.h +++ b/plugins/!Deprecated/Skype/src/skypekit/contact.h diff --git a/protocols/Skype/src/skypekit/conversation.cpp b/plugins/!Deprecated/Skype/src/skypekit/conversation.cpp index ff393c8efb..ff393c8efb 100644 --- a/protocols/Skype/src/skypekit/conversation.cpp +++ b/plugins/!Deprecated/Skype/src/skypekit/conversation.cpp diff --git a/protocols/Skype/src/skypekit/conversation.h b/plugins/!Deprecated/Skype/src/skypekit/conversation.h index 3441743328..3441743328 100644 --- a/protocols/Skype/src/skypekit/conversation.h +++ b/plugins/!Deprecated/Skype/src/skypekit/conversation.h diff --git a/protocols/Skype/src/skypekit/group.cpp b/plugins/!Deprecated/Skype/src/skypekit/group.cpp index a75c43d371..a75c43d371 100644 --- a/protocols/Skype/src/skypekit/group.cpp +++ b/plugins/!Deprecated/Skype/src/skypekit/group.cpp diff --git a/protocols/Skype/src/skypekit/group.h b/plugins/!Deprecated/Skype/src/skypekit/group.h index 0443d203ea..0443d203ea 100644 --- a/protocols/Skype/src/skypekit/group.h +++ b/plugins/!Deprecated/Skype/src/skypekit/group.h diff --git a/protocols/Skype/src/skypekit/message.cpp b/plugins/!Deprecated/Skype/src/skypekit/message.cpp index 48afa08662..48afa08662 100644 --- a/protocols/Skype/src/skypekit/message.cpp +++ b/plugins/!Deprecated/Skype/src/skypekit/message.cpp diff --git a/protocols/Skype/src/skypekit/message.h b/plugins/!Deprecated/Skype/src/skypekit/message.h index 6bf1eda497..6bf1eda497 100644 --- a/protocols/Skype/src/skypekit/message.h +++ b/plugins/!Deprecated/Skype/src/skypekit/message.h diff --git a/protocols/Skype/src/skypekit/participant.cpp b/plugins/!Deprecated/Skype/src/skypekit/participant.cpp index 41e183821b..41e183821b 100644 --- a/protocols/Skype/src/skypekit/participant.cpp +++ b/plugins/!Deprecated/Skype/src/skypekit/participant.cpp diff --git a/protocols/Skype/src/skypekit/participant.h b/plugins/!Deprecated/Skype/src/skypekit/participant.h index 170c14f1b7..170c14f1b7 100644 --- a/protocols/Skype/src/skypekit/participant.h +++ b/plugins/!Deprecated/Skype/src/skypekit/participant.h diff --git a/protocols/Skype/src/skypekit/search.cpp b/plugins/!Deprecated/Skype/src/skypekit/search.cpp index f1b20563aa..f1b20563aa 100644 --- a/protocols/Skype/src/skypekit/search.cpp +++ b/plugins/!Deprecated/Skype/src/skypekit/search.cpp diff --git a/protocols/Skype/src/skypekit/search.h b/plugins/!Deprecated/Skype/src/skypekit/search.h index dde9a043e3..dde9a043e3 100644 --- a/protocols/Skype/src/skypekit/search.h +++ b/plugins/!Deprecated/Skype/src/skypekit/search.h diff --git a/protocols/Skype/src/skypekit/transfer.cpp b/plugins/!Deprecated/Skype/src/skypekit/transfer.cpp index 60a41bdcfe..60a41bdcfe 100644 --- a/protocols/Skype/src/skypekit/transfer.cpp +++ b/plugins/!Deprecated/Skype/src/skypekit/transfer.cpp diff --git a/protocols/Skype/src/skypekit/transfer.h b/plugins/!Deprecated/Skype/src/skypekit/transfer.h index f01d48d328..f01d48d328 100644 --- a/protocols/Skype/src/skypekit/transfer.h +++ b/plugins/!Deprecated/Skype/src/skypekit/transfer.h diff --git a/protocols/Skype/src/stdafx.cpp b/plugins/!Deprecated/Skype/src/stdafx.cpp index 102b3be23c..102b3be23c 100644 --- a/protocols/Skype/src/stdafx.cpp +++ b/plugins/!Deprecated/Skype/src/stdafx.cpp diff --git a/protocols/Skype/src/string_list.h b/plugins/!Deprecated/Skype/src/string_list.h index 7cf3b0aee7..7cf3b0aee7 100644 --- a/protocols/Skype/src/string_list.h +++ b/plugins/!Deprecated/Skype/src/string_list.h diff --git a/protocols/Skype/src/version.h b/plugins/!Deprecated/Skype/src/version.h index 11d4ede64f..11d4ede64f 100644 --- a/protocols/Skype/src/version.h +++ b/plugins/!Deprecated/Skype/src/version.h diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index d93331eb5d..8edb1431e8 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -521,6 +521,8 @@ static renameTable[] = { _T("dbx_tree.dll"), _T("Plugins\\dbx_mmap.dll") },
{ _T("rc4.dll"), NULL },
{ _T("athena.dll"), NULL },
+ { _T("skype.dll"), NULL },
+ { _T("skypekit.exe"), NULL },
#else
{ _T("skype.dll"), _T("Plugins\\skypeclassic.dll") },
#endif
|