SkypeClassic: Folders structure and project cleanup

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

45 files changed, 174 insertions, 325 deletions

diff --git a/protocols/SkypeClassic/Skript1.aps b/protocols/SkypeClassic/Skript1.aps
deleted file mode 100644
index d99f14a71e..0000000000
--- a/protocols/SkypeClassic/Skript1.aps
+++ /dev/null
diff --git a/protocols/SkypeClassic/SkypeClassic_10.vcxproj b/protocols/SkypeClassic/SkypeClassic_10.vcxproj
index 78f59c77ca..0d5715e233 100644
--- a/protocols/SkypeClassic/SkypeClassic_10.vcxproj
+++ b/protocols/SkypeClassic/SkypeClassic_10.vcxproj
@@ -50,6 +50,81 @@
       <Platform>x64</Platform>

     </ProjectConfiguration>

   </ItemGroup>

+  <ItemGroup>

+    <None Include="res\8060.ico" />

+    <None Include="res\add.ico" />

+    <None Include="res\add2.ico" />

+    <None Include="res\auth.ico" />

+    <None Include="res\away.ico" />

+    <None Include="res\call.bmp" />

+    <None Include="res\call.ico" />

+    <None Include="res\chat.ico" />

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

+    <None Include="res\Copy of online.ico" />

+    <None Include="res\DND.ico" />

+    <None Include="res\error.ico" />

+    <None Include="res\hang_up.ico" />

+    <None Include="res\history.ico" />

+    <None Include="res\hold.ico" />

+    <None Include="res\import.ico" />

+    <None Include="res\invisible.ico" />

+    <None Include="res\Invite.ico" />

+    <None Include="res\message.ico" />

+    <None Include="res\NA.ico" />

+    <None Include="res\occupied.ico" />

+    <None Include="res\offline.ico" />

+    <None Include="res\online.ico" />

+    <None Include="res\pause.ico" />

+    <None Include="res\phone.ico" />

+    <None Include="res\resume.ico" />

+    <None Include="res\search.ico" />

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

+    <None Include="res\skypeout.ico" />

+    <None Include="res\skyping.ico" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\Resource.rc" />

+    <ResourceCompile Include="res\Version.rc" />

+  </ItemGroup>

+  <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\alogon.h" />

+    <ClInclude Include="src\contacts.h" />

+    <ClInclude Include="src\debug.h" />

+    <ClInclude Include="src\gchat.h" />

+    <ClInclude Include="src\memlist.h" />

+    <ClInclude Include="src\msglist.h" />

+    <ClInclude Include="src\msgq.h" />

+    <ClInclude Include="src\pthread.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\skype.h" />

+    <ClInclude Include="src\skypeapi.h" />

+    <ClInclude Include="src\skypeopt.h" />

+    <ClInclude Include="src\skypeprofile.h" />

+    <ClInclude Include="src\skypeproxy.h" />

+    <ClInclude Include="src\skypesvc.h" />

+    <ClInclude Include="src\utf8.h" />

+    <ClInclude Include="src\util.h" />

+    <ClInclude Include="src\version.h" />

+    <ClInclude Include="src\voiceservice.h" />

+  </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{5F9243AE-C6C9-4F42-B670-67A97767A50B}</ProjectGuid>

     <RootNamespace>Skype_protocol</RootNamespace>

@@ -997,252 +1072,6 @@
       </OutputFile>

     </Bscmake>

   </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="alogon.cpp" />

-    <ClCompile Include="contacts.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="debug.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="gchat.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="memlist.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="msglist.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="msgq.cpp" />

-    <ClCompile Include="pthread.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="skype.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="skypeapi.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="skypeopt.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="skypeprofile.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="skypesvc.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="utf8.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="util.cpp" />

-    <ClCompile Include="voiceservice.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="alogon.h" />

-    <ClInclude Include="contacts.h" />

-    <ClInclude Include="debug.h" />

-    <ClInclude Include="gchat.h" />

-    <ClInclude Include="msgq.h" />

-    <ClInclude Include="memlist.h" />

