diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-06-10 08:55:41 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-06-10 08:55:41 +0000 |
| commit | df428745363d5b3d22f2a737930ca0e7af8e2221 (patch) | |
| tree | cb09a34111a835bfb079256c4f5d23ea26351c4d /protocols | |
| parent | 5cad65e7fb3f8ffaad2355d0b85d980cc5ef07c3 (diff) | |
small cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@4906 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Skype/Skype_10.vcxproj.filters | 5 | ||||
| -rw-r--r-- | protocols/Skype/Skype_11.vcxproj.filters | 18 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_instances.cpp | 5 |
3 files changed, 19 insertions, 9 deletions
diff --git a/protocols/Skype/Skype_10.vcxproj.filters b/protocols/Skype/Skype_10.vcxproj.filters index dad133ab2a..8c14493215 100644 --- a/protocols/Skype/Skype_10.vcxproj.filters +++ b/protocols/Skype/Skype_10.vcxproj.filters @@ -205,4 +205,9 @@ <Filter>Resource Files\Icons</Filter>
</None>
</ItemGroup>
+ <ItemGroup>
+ <Image Include="res\send_contacts.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters index e4e52e2a0e..8c14493215 100644 --- a/protocols/Skype/Skype_11.vcxproj.filters +++ b/protocols/Skype/Skype_11.vcxproj.filters @@ -60,9 +60,6 @@ <ClCompile Include="src\skype_database.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\skype_profile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="src\skype_account.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -102,21 +99,24 @@ <ClCompile Include="src\skype_hooks.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\skype_own_info.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="src\skype_messages.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\skype_transfers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\skype_runtime.cpp">
+ <ClCompile Include="src\skype_own_info.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\skype_profile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\skype_skype.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\skype_runtime.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\resource.h">
@@ -206,6 +206,8 @@ </None>
</ItemGroup>
<ItemGroup>
- <Image Include="res\send_contacts.ico" />
+ <Image Include="res\send_contacts.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/protocols/Skype/src/skype_instances.cpp b/protocols/Skype/src/skype_instances.cpp index 935ecf73d0..2875311c3f 100644 --- a/protocols/Skype/src/skype_instances.cpp +++ b/protocols/Skype/src/skype_instances.cpp @@ -9,7 +9,7 @@ int CSkypeProto::CompareProtos(const CSkypeProto *p1, const CSkypeProto *p2) CSkypeProto* CSkypeProto::InitSkypeProto(const char* protoName, const wchar_t* userName)
{
- if (CSkypeProto::instanceList.getCount() > 0)
+ if (CSkypeProto::instanceList.getCount() > 0)
{
CSkypeProto::ShowNotification(
::TranslateT("SkypeKit will only permit you to login to one account at a time.\nAdding multiple instances of SkypeKit is prohibited in the licence agreement and standard distribution terms."),
@@ -31,6 +31,7 @@ CSkypeProto* CSkypeProto::InitSkypeProto(const char* protoName, const wchar_t* u if ( !keyPair)
{
CSkypeProto::ShowNotification(::TranslateT("Initialization key corrupted or not valid."));
+ ppro->StopSkypeRuntime();
return NULL;
}
@@ -38,12 +39,14 @@ CSkypeProto* CSkypeProto::InitSkypeProto(const char* protoName, const wchar_t* u if (status != TransportInterface::OK)
{
CSkypeProto::ShowNotification(::TranslateT("SkypeKit did not initialize."));
+ ppro->StopSkypeRuntime();
return NULL;
}
if ( !ppro->start())
{
::MessageBox(NULL, TranslateT("SkypeKit did not start."), _T(MODULE), MB_OK | MB_ICONERROR);
+ ppro->StopSkypeRuntime();
return NULL;
}
|