AimOscar: folders restructurization

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

86 files changed, 120 insertions, 241 deletions

diff --git a/protocols/AimOscar/aim_10.vcxproj b/protocols/AimOscar/aim_10.vcxproj
index f403ddb3a7..f51bc9b566 100644
--- a/protocols/AimOscar/aim_10.vcxproj
+++ b/protocols/AimOscar/aim_10.vcxproj
@@ -187,85 +187,55 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="aim.cpp">

+    <ClCompile Include="src\aim.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

-    <None Include="icons\admin.ico" />

-    <None Include="icons\aol.ico" />

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

-    <None Include="icons\backgroundcolor.ico" />

-    <None Include="icons\block.ico" />

-    <None Include="icons\bold.ico" />

-    <None Include="icons\bot.ico" />

-    <None Include="icons\confirmed.ico" />

-    <None Include="icons\foregroundcolor.ico" />

-    <None Include="icons\hiptop.ico" />

-    <None Include="icons\icq.ico" />

-    <None Include="icons\idle.ico" />

-    <None Include="icons\inbox.ico" />

-    <None Include="icons\italic.ico" />

-    <None Include="icons\nbold.ico" />

-    <None Include="icons\nitalic.ico" />

-    <None Include="icons\nnormalscript.ico" />

-    <None Include="icons\normalscript.ico" />

-    <None Include="icons\nsubscript.ico" />

-    <None Include="icons\nsuperscript.ico" />

-    <None Include="icons\nunderline.ico" />

-    <None Include="icons\oscar.ico" />

-    <None Include="icons\profile.ico" />

-    <None Include="icons\subscript.ico" />

-    <None Include="icons\superscript.ico" />

-    <None Include="icons\unconfirmed.ico" />

-    <None Include="icons\underline.ico" />

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

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

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="aim.rc" />

-    <ResourceCompile Include="version.rc" />

-  </ItemGroup>

-  <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\..\plugins\zlib\zlib_10.vcxproj">

@@ -276,9 +246,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-  <ProjectExtensions>

-    <VisualStudio>

-      <UserProperties RESOURCE_FILE="aim.rc" />

-    </VisualStudio>

-  </ProjectExtensions>

 </Project>
\ No newline at end of file
diff --git a/protocols/AimOscar/aim_10.vcxproj.filters b/protocols/AimOscar/aim_10.vcxproj.filters
index 1c4be5cee6..67692dcce6 100644
--- a/protocols/AimOscar/aim_10.vcxproj.filters
+++ b/protocols/AimOscar/aim_10.vcxproj.filters
@@ -15,223 +15,137 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="aim.cpp">

+    <ClCompile Include="src\aim.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="avatars.cpp">

+    <ClCompile Include="src\avatars.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="away.cpp">

+    <ClCompile Include="src\away.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="chat.cpp">

+    <ClCompile Include="src\chat.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="client.cpp">

+    <ClCompile Include="src\client.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="connection.cpp">

+    <ClCompile Include="src\connection.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="conv.cpp">

+    <ClCompile Include="src\conv.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="direct_connect.cpp">

+    <ClCompile Include="src\direct_connect.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="error.cpp">

+    <ClCompile Include="src\error.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="file.cpp">

+    <ClCompile Include="src\file.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="flap.cpp">

+    <ClCompile Include="src\flap.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="links.cpp">

+    <ClCompile Include="src\links.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="packets.cpp">

+    <ClCompile Include="src\packets.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popup.cpp">

+    <ClCompile Include="src\popup.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="proto.cpp">

+    <ClCompile Include="src\proto.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="proxy.cpp">

+    <ClCompile Include="src\proxy.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="server.cpp">

+    <ClCompile Include="src\server.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="services.cpp">

+    <ClCompile Include="src\services.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="snac.cpp">

+    <ClCompile Include="src\snac.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="theme.cpp">

+    <ClCompile Include="src\theme.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="thread.cpp">

+    <ClCompile Include="src\thread.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="tlv.cpp">

+    <ClCompile Include="src\tlv.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ui.cpp">

+    <ClCompile Include="src\ui.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utility.cpp">