-    <ClInclude Include="msglist.h" />

-    <ClInclude Include="pthread.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="skype.h" />

-    <ClInclude Include="skypeapi.h" />

-    <ClInclude Include="skypeopt.h" />

-    <ClInclude Include="skypeprofile.h" />

-    <ClInclude Include="skypesvc.h" />

-    <ClInclude Include="utf8.h" />

-    <ClInclude Include="util.h" />

-    <ClInclude Include="voiceservice.h" />

-  </ItemGroup>

-  <ItemGroup>

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

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

-    <None Include="res\call.bmp" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    <None Include="changelog.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="Skript1.rc">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='ANSI Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='x64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ResourceCompile>

-  </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/protocols/SkypeClassic/changelog.txt b/protocols/SkypeClassic/docs/changelog.txt
index 60526b1116..60526b1116 100644
--- a/protocols/SkypeClassic/changelog.txt
+++ b/protocols/SkypeClassic/docs/changelog.txt
diff --git a/protocols/SkypeClassic/readme.txt b/protocols/SkypeClassic/docs/readme.txt
index 333f92d90a..333f92d90a 100644
--- a/protocols/SkypeClassic/readme.txt
+++ b/protocols/SkypeClassic/docs/readme.txt
diff --git a/protocols/SkypeClassic/Skript1.rc b/protocols/SkypeClassic/res/Resource.rc
index f93a1fae83..188ed1cbc3 100644
--- a/protocols/SkypeClassic/Skript1.rc
+++ b/protocols/SkypeClassic/res/Resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -356,71 +356,26 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_SKYPE               ICON    DISCARDABLE     "res\\skype.ico"

-IDI_INVITE              ICON    DISCARDABLE     "res\\Invite.ico"

-IDI_ADD                 ICON    DISCARDABLE     "res\\add.ico"

-IDI_IMPORT              ICON    DISCARDABLE     "res\\import.ico"

-IDI_ERRORS              ICON    DISCARDABLE     "res\\error.ico"

-IDI_MESSAGE             ICON    DISCARDABLE     "res\\message.ico"

-IDI_CALL                ICON    DISCARDABLE     "res\\call.ico"

-IDI_CALLSKYPEOUT        ICON    DISCARDABLE     "res\\skypeout.ico"

-IDI_HOLD                ICON    DISCARDABLE     "res\\hold.ico"

-IDI_RESUME              ICON    DISCARDABLE     "res\\resume.ico"

-IDI_HANGUP              ICON    DISCARDABLE     "res\\hang_up.ico"

-IDI_ONLINE              ICON    DISCARDABLE     "res\\online.ico"

-IDI_CHAT                ICON    DISCARDABLE     "res\\chat.ico"

-IDI_AWAY                ICON    DISCARDABLE     "res\\away.ico"

-IDI_NA                  ICON    DISCARDABLE     "res\\na.ico"

-IDI_OCCUPIED            ICON    DISCARDABLE     "res\\occupied.ico"

-IDI_DND                 ICON    DISCARDABLE     "res\\dnd.ico"

-IDI_INVISIBLE           ICON    DISCARDABLE     "res\\invisible.ico"

-IDI_OFFLINE             ICON    DISCARDABLE     "res\\offline.ico"

-IDI_PHONE               ICON    DISCARDABLE     "res\\phone.ico"

-

-#ifndef _MAC

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,0,54

- PRODUCTVERSION 0,0,0,54

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "Comments", "\0"

-            VALUE "CompanyName", "Miranda IM community\0"

-            VALUE "FileDescription", "Skype\0"

-            VALUE "FileVersion", "0, 0, 0, 54\0"

-            VALUE "InternalName", "Skype\0"

-            VALUE "LegalCopyright", "Copyright © 2007-2012 leecher - tweety - jls17\0"

-            VALUE "LegalTrademarks", "\0"

-            VALUE "OriginalFilename", "Skype.dll\0"

-            VALUE "PrivateBuild", "\0"

-            VALUE "ProductName", "Skype Protocol for Miranda IM\0"

-            VALUE "ProductVersion", "0, 0, 0, 54\0"

