diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-04-15 07:08:28 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-04-15 07:08:28 +0000 |
| commit | 051a635f6b0046f9c63a5f457b39573b366e636d (patch) | |
| tree | d8413127b3f92d8041d3a08a70f53b82b6b64e73 /protocols | |
| parent | 15d5272cf14ce1cf3953950ee943a4f2a0cc378f (diff) | |
chats enabled:
may contain various bugs
git-svn-id: http://svn.miranda-ng.org/main/trunk@4454 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Skype/Skype_11.vcxproj | 1 | ||||
| -rw-r--r-- | protocols/Skype/Skype_11.vcxproj.filters | 27 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_chat.cpp | 4 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_events.cpp | 2 |
4 files changed, 25 insertions, 9 deletions
diff --git a/protocols/Skype/Skype_11.vcxproj b/protocols/Skype/Skype_11.vcxproj index 2e5b50fb89..05693a6037 100644 --- a/protocols/Skype/Skype_11.vcxproj +++ b/protocols/Skype/Skype_11.vcxproj @@ -184,6 +184,7 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClInclude Include="src\aes\aes.h" />
<ClInclude Include="src\base64\base64.h" />
<ClInclude Include="src\skype_subclassing.h" />
<ClInclude Include="src\skype.h" />
diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters index 520432a767..5e1e508cf7 100644 --- a/protocols/Skype/Skype_11.vcxproj.filters +++ b/protocols/Skype/Skype_11.vcxproj.filters @@ -10,6 +10,18 @@ <Filter Include="Header Files">
<UniqueIdentifier>{b14a0070-da9c-49e8-8a47-d93df5eed672}</UniqueIdentifier>
</Filter>
+ <Filter Include="Source Files\aes">
+ <UniqueIdentifier>{7c2516e2-5857-4de1-aa39-218fe52d0363}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\base64">
+ <UniqueIdentifier>{12057a87-be97-495a-b259-12818d4676b7}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\aes">
+ <UniqueIdentifier>{47fb7bb0-5020-4279-9e3d-1b747260f167}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\base64">
+ <UniqueIdentifier>{dea402cc-aae5-43fb-be3b-18687bc615e2}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\skype.cpp">
@@ -66,14 +78,14 @@ <ClCompile Include="src\skype_runtime.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\aes\aes.c">
+ <ClCompile Include="src\skype_transfer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\base64\base64.cpp">
- <Filter>Source Files</Filter>
+ <ClCompile Include="src\aes\aes.c">
+ <Filter>Source Files\aes</Filter>
</ClCompile>
- <ClCompile Include="src\skype_transfer.cpp">
- <Filter>Source Files</Filter>
+ <ClCompile Include="src\base64\base64.cpp">
+ <Filter>Source Files\base64</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@@ -93,7 +105,10 @@ <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\base64\base64.h">
- <Filter>Header Files</Filter>
+ <Filter>Header Files\base64</Filter>
+ </ClInclude>
+ <ClInclude Include="src\aes\aes.h">
+ <Filter>Header Files\aes</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 9f4979291d..6da1496e51 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -142,11 +142,11 @@ void CSkypeProto::InitChat() {
GCREGISTER gcr = {0};
gcr.cbSize = sizeof(gcr);
- gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR;
+ gcr.dwFlags = GC_TCHAR | GC_TYPNOTIF | GC_CHANMGR;
gcr.iMaxText = 0;
gcr.nColors = 16;
gcr.pColors = (COLORREF*)crCols;
- gcr.pszModuleDispName = ::mir_u2a(this->m_tszUserName);
+ gcr.ptszModuleDispName = this->m_tszUserName;
gcr.pszModule = this->m_szModuleName;
CallServiceSync(MS_GC_REGISTER, 0, (LPARAM)&gcr);
diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index 195b4b4696..82b24a16ba 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -4,7 +4,7 @@ int CSkypeProto::OnModulesLoaded(WPARAM, LPARAM) {
this->InitSkype();
- //this->InitChat();
+ this->InitChat();
this->InitNetLib();
this->InitCustomFolders();
|