+    <ClCompile Include="src\utility.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <None Include="icons\add.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\admin.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\aol.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\away.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\backgroundcolor.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\block.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\bold.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\bot.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\confirmed.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\foregroundcolor.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\hiptop.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\icq.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\idle.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\inbox.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\italic.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\nbold.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\nitalic.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\nnormalscript.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\normalscript.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\nsubscript.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\nsuperscript.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\nunderline.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\oscar.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\profile.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\subscript.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\superscript.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\unconfirmed.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\underline.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="aim.rc">

+    <ResourceCompile Include="res\aim.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

+    <ResourceCompile Include="res\version.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="aim.h">

+    <ClInclude Include="src\aim.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="avatars.h">

+    <ClInclude Include="src\avatars.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="conv.h">

+    <ClInclude Include="src\conv.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="direct_connect.h">

+    <ClInclude Include="src\direct_connect.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="file.h">

+    <ClInclude Include="src\file.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="flap.h">

+    <ClInclude Include="src\flap.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="links.h">

+    <ClInclude Include="src\links.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="packets.h">

+    <ClInclude Include="src\packets.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="proto.h">

+    <ClInclude Include="src\proto.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="proxy.h">

+    <ClInclude Include="src\proxy.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="snac.h">

+    <ClInclude Include="src\snac.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="theme.h">

+    <ClInclude Include="src\theme.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="tlv.h">

+    <ClInclude Include="src\tlv.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ui.h">

+    <ClInclude Include="src\ui.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utility.h">

+    <ClInclude Include="src\utility.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/protocols/AimOscar/aimoscar-translation.txt b/protocols/AimOscar/docs/aimoscar-translation.txt
index f675c9228c..f675c9228c 100644
--- a/protocols/AimOscar/aimoscar-translation.txt
+++ b/protocols/AimOscar/docs/aimoscar-translation.txt
diff --git a/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj b/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj
index 16b8fad806..671e539de6 100644
--- a/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj
+++ b/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj
@@ -122,7 +122,7 @@
     <ClInclude Include="resource.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="Proto_AIM.rc" />

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj.filters b/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj.filters
index bbd0d86f1d..88687112a9 100644
--- a/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj.filters
+++ b/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj.filters
@@ -11,12 +11,12 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="Proto_AIM.rc">

+    <ResourceCompile Include="res\Proto_AIM.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/AimOscar/proto_aim/icos/Away.ico b/protocols/AimOscar/proto_aim/res/Away.ico
index 7a59b9c246..7a59b9c246 100644
--- a/protocols/AimOscar/proto_aim/icos/Away.ico
+++ b/protocols/AimOscar/proto_aim/res/Away.ico
diff --git a/protocols/AimOscar/proto_aim/icos/Invisible.ico b/protocols/AimOscar/proto_aim/res/Invisible.ico
index 2f8b3c633e..2f8b3c633e 100644
--- a/protocols/AimOscar/proto_aim/icos/Invisible.ico
+++ b/protocols/AimOscar/proto_aim/res/Invisible.ico
diff --git a/protocols/AimOscar/proto_aim/icos/Offline.ico b/protocols/AimOscar/proto_aim/res/Offline.ico
index dd90ef65bf..dd90ef65bf 100644
--- a/protocols/AimOscar/proto_aim/icos/Offline.ico
+++ b/protocols/AimOscar/proto_aim/res/Offline.ico
diff --git a/protocols/AimOscar/proto_aim/icos/Online.ico b/protocols/AimOscar/proto_aim/res/Online.ico
index 5e60eeba91..5e60eeba91 100644
--- a/protocols/AimOscar/proto_aim/icos/Online.ico
+++ b/protocols/AimOscar/proto_aim/res/Online.ico
diff --git a/protocols/AimOscar/proto_aim/icos/Phone.ico b/protocols/AimOscar/proto_aim/res/Phone.ico
index d101a24fbf..d101a24fbf 100644
--- a/protocols/AimOscar/proto_aim/icos/Phone.ico
+++ b/protocols/AimOscar/proto_aim/res/Phone.ico
diff --git a/protocols/AimOscar/proto_aim/Proto_AIM.rc b/protocols/AimOscar/proto_aim/res/Proto_AIM.rc
index 0b609ede7b..9cb5cc86a1 100644
--- a/protocols/AimOscar/proto_aim/Proto_AIM.rc
+++ b/protocols/AimOscar/proto_aim/res/Proto_AIM.rc
diff --git a/protocols/AimOscar/proto_aim/resource.h b/protocols/AimOscar/proto_aim/src/resource.h
index 80648724ca..80648724ca 100644
--- a/protocols/AimOscar/proto_aim/resource.h
+++ b/protocols/AimOscar/proto_aim/src/resource.h
diff --git a/protocols/AimOscar/icons/add.ico b/protocols/AimOscar/res/add.ico
index a6a7e6f38c..a6a7e6f38c 100644
--- a/protocols/AimOscar/icons/add.ico
+++ b/protocols/AimOscar/res/add.ico
diff --git a/protocols/AimOscar/icons/admin.ico b/protocols/AimOscar/res/admin.ico
index 790fd476d4..790fd476d4 100644
--- a/protocols/AimOscar/icons/admin.ico
+++ b/protocols/AimOscar/res/admin.ico
diff --git a/protocols/AimOscar/aim.rc b/protocols/AimOscar/res/aim.rc
index a541b477cf..090e47836b 100644
--- a/protocols/AimOscar/aim.rc
+++ b/protocols/AimOscar/res/aim.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -29,7 +29,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