-            VALUE "SpecialBuild", "\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

-

-#endif    // !_MAC

+IDI_SKYPE               ICON    DISCARDABLE     "skype.ico"

+IDI_INVITE              ICON    DISCARDABLE     "Invite.ico"

+IDI_ADD                 ICON    DISCARDABLE     "add.ico"

+IDI_IMPORT              ICON    DISCARDABLE     "import.ico"

+IDI_ERRORS              ICON    DISCARDABLE     "error.ico"

+IDI_MESSAGE             ICON    DISCARDABLE     "message.ico"

+IDI_CALL                ICON    DISCARDABLE     "call.ico"

+IDI_CALLSKYPEOUT        ICON    DISCARDABLE     "skypeout.ico"

+IDI_HOLD                ICON    DISCARDABLE     "hold.ico"

+IDI_RESUME              ICON    DISCARDABLE     "resume.ico"

+IDI_HANGUP              ICON    DISCARDABLE     "hang_up.ico"

+IDI_ONLINE              ICON    DISCARDABLE     "online.ico"

+IDI_CHAT                ICON    DISCARDABLE     "chat.ico"

+IDI_AWAY                ICON    DISCARDABLE     "away.ico"

+IDI_NA                  ICON    DISCARDABLE     "na.ico"

+IDI_OCCUPIED            ICON    DISCARDABLE     "occupied.ico"

+IDI_DND                 ICON    DISCARDABLE     "dnd.ico"

+IDI_INVISIBLE           ICON    DISCARDABLE     "invisible.ico"

+IDI_OFFLINE             ICON    DISCARDABLE     "offline.ico"

+IDI_PHONE               ICON    DISCARDABLE     "phone.ico"

 

 

 /////////////////////////////////////////////////////////////////////////////

@@ -448,18 +403,18 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE MOVEABLE PURE 

+1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

-2 TEXTINCLUDE MOVEABLE PURE 

+2 TEXTINCLUDE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE MOVEABLE PURE 

+3 TEXTINCLUDE 

 BEGIN

     "\r\n"

     "\0"

diff --git a/protocols/SkypeClassic/res/Version.rc b/protocols/SkypeClassic/res/Version.rc
new file mode 100644
index 0000000000..d741488c4f
--- /dev/null
+++ b/protocols/SkypeClassic/res/Version.rc
@@ -0,0 +1,42 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

+#include "..\src\version.h"

+

