added statusex support. needs for different nicks color when they away or dnd

git-svn-id: http://svn.miranda-ng.org/main/trunk@5233 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 38 insertions, 13 deletions

diff --git a/protocols/Skype/Skype_10.vcxproj b/protocols/Skype/Skype_10.vcxproj
index 3e31546131..ba648329af 100644
--- a/protocols/Skype/Skype_10.vcxproj
+++ b/protocols/Skype/Skype_10.vcxproj
@@ -93,8 +93,6 @@
       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib;$(ProfileDir)..\..\..\SkypeKit\SDK\lib\Debug</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <AdditionalDependencies>comctl32.lib;Shlwapi.lib;Ws2_32.lib;Advapi32.lib;skypekit-cyassl_lib_x86.lib;skypekit-cppwrapper_2_lib_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <IgnoreAllDefaultLibraries>

-      </IgnoreAllDefaultLibraries>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

@@ -123,8 +121,6 @@
       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib;$(ProfileDir)..\..\..\SkypeKit\SDK\lib\Debug</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <AdditionalDependencies>comctl32.lib;Shlwapi.lib;Ws2_32.lib;Advapi32.lib;skypekit-cyassl_lib_x64.lib;skypekit-cppwrapper_2_lib_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <IgnoreAllDefaultLibraries>

-      </IgnoreAllDefaultLibraries>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

@@ -240,7 +236,6 @@
     </ClCompile>

     <ClCompile Include="src\skype_account.cpp" />

     <ClCompile Include="src\skype_avatars.cpp" />

-    <ClCompile Include="src\skype_blocked.cpp" />

     <ClCompile Include="src\skype_chat.cpp" />

     <ClCompile Include="src\skype_contacts.cpp" />

     <ClCompile Include="src\skype_database.cpp" />

@@ -248,6 +243,7 @@
     <ClCompile Include="src\skype_events.cpp" />

     <ClCompile Include="src\skype_hooks.cpp" />

     <ClCompile Include="src\skype_icons.cpp" />

+    <ClCompile Include="src\skype_blocked.cpp" />

     <ClCompile Include="src\skype_instances.cpp" />

     <ClCompile Include="src\skype_menus.cpp" />

     <ClCompile Include="src\skype_messages.cpp" />

@@ -279,6 +275,12 @@
     <None Include="res\delete.ico" />

     <None Include="res\send_contacts.ico" />

   </ItemGroup>

+  <ItemGroup>

+    <Image Include="res\add_contacts.ico" />

+    <Image Include="res\conference.ico" />

+    <Image Include="res\contact.ico" />

+    <Image Include="res\skype.ico" />

+  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/protocols/Skype/Skype_10.vcxproj.filters b/protocols/Skype/Skype_10.vcxproj.filters
index fc66a5a84e..b6d1e7155f 100644
--- a/protocols/Skype/Skype_10.vcxproj.filters
+++ b/protocols/Skype/Skype_10.vcxproj.filters
@@ -211,4 +211,18 @@
       <Filter>Resource Files\Icons</Filter>

     </None>

   </ItemGroup>

+  <ItemGroup>

+    <Image Include="res\add_contacts.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\conference.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\contact.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\skype.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Skype/Skype_11.vcxproj b/protocols/Skype/Skype_11.vcxproj
index 547bee7d22..4d519677b7 100644
--- a/protocols/Skype/Skype_11.vcxproj
+++ b/protocols/Skype/Skype_11.vcxproj
@@ -274,7 +274,6 @@
     <None Include="res\conf_spawn.ico" />

     <None Include="res\main.ico" />

     <None Include="res\block.ico" />

-    <None Include="res\bookmark.ico" />

     <None Include="res\delete.ico" />

     <None Include="res\send_contacts.ico" />

   </ItemGroup>

diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters
index 6f943212fd..b6d1e7155f 100644
--- a/protocols/Skype/Skype_11.vcxproj.filters
+++ b/protocols/Skype/Skype_11.vcxproj.filters
@@ -207,17 +207,22 @@
     <None Include="res\block.ico">

       <Filter>Resource Files\Icons</Filter>

     </None>

-    <None Include="res\bookmark.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

     <None Include="res\delete.ico">

       <Filter>Resource Files\Icons</Filter>

     </None>

   </ItemGroup>

   <ItemGroup>

-    <Image Include="res\skype.ico" />

-    <Image Include="res\add_contacts.ico" />

-    <Image Include="res\conference.ico" />

-    <Image Include="res\contact.ico" />

+    <Image Include="res\add_contacts.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\conference.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\contact.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\skype.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp
index cde19dac34..6425e56207 100644
--- a/protocols/Skype/src/skype_chat.cpp
+++ b/protocols/Skype/src/skype_chat.cpp
@@ -531,6 +531,11 @@ void ChatRoom::UpdateMemberStatus(ChatMember *member, int status, DWORD timestam
 {

 	if (member->GetStatus() != status)

 	{

+		if (status == ID_STATUS_AWAY || status == ID_STATUS_DND)

+			this->SendEvent(*member, GC_EVENT_SETSTATUSEX, timestamp, 0, 3, (const wchar_t*)0, member->GetSid());

+		else

+			this->SendEvent(*member, GC_EVENT_SETSTATUSEX, timestamp, 0, 1, (const wchar_t*)0, member->GetSid());

+

 		this->SendEvent(*member, GC_EVENT_SETCONTACTSTATUS, timestamp, 0, status);

 		member->SetStatus(status);

 	}