@@ -297,34 +297,34 @@ END
 

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

 // remains consistent on all systems.

-IDI_AIM                 ICON                    "icons/oscar.ico"

-IDI_ADD                 ICON                    "icons/add.ico"

-IDI_ICQ                 ICON                    "icons/icq.ico"

-IDI_AOL                 ICON                    "icons/aol.ico"

-IDI_HIPTOP              ICON                    "icons/hiptop.ico"

-IDI_BOT                 ICON                    "icons/bot.ico"

-IDI_ADMIN               ICON                    "icons/admin.ico"

-IDI_CONFIRMED           ICON                    "icons/confirmed.ico"

-IDI_UNCONFIRMED         ICON                    "icons/unconfirmed.ico"

-IDI_AWAY                ICON                    "icons/away.ico"

-IDI_IDLE                ICON                    "icons/idle.ico"

-IDI_PROFILE             ICON                    "icons/profile.ico"

-IDI_MAIL                ICON                    "icons/inbox.ico"

-IDI_BOLD                ICON                    "icons/bold.ico"

-IDI_NBOLD               ICON                    "icons/nbold.ico"

-IDI_NITALIC             ICON                    "icons/nitalic.ico"

-IDI_ITALIC              ICON                    "icons/italic.ico"

-IDI_NUNDERLINE          ICON                    "icons/nunderline.ico"

-IDI_UNDERLINE           ICON                    "icons/underline.ico"

-IDI_NSUPERSCRIPT        ICON                    "icons/nsuperscript.ico"

-IDI_NSUBSCRIPT          ICON                    "icons/nsubscript.ico"

-IDI_FOREGROUNDCOLOR     ICON                    "icons/foregroundcolor.ico"

-IDI_BACKGROUNDCOLOR     ICON                    "icons/backgroundcolor.ico"

-IDI_NNORMALSCRIPT       ICON                    "icons/nnormalscript.ico"

-IDI_NORMALSCRIPT        ICON                    "icons/normalscript.ico"

-IDI_SUBSCRIPT           ICON                    "icons/subscript.ico"

-IDI_SUPERSCRIPT         ICON                    "icons/superscript.ico"

-IDI_BLOCK               ICON                    "icons/block.ico"

+IDI_AIM                 ICON                    "oscar.ico"

+IDI_ADD                 ICON                    "add.ico"

+IDI_ICQ                 ICON                    "icq.ico"

+IDI_AOL                 ICON                    "aol.ico"

+IDI_HIPTOP              ICON                    "hiptop.ico"

+IDI_BOT                 ICON                    "bot.ico"

+IDI_ADMIN               ICON                    "admin.ico"

+IDI_CONFIRMED           ICON                    "confirmed.ico"

+IDI_UNCONFIRMED         ICON                    "unconfirmed.ico"