+#ifdef _WIN32

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#endif //_WIN32

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/protocols/SkypeClassic/alogon.cpp b/protocols/SkypeClassic/src/alogon.cpp
index 8002d495fc..8002d495fc 100644
--- a/protocols/SkypeClassic/alogon.cpp
+++ b/protocols/SkypeClassic/src/alogon.cpp
diff --git a/protocols/SkypeClassic/alogon.h b/protocols/SkypeClassic/src/alogon.h
index 00d2e7e703..00d2e7e703 100644
--- a/protocols/SkypeClassic/alogon.h
+++ b/protocols/SkypeClassic/src/alogon.h
diff --git a/protocols/SkypeClassic/contacts.cpp b/protocols/SkypeClassic/src/contacts.cpp
index 8e25ae7c9d..8e25ae7c9d 100644
--- a/protocols/SkypeClassic/contacts.cpp
+++ b/protocols/SkypeClassic/src/contacts.cpp
diff --git a/protocols/SkypeClassic/contacts.h b/protocols/SkypeClassic/src/contacts.h
index 35a400c3e9..35a400c3e9 100644
--- a/protocols/SkypeClassic/contacts.h
+++ b/protocols/SkypeClassic/src/contacts.h
diff --git a/protocols/SkypeClassic/debug.cpp b/protocols/SkypeClassic/src/debug.cpp
index a5d7067e8e..a5d7067e8e 100644
--- a/protocols/SkypeClassic/debug.cpp
+++ b/protocols/SkypeClassic/src/debug.cpp
diff --git a/protocols/SkypeClassic/debug.h b/protocols/SkypeClassic/src/debug.h
index 9582246251..9582246251 100644
--- a/protocols/SkypeClassic/debug.h
+++ b/protocols/SkypeClassic/src/debug.h
diff --git a/protocols/SkypeClassic/ezxml/ezxml.c b/protocols/SkypeClassic/src/ezxml/ezxml.c
index 24c02fbd70..24c02fbd70 100644
--- a/protocols/SkypeClassic/ezxml/ezxml.c
+++ b/protocols/SkypeClassic/src/ezxml/ezxml.c
diff --git a/protocols/SkypeClassic/ezxml/ezxml.h b/protocols/SkypeClassic/src/ezxml/ezxml.h
index 3e020788b4..3e020788b4 100644
--- a/protocols/SkypeClassic/ezxml/ezxml.h
+++ b/protocols/SkypeClassic/src/ezxml/ezxml.h
diff --git a/protocols/SkypeClassic/gchat.cpp b/protocols/SkypeClassic/src/gchat.cpp
index 6964bf8c09..6964bf8c09 100644
--- a/protocols/SkypeClassic/gchat.cpp
+++ b/protocols/SkypeClassic/src/gchat.cpp
diff --git a/protocols/SkypeClassic/gchat.h b/protocols/SkypeClassic/src/gchat.h
index f9bd283320..f9bd283320 100644
--- a/protocols/SkypeClassic/gchat.h
+++ b/protocols/SkypeClassic/src/gchat.h
diff --git a/protocols/SkypeClassic/memlist.cpp b/protocols/SkypeClassic/src/memlist.cpp
index b14133ef57..b14133ef57 100644
--- a/protocols/SkypeClassic/memlist.cpp
+++ b/protocols/SkypeClassic/src/memlist.cpp
diff --git a/protocols/SkypeClassic/memlist.h b/protocols/SkypeClassic/src/memlist.h
index 7c147d37eb..7c147d37eb 100644
--- a/protocols/SkypeClassic/memlist.h
+++ b/protocols/SkypeClassic/src/memlist.h
diff --git a/protocols/SkypeClassic/msglist.cpp b/protocols/SkypeClassic/src/msglist.cpp
index aedb4d1257..aedb4d1257 100644
--- a/protocols/SkypeClassic/msglist.cpp
+++ b/protocols/SkypeClassic/src/msglist.cpp
diff --git a/protocols/SkypeClassic/msglist.h b/protocols/SkypeClassic/src/msglist.h
index 66a271ef18..66a271ef18 100644
--- a/protocols/SkypeClassic/msglist.h
+++ b/protocols/SkypeClassic/src/msglist.h
diff --git a/protocols/SkypeClassic/msgq.cpp b/protocols/SkypeClassic/src/msgq.cpp
index e1ab0d1998..e1ab0d1998 100644
--- a/protocols/SkypeClassic/msgq.cpp
+++ b/protocols/SkypeClassic/src/msgq.cpp
diff --git a/protocols/SkypeClassic/msgq.h b/protocols/SkypeClassic/src/msgq.h
index 4eb666944b..4eb666944b 100644
--- a/protocols/SkypeClassic/msgq.h
+++ b/protocols/SkypeClassic/src/msgq.h
diff --git a/protocols/SkypeClassic/pthread.cpp b/protocols/SkypeClassic/src/pthread.cpp
index 12da5a7a4f..12da5a7a4f 100644
--- a/protocols/SkypeClassic/pthread.cpp
+++ b/protocols/SkypeClassic/src/pthread.cpp
diff --git a/protocols/SkypeClassic/pthread.h b/protocols/SkypeClassic/src/pthread.h
index 1c9f3e3924..1c9f3e3924 100644
--- a/protocols/SkypeClassic/pthread.h
+++ b/protocols/SkypeClassic/src/pthread.h
diff --git a/protocols/SkypeClassic/resource.h b/protocols/SkypeClassic/src/resource.h
index 5f57feb9a3..5f57feb9a3 100644
--- a/protocols/SkypeClassic/resource.h
+++ b/protocols/SkypeClassic/src/resource.h
diff --git a/protocols/SkypeClassic/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index 495ff50da2..4c66594dd1 100644
--- a/protocols/SkypeClassic/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -164,15 +164,16 @@ int FreeVSApi()
 // Plugin Info

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	"Skype Protocol",