+IDI_AWAY                ICON                    "away.ico"

+IDI_IDLE                ICON                    "idle.ico"

+IDI_PROFILE             ICON                    "profile.ico"

+IDI_MAIL                ICON                    "inbox.ico"

+IDI_BOLD                ICON                    "bold.ico"

+IDI_NBOLD               ICON                    "nbold.ico"

+IDI_NITALIC             ICON                    "nitalic.ico"

+IDI_ITALIC              ICON                    "italic.ico"

+IDI_NUNDERLINE          ICON                    "nunderline.ico"

+IDI_UNDERLINE           ICON                    "underline.ico"

+IDI_NSUPERSCRIPT        ICON                    "nsuperscript.ico"

+IDI_NSUBSCRIPT          ICON                    "nsubscript.ico"

+IDI_FOREGROUNDCOLOR     ICON                    "foregroundcolor.ico"

+IDI_BACKGROUNDCOLOR     ICON                    "backgroundcolor.ico"

+IDI_NNORMALSCRIPT       ICON                    "nnormalscript.ico"

+IDI_NORMALSCRIPT        ICON                    "normalscript.ico"

+IDI_SUBSCRIPT           ICON                    "subscript.ico"

+IDI_SUPERSCRIPT         ICON                    "superscript.ico"

+IDI_BLOCK               ICON                    "block.ico"

 #endif    // English (U.S.) resources

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

 