-	PLUGIN_MAKE_VERSION(0,0,0,54),

-	"Support for Skype network",

-	"leecher - tweety - jls17",

-	"leecher@dose.0wnz.at - tweety@user.berlios.de",

-	"© 2004-2012 leecher - tweety",

-	"http://developer.berlios.de/projects/mgoodies/",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	{ 0xa71f8335, 0x7b87, 0x4432, { 0xb8, 0xa3, 0x81, 0x47, 0x94, 0x31, 0xc6, 0xf5 } } // {A71F8335-7B87-4432-B8A3-81479431C6F5}

+	// {A71F8335-7B87-4432-B8A3-81479431C6F5}

+	{0xa71f8335, 0x7b87, 0x4432, {0xb8, 0xa3, 0x81, 0x47, 0x94, 0x31, 0xc6, 0xf5}}

 };

 

 #define MAPDND	1	// Map Occupied to DND status and say that you support it

diff --git a/protocols/SkypeClassic/skype.h b/protocols/SkypeClassic/src/skype.h
index b5afb7e8f1..3c7fd2b927 100644
--- a/protocols/SkypeClassic/skype.h
+++ b/protocols/SkypeClassic/src/skype.h
@@ -14,11 +14,13 @@
 #include <commctrl.h>

 #include <process.h>

 #include <time.h>

-#include "resource.h"

 #include <stdlib.h>

 #include <stddef.h>

 #include <shlobj.h>

 #include <time.h>

+

+#include "resource.h"

+#include "version.h"

 #include "util.h"

 

 #pragma warning (push)