diff --git a/protocols/AimOscar/icons/aol.ico b/protocols/AimOscar/res/aol.ico
index 6cbc32ee7b..6cbc32ee7b 100644
--- a/protocols/AimOscar/icons/aol.ico
+++ b/protocols/AimOscar/res/aol.ico
diff --git a/protocols/AimOscar/icons/away.ico b/protocols/AimOscar/res/away.ico
index 02bc35739c..02bc35739c 100644
--- a/protocols/AimOscar/icons/away.ico
+++ b/protocols/AimOscar/res/away.ico
diff --git a/protocols/AimOscar/icons/backgroundcolor.ico b/protocols/AimOscar/res/backgroundcolor.ico
index 72881f6059..72881f6059 100644
--- a/protocols/AimOscar/icons/backgroundcolor.ico
+++ b/protocols/AimOscar/res/backgroundcolor.ico
diff --git a/protocols/AimOscar/icons/block.ico b/protocols/AimOscar/res/block.ico
index 32cc483f66..32cc483f66 100644
--- a/protocols/AimOscar/icons/block.ico
+++ b/protocols/AimOscar/res/block.ico
diff --git a/protocols/AimOscar/icons/bold.ico b/protocols/AimOscar/res/bold.ico
index fc34113b6b..fc34113b6b 100644
--- a/protocols/AimOscar/icons/bold.ico
+++ b/protocols/AimOscar/res/bold.ico
diff --git a/protocols/AimOscar/icons/bot.ico b/protocols/AimOscar/res/bot.ico
index a361c84c93..a361c84c93 100644
--- a/protocols/AimOscar/icons/bot.ico
+++ b/protocols/AimOscar/res/bot.ico
diff --git a/protocols/AimOscar/icons/confirmed.ico b/protocols/AimOscar/res/confirmed.ico
index b5aa9ce2da..b5aa9ce2da 100644
--- a/protocols/AimOscar/icons/confirmed.ico
+++ b/protocols/AimOscar/res/confirmed.ico
diff --git a/protocols/AimOscar/icons/foregroundcolor.ico b/protocols/AimOscar/res/foregroundcolor.ico
index 689762edbb..689762edbb 100644
--- a/protocols/AimOscar/icons/foregroundcolor.ico
+++ b/protocols/AimOscar/res/foregroundcolor.ico
diff --git a/protocols/AimOscar/icons/hiptop.ico b/protocols/AimOscar/res/hiptop.ico
index fc20b88668..fc20b88668 100644
--- a/protocols/AimOscar/icons/hiptop.ico
+++ b/protocols/AimOscar/res/hiptop.ico
diff --git a/protocols/AimOscar/icons/icq.ico b/protocols/AimOscar/res/icq.ico
index ce8deb8e32..ce8deb8e32 100644
--- a/protocols/AimOscar/icons/icq.ico
+++ b/protocols/AimOscar/res/icq.ico
diff --git a/protocols/AimOscar/icons/idle.ico b/protocols/AimOscar/res/idle.ico
index 452cc8f6ca..452cc8f6ca 100644
--- a/protocols/AimOscar/icons/idle.ico
+++ b/protocols/AimOscar/res/idle.ico
diff --git a/protocols/AimOscar/icons/inbox.ico b/protocols/AimOscar/res/inbox.ico
index e101d8550e..e101d8550e 100644
--- a/protocols/AimOscar/icons/inbox.ico
+++ b/protocols/AimOscar/res/inbox.ico
diff --git a/protocols/AimOscar/icons/italic.ico b/protocols/AimOscar/res/italic.ico
index 5c61422a71..5c61422a71 100644
--- a/protocols/AimOscar/icons/italic.ico
+++ b/protocols/AimOscar/res/italic.ico
diff --git a/protocols/AimOscar/icons/link.ico b/protocols/AimOscar/res/link.ico
index 20de139547..20de139547 100644
--- a/protocols/AimOscar/icons/link.ico
+++ b/protocols/AimOscar/res/link.ico
diff --git a/protocols/AimOscar/icons/nbold.ico b/protocols/AimOscar/res/nbold.ico
index e17c3efa60..e17c3efa60 100644
--- a/protocols/AimOscar/icons/nbold.ico
+++ b/protocols/AimOscar/res/nbold.ico
diff --git a/protocols/AimOscar/icons/nitalic.ico b/protocols/AimOscar/res/nitalic.ico
index e7ca53b132..e7ca53b132 100644
--- a/protocols/AimOscar/icons/nitalic.ico
+++ b/protocols/AimOscar/res/nitalic.ico
diff --git a/protocols/AimOscar/icons/nnormalscript.ico b/protocols/AimOscar/res/nnormalscript.ico
index f7befc658f..f7befc658f 100644
--- a/protocols/AimOscar/icons/nnormalscript.ico
+++ b/protocols/AimOscar/res/nnormalscript.ico
diff --git a/protocols/AimOscar/icons/normalscript.ico b/protocols/AimOscar/res/normalscript.ico
index 9ca5cbe0b2..9ca5cbe0b2 100644
--- a/protocols/AimOscar/icons/normalscript.ico
+++ b/protocols/AimOscar/res/normalscript.ico
diff --git a/protocols/AimOscar/icons/nsubscript.ico b/protocols/AimOscar/res/nsubscript.ico
index b38b52ef95..b38b52ef95 100644
--- a/protocols/AimOscar/icons/nsubscript.ico
+++ b/protocols/AimOscar/res/nsubscript.ico
diff --git a/protocols/AimOscar/icons/nsuperscript.ico b/protocols/AimOscar/res/nsuperscript.ico
index 9d85d4c6d2..9d85d4c6d2 100644
--- a/protocols/AimOscar/icons/nsuperscript.ico
+++ b/protocols/AimOscar/res/nsuperscript.ico
diff --git a/protocols/AimOscar/icons/nunderline.ico b/protocols/AimOscar/res/nunderline.ico
index a38aa36bf3..a38aa36bf3 100644
--- a/protocols/AimOscar/icons/nunderline.ico
+++ b/protocols/AimOscar/res/nunderline.ico
diff --git a/protocols/AimOscar/icons/oscar.ico b/protocols/AimOscar/res/oscar.ico
index 06eb28f393..06eb28f393 100644
--- a/protocols/AimOscar/icons/oscar.ico
+++ b/protocols/AimOscar/res/oscar.ico
diff --git a/protocols/AimOscar/icons/profile.ico b/protocols/AimOscar/res/profile.ico
index 715b7a1bec..715b7a1bec 100644
--- a/protocols/AimOscar/icons/profile.ico
+++ b/protocols/AimOscar/res/profile.ico
diff --git a/protocols/AimOscar/icons/subscript.ico b/protocols/AimOscar/res/subscript.ico
index 46b5802227..46b5802227 100644
--- a/protocols/AimOscar/icons/subscript.ico
+++ b/protocols/AimOscar/res/subscript.ico
diff --git a/protocols/AimOscar/icons/superscript.ico b/protocols/AimOscar/res/superscript.ico
index 2c923a62b9..2c923a62b9 100644
--- a/protocols/AimOscar/icons/superscript.ico
+++ b/protocols/AimOscar/res/superscript.ico
diff --git a/protocols/AimOscar/icons/unconfirmed.ico b/protocols/AimOscar/res/unconfirmed.ico
index fccd675a61..fccd675a61 100644
--- a/protocols/AimOscar/icons/unconfirmed.ico
+++ b/protocols/AimOscar/res/unconfirmed.ico
diff --git a/protocols/AimOscar/icons/underline.ico b/protocols/AimOscar/res/underline.ico
index 01cf64a36a..01cf64a36a 100644
--- a/protocols/AimOscar/icons/underline.ico
+++ b/protocols/AimOscar/res/underline.ico
diff --git a/protocols/AimOscar/version.rc b/protocols/AimOscar/res/version.rc
index e5cfd074c7..73d2f698fa 100644
--- a/protocols/AimOscar/version.rc
+++ b/protocols/AimOscar/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include <windows.h>