diff --git a/protocols/SkypeClassic/skypeapi.cpp b/protocols/SkypeClassic/src/skypeapi.cpp
index 966972f8fe..966972f8fe 100644
--- a/protocols/SkypeClassic/skypeapi.cpp
+++ b/protocols/SkypeClassic/src/skypeapi.cpp
diff --git a/protocols/SkypeClassic/skypeapi.h b/protocols/SkypeClassic/src/skypeapi.h
index fa4f5139a1..fa4f5139a1 100644
--- a/protocols/SkypeClassic/skypeapi.h
+++ b/protocols/SkypeClassic/src/skypeapi.h
diff --git a/protocols/SkypeClassic/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp
index 078770d1a6..078770d1a6 100644
--- a/protocols/SkypeClassic/skypeopt.cpp
+++ b/protocols/SkypeClassic/src/skypeopt.cpp
diff --git a/protocols/SkypeClassic/skypeopt.h b/protocols/SkypeClassic/src/skypeopt.h
index 23aa7a5212..23aa7a5212 100644
--- a/protocols/SkypeClassic/skypeopt.h
+++ b/protocols/SkypeClassic/src/skypeopt.h
diff --git a/protocols/SkypeClassic/skypeprofile.cpp b/protocols/SkypeClassic/src/skypeprofile.cpp
index 168dbfa97c..168dbfa97c 100644
--- a/protocols/SkypeClassic/skypeprofile.cpp
+++ b/protocols/SkypeClassic/src/skypeprofile.cpp
diff --git a/protocols/SkypeClassic/skypeprofile.h b/protocols/SkypeClassic/src/skypeprofile.h
index 5902f865c3..5902f865c3 100644
--- a/protocols/SkypeClassic/skypeprofile.h
+++ b/protocols/SkypeClassic/src/skypeprofile.h
diff --git a/protocols/SkypeClassic/skypeproxy.h b/protocols/SkypeClassic/src/skypeproxy.h
index 8e1490803e..8e1490803e 100644
--- a/protocols/SkypeClassic/skypeproxy.h
+++ b/protocols/SkypeClassic/src/skypeproxy.h
diff --git a/protocols/SkypeClassic/skypeproxy/skypeproxy.c b/protocols/SkypeClassic/src/skypeproxy/skypeproxy.c
index fff9c1b916..fff9c1b916 100644
--- a/protocols/SkypeClassic/skypeproxy/skypeproxy.c
+++ b/protocols/SkypeClassic/src/skypeproxy/skypeproxy.c
diff --git a/protocols/SkypeClassic/skypeproxy/skypeproxy.h b/protocols/SkypeClassic/src/skypeproxy/skypeproxy.h
index 8ce122990b..8ce122990b 100644
--- a/protocols/SkypeClassic/skypeproxy/skypeproxy.h
+++ b/protocols/SkypeClassic/src/skypeproxy/skypeproxy.h
diff --git a/protocols/SkypeClassic/skypesvc.cpp b/protocols/SkypeClassic/src/skypesvc.cpp
index bc8131b2c8..bc8131b2c8 100644
--- a/protocols/SkypeClassic/skypesvc.cpp
+++ b/protocols/SkypeClassic/src/skypesvc.cpp
diff --git a/protocols/SkypeClassic/skypesvc.h b/protocols/SkypeClassic/src/skypesvc.h
index 74c8cd37bf..74c8cd37bf 100644
--- a/protocols/SkypeClassic/skypesvc.h
+++ b/protocols/SkypeClassic/src/skypesvc.h
diff --git a/protocols/SkypeClassic/utf8.cpp b/protocols/SkypeClassic/src/utf8.cpp
index 8ae746e871..8ae746e871 100644
--- a/protocols/SkypeClassic/utf8.cpp
+++ b/protocols/SkypeClassic/src/utf8.cpp
diff --git a/protocols/SkypeClassic/utf8.h b/protocols/SkypeClassic/src/utf8.h
index 70c533deca..70c533deca 100644
--- a/protocols/SkypeClassic/utf8.h
+++ b/protocols/SkypeClassic/src/utf8.h
diff --git a/protocols/SkypeClassic/util.cpp b/protocols/SkypeClassic/src/util.cpp
index ce5ad9c756..ce5ad9c756 100644
--- a/protocols/SkypeClassic/util.cpp
+++ b/protocols/SkypeClassic/src/util.cpp
diff --git a/protocols/SkypeClassic/util.h b/protocols/SkypeClassic/src/util.h
index 181f5d1878..181f5d1878 100644
--- a/protocols/SkypeClassic/util.h
+++ b/protocols/SkypeClassic/src/util.h
diff --git a/protocols/SkypeClassic/src/version.h b/protocols/SkypeClassic/src/version.h
new file mode 100644
index 0000000000..2e8a2547b5
--- /dev/null
+++ b/protocols/SkypeClassic/src/version.h
@@ -0,0 +1,20 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					54

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

+

+#define __STRINGIFY_IMPL(x)			#x

+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

+

+#define __PLUGIN_NAME				"Skype Protocol (Classic)"

+#define __INTERNAL_NAME				"SkypeClassic"

+#define __FILENAME					"SkypeClassic.dll"

+#define __DESCRIPTION 				"Skype protocol support for Miranda NG. Classic implemetation which requires running original Skype client."

+#define __AUTHOR					"leecher - tweety - jls17"

+#define __AUTHOREMAIL				"leecher@dose.0wnz.at - tweety@user.berlios.de"

+#define __AUTHORWEB					"http://miranda-ng.org/p/SkypeClassic/"

+#define __COPYRIGHT					"© 2004-2012 leecher - tweety"

diff --git a/protocols/SkypeClassic/voiceservice.cpp b/protocols/SkypeClassic/src/voiceservice.cpp
index 2a22bbe86c..2a22bbe86c 100644
--- a/protocols/SkypeClassic/voiceservice.cpp
+++ b/protocols/SkypeClassic/src/voiceservice.cpp
diff --git a/protocols/SkypeClassic/voiceservice.h b/protocols/SkypeClassic/src/voiceservice.h
index 0ffbd6d9ca..0ffbd6d9ca 100644
--- a/protocols/SkypeClassic/voiceservice.h
+++ b/protocols/SkypeClassic/src/voiceservice.h