-#include "version.h"

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

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

diff --git a/protocols/AimOscar/aim.cpp b/protocols/AimOscar/src/aim.cpp
index 1cc9482e14..1cc9482e14 100644
--- a/protocols/AimOscar/aim.cpp
+++ b/protocols/AimOscar/src/aim.cpp
diff --git a/protocols/AimOscar/aim.h b/protocols/AimOscar/src/aim.h
index fb6d1071ee..fb6d1071ee 100644
--- a/protocols/AimOscar/aim.h
+++ b/protocols/AimOscar/src/aim.h
diff --git a/protocols/AimOscar/avatars.cpp b/protocols/AimOscar/src/avatars.cpp
index 4c7de35f18..4c7de35f18 100644
--- a/protocols/AimOscar/avatars.cpp
+++ b/protocols/AimOscar/src/avatars.cpp
diff --git a/protocols/AimOscar/avatars.h b/protocols/AimOscar/src/avatars.h
index 69c7ec49bf..69c7ec49bf 100644
--- a/protocols/AimOscar/avatars.h
+++ b/protocols/AimOscar/src/avatars.h
diff --git a/protocols/AimOscar/away.cpp b/protocols/AimOscar/src/away.cpp
index 45ed0097cd..45ed0097cd 100644
--- a/protocols/AimOscar/away.cpp
+++ b/protocols/AimOscar/src/away.cpp
diff --git a/protocols/AimOscar/chat.cpp b/protocols/AimOscar/src/chat.cpp
index 1c9f329486..1c9f329486 100644
--- a/protocols/AimOscar/chat.cpp
+++ b/protocols/AimOscar/src/chat.cpp
diff --git a/protocols/AimOscar/chat.h b/protocols/AimOscar/src/chat.h
index 5b819544aa..5b819544aa 100644
--- a/protocols/AimOscar/chat.h
+++ b/protocols/AimOscar/src/chat.h
diff --git a/protocols/AimOscar/client.cpp b/protocols/AimOscar/src/client.cpp
index 5c4421ac11..5c4421ac11 100644
--- a/protocols/AimOscar/client.cpp
+++ b/protocols/AimOscar/src/client.cpp
diff --git a/protocols/AimOscar/connection.cpp b/protocols/AimOscar/src/connection.cpp
index 81548f875b..81548f875b 100644
--- a/protocols/AimOscar/connection.cpp
+++ b/protocols/AimOscar/src/connection.cpp
diff --git a/protocols/AimOscar/conv.cpp b/protocols/AimOscar/src/conv.cpp
index ebe531876f..ebe531876f 100644
--- a/protocols/AimOscar/conv.cpp
+++ b/protocols/AimOscar/src/conv.cpp
diff --git a/protocols/AimOscar/conv.h b/protocols/AimOscar/src/conv.h
index b7490cf63e..b7490cf63e 100644
--- a/protocols/AimOscar/conv.h
+++ b/protocols/AimOscar/src/conv.h
diff --git a/protocols/AimOscar/defines.h b/protocols/AimOscar/src/defines.h
index 95e756d119..95e756d119 100644
--- a/protocols/AimOscar/defines.h
+++ b/protocols/AimOscar/src/defines.h
diff --git a/protocols/AimOscar/direct_connect.cpp b/protocols/AimOscar/src/direct_connect.cpp
index 4552b461cf..4552b461cf 100644
--- a/protocols/AimOscar/direct_connect.cpp
+++ b/protocols/AimOscar/src/direct_connect.cpp
diff --git a/protocols/AimOscar/direct_connect.h b/protocols/AimOscar/src/direct_connect.h
index 4b164f9181..4b164f9181 100644
--- a/protocols/AimOscar/direct_connect.h
+++ b/protocols/AimOscar/src/direct_connect.h
diff --git a/protocols/AimOscar/error.cpp b/protocols/AimOscar/src/error.cpp
index 9fccb6c4d4..9fccb6c4d4 100644
--- a/protocols/AimOscar/error.cpp
+++ b/protocols/AimOscar/src/error.cpp
diff --git a/protocols/AimOscar/file.cpp b/protocols/AimOscar/src/file.cpp
index 7af67727e8..7af67727e8 100644
--- a/protocols/AimOscar/file.cpp
+++ b/protocols/AimOscar/src/file.cpp
diff --git a/protocols/AimOscar/file.h b/protocols/AimOscar/src/file.h
index 591e86b75b..591e86b75b 100644
--- a/protocols/AimOscar/file.h
+++ b/protocols/AimOscar/src/file.h
diff --git a/protocols/AimOscar/flap.cpp b/protocols/AimOscar/src/flap.cpp
index f652aff710..f652aff710 100644
--- a/protocols/AimOscar/flap.cpp
+++ b/protocols/AimOscar/src/flap.cpp
diff --git a/protocols/AimOscar/flap.h b/protocols/AimOscar/src/flap.h
index ad31616ed2..ad31616ed2 100644
--- a/protocols/AimOscar/flap.h
+++ b/protocols/AimOscar/src/flap.h
diff --git a/protocols/AimOscar/links.cpp b/protocols/AimOscar/src/links.cpp
index c4eec4ae69..c4eec4ae69 100644
--- a/protocols/AimOscar/links.cpp
+++ b/protocols/AimOscar/src/links.cpp
diff --git a/protocols/AimOscar/links.h b/protocols/AimOscar/src/links.h
index 2aac49447b..2aac49447b 100644
--- a/protocols/AimOscar/links.h
+++ b/protocols/AimOscar/src/links.h
diff --git a/protocols/AimOscar/packets.cpp b/protocols/AimOscar/src/packets.cpp
index 91065138fa..91065138fa 100644
--- a/protocols/AimOscar/packets.cpp
+++ b/protocols/AimOscar/src/packets.cpp
diff --git a/protocols/AimOscar/packets.h b/protocols/AimOscar/src/packets.h
index e7c4de6cf0..e7c4de6cf0 100644
--- a/protocols/AimOscar/packets.h
+++ b/protocols/AimOscar/src/packets.h
diff --git a/protocols/AimOscar/popup.cpp b/protocols/AimOscar/src/popup.cpp
index 96c2a936b4..96c2a936b4 100644
--- a/protocols/AimOscar/popup.cpp
+++ b/protocols/AimOscar/src/popup.cpp
diff --git a/protocols/AimOscar/proto.cpp b/protocols/AimOscar/src/proto.cpp
index 09f7ba4ab1..09f7ba4ab1 100644
--- a/protocols/AimOscar/proto.cpp
+++ b/protocols/AimOscar/src/proto.cpp
diff --git a/protocols/AimOscar/proto.h b/protocols/AimOscar/src/proto.h
index bb4dc3c601..bb4dc3c601 100644
--- a/protocols/AimOscar/proto.h
+++ b/protocols/AimOscar/src/proto.h
diff --git a/protocols/AimOscar/proxy.cpp b/protocols/AimOscar/src/proxy.cpp
index b5ce8fef31..b5ce8fef31 100644
--- a/protocols/AimOscar/proxy.cpp
+++ b/protocols/AimOscar/src/proxy.cpp
diff --git a/protocols/AimOscar/proxy.h b/protocols/AimOscar/src/proxy.h
index 8a05a3405a..8a05a3405a 100644
--- a/protocols/AimOscar/proxy.h
+++ b/protocols/AimOscar/src/proxy.h
diff --git a/protocols/AimOscar/resource.h b/protocols/AimOscar/src/resource.h
index 2b9ad87095..2b9ad87095 100644
--- a/protocols/AimOscar/resource.h
+++ b/protocols/AimOscar/src/resource.h
diff --git a/protocols/AimOscar/server.cpp b/protocols/AimOscar/src/server.cpp
index a968c20bd5..a968c20bd5 100644
--- a/protocols/AimOscar/server.cpp
+++ b/protocols/AimOscar/src/server.cpp
diff --git a/protocols/AimOscar/services.cpp b/protocols/AimOscar/src/services.cpp
index caf2209560..caf2209560 100644
--- a/protocols/AimOscar/services.cpp
+++ b/protocols/AimOscar/src/services.cpp
diff --git a/protocols/AimOscar/snac.cpp b/protocols/AimOscar/src/snac.cpp
index ed8af265fe..ed8af265fe 100644
--- a/protocols/AimOscar/snac.cpp
+++ b/protocols/AimOscar/src/snac.cpp
diff --git a/protocols/AimOscar/snac.h b/protocols/AimOscar/src/snac.h
index 8c184dfa3e..8c184dfa3e 100644
--- a/protocols/AimOscar/snac.h
+++ b/protocols/AimOscar/src/snac.h
diff --git a/protocols/AimOscar/theme.cpp b/protocols/AimOscar/src/theme.cpp
index 085c7335d7..085c7335d7 100644
--- a/protocols/AimOscar/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
diff --git a/protocols/AimOscar/theme.h b/protocols/AimOscar/src/theme.h
index 41b098aff6..41b098aff6 100644
--- a/protocols/AimOscar/theme.h
+++ b/protocols/AimOscar/src/theme.h
diff --git a/protocols/AimOscar/thread.cpp b/protocols/AimOscar/src/thread.cpp
index e8044f90d2..e8044f90d2 100644
--- a/protocols/AimOscar/thread.cpp
+++ b/protocols/AimOscar/src/thread.cpp
diff --git a/protocols/AimOscar/tlv.cpp b/protocols/AimOscar/src/tlv.cpp
index f458a28eb0..f458a28eb0 100644
--- a/protocols/AimOscar/tlv.cpp
+++ b/protocols/AimOscar/src/tlv.cpp
diff --git a/protocols/AimOscar/tlv.h b/protocols/AimOscar/src/tlv.h
index 8656453b7b..8656453b7b 100644
--- a/protocols/AimOscar/tlv.h
+++ b/protocols/AimOscar/src/tlv.h
diff --git a/protocols/AimOscar/ui.cpp b/protocols/AimOscar/src/ui.cpp
index d4a8116ecd..d4a8116ecd 100644
--- a/protocols/AimOscar/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
diff --git a/protocols/AimOscar/ui.h b/protocols/AimOscar/src/ui.h
index e6a1b984c0..e6a1b984c0 100644
--- a/protocols/AimOscar/ui.h
+++ b/protocols/AimOscar/src/ui.h
diff --git a/protocols/AimOscar/utility.cpp b/protocols/AimOscar/src/utility.cpp
index 4c487cf818..4c487cf818 100644
--- a/protocols/AimOscar/utility.cpp
+++ b/protocols/AimOscar/src/utility.cpp
diff --git a/protocols/AimOscar/utility.h b/protocols/AimOscar/src/utility.h
index a6608d38f3..a6608d38f3 100644
--- a/protocols/AimOscar/utility.h
+++ b/protocols/AimOscar/src/utility.h
diff --git a/protocols/AimOscar/version.h b/protocols/AimOscar/src/version.h
index cd1ad86ac6..cd1ad86ac6 100644
--- a/protocols/AimOscar/version.h
+++ b/protocols/AimOscar/src/version.h