MSN: folders restructurization

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

71 files changed, 109 insertions, 161 deletions

diff --git a/protocols/MSN/msn-translation.txt b/protocols/MSN/Docs/msn-translation.txt
index 2ad235c6d2..2ad235c6d2 100644
--- a/protocols/MSN/msn-translation.txt
+++ b/protocols/MSN/Docs/msn-translation.txt
diff --git a/protocols/MSN/msn_10.vcxproj b/protocols/MSN/msn_10.vcxproj
index 3a1f365d22..f908516d26 100644
--- a/protocols/MSN/msn_10.vcxproj
+++ b/protocols/MSN/msn_10.vcxproj
@@ -198,72 +198,58 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="des.c">

+    <ClCompile Include="src\des.c">

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="ezxml.c">

+    <ClCompile Include="src\ezxml.c">

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="msn.cpp">

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

-    <None Include="Icos\invite.ico" />

-    <None Include="Icos\list_al.ico" />

-    <None Include="Icos\list_bl.ico" />

-    <None Include="Icos\list_fl.ico" />

-    <None Include="Icos\list_ph.ico" />

-    <None Include="Icos\list_rl.ico" />

-    <None Include="Icos\msn.ico" />

-    <None Include="Icos\msnblock.ico" />

-    <None Include="Icos\netmeeting.ico" />

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

-    <None Include="Icos\services.ico" />

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

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

   </ItemGroup>

   <ItemGroup>

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

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

-  </ItemGroup>

-  <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/MSN/msn_10.vcxproj.filters b/protocols/MSN/msn_10.vcxproj.filters
index 9405a870a0..41799e2ef5 100644
--- a/protocols/MSN/msn_10.vcxproj.filters
+++ b/protocols/MSN/msn_10.vcxproj.filters
@@ -14,172 +14,134 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="des.c">

+    <ClCompile Include="src\des.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ezxml.c">

+    <ClCompile Include="src\ezxml.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_auth.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_chat.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_commands.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_contact.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_errors.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_ftold.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_http.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_libstr.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_links.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_lists.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_mail.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_menu.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_mime.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_misc.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_msgqueue.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_msgsplit.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_natdetect.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_opts.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_p2p.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_p2ps.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_proto.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_soapab.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_soapstore.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_srv.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_ssl.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_std.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_svcs.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_switchboard.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_threads.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_useropts.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="msn_ws.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\invite.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\list_al.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\list_bl.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\list_fl.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\list_ph.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\list_rl.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\msn.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\msnblock.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\netmeeting.ico">

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icos\services.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="msn.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

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

       <Filter>Resource Files</Filter>

     </ClInclude>

-    <ClInclude Include="des.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ezxml.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="msn_global.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="msn_proto.h">

+    <ClInclude Include="src\msn_proto.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/MSN/proto_msn/Proto_MSN.vcxproj b/protocols/MSN/proto_msn/Proto_MSN.vcxproj
index d2c58c466f..535eaa932e 100644
--- a/protocols/MSN/proto_msn/Proto_MSN.vcxproj
+++ b/protocols/MSN/proto_msn/Proto_MSN.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters b/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters
index a363531513..13a42fab36 100644
--- a/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters
+++ b/protocols/MSN/proto_msn/Proto_MSN.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_MSN.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/MSN/proto_msn/icos/Away.ico b/protocols/MSN/proto_msn/res/Away.ico
index 861c161ed1..861c161ed1 100644
--- a/protocols/MSN/proto_msn/icos/Away.ico
+++ b/protocols/MSN/proto_msn/res/Away.ico
diff --git a/protocols/MSN/proto_msn/icos/Invisible.ico b/protocols/MSN/proto_msn/res/Invisible.ico
index efd443feb1..efd443feb1 100644
--- a/protocols/MSN/proto_msn/icos/Invisible.ico
+++ b/protocols/MSN/proto_msn/res/Invisible.ico
diff --git a/protocols/MSN/proto_msn/icos/Lunch.ico b/protocols/MSN/proto_msn/res/Lunch.ico
index 20ff5e36ce..20ff5e36ce 100644
--- a/protocols/MSN/proto_msn/icos/Lunch.ico
+++ b/protocols/MSN/proto_msn/res/Lunch.ico
diff --git a/protocols/MSN/proto_msn/icos/NA.ico b/protocols/MSN/proto_msn/res/NA.ico
index cfd711b280..cfd711b280 100644
--- a/protocols/MSN/proto_msn/icos/NA.ico
+++ b/protocols/MSN/proto_msn/res/NA.ico
diff --git a/protocols/MSN/proto_msn/icos/Occupied.ico b/protocols/MSN/proto_msn/res/Occupied.ico
index 47c63a4214..47c63a4214 100644
--- a/protocols/MSN/proto_msn/icos/Occupied.ico
+++ b/protocols/MSN/proto_msn/res/Occupied.ico
diff --git a/protocols/MSN/proto_msn/icos/Offline.ico b/protocols/MSN/proto_msn/res/Offline.ico
index d52328aa47..d52328aa47 100644
--- a/protocols/MSN/proto_msn/icos/Offline.ico
+++ b/protocols/MSN/proto_msn/res/Offline.ico
diff --git a/protocols/MSN/proto_msn/icos/Online.ico b/protocols/MSN/proto_msn/res/Online.ico
index 7388d3928f..7388d3928f 100644
--- a/protocols/MSN/proto_msn/icos/Online.ico
+++ b/protocols/MSN/proto_msn/res/Online.ico
diff --git a/protocols/MSN/proto_msn/icos/Phone.ico b/protocols/MSN/proto_msn/res/Phone.ico
index 144bc48e59..144bc48e59 100644
--- a/protocols/MSN/proto_msn/icos/Phone.ico
+++ b/protocols/MSN/proto_msn/res/Phone.ico
diff --git a/protocols/MSN/proto_msn/Proto_MSN.rc b/protocols/MSN/proto_msn/res/Proto_MSN.rc
index a1ccde7052..9086924fe3 100644
--- a/protocols/MSN/proto_msn/Proto_MSN.rc
+++ b/protocols/MSN/proto_msn/res/Proto_MSN.rc
diff --git a/protocols/MSN/proto_msn/resource.h b/protocols/MSN/proto_msn/src/resource.h
index ed85f9f278..ed85f9f278 100644
--- a/protocols/MSN/proto_msn/resource.h
+++ b/protocols/MSN/proto_msn/src/resource.h
diff --git a/protocols/MSN/Icos/inbox.ico b/protocols/MSN/res/inbox.ico
index e101d8550e..e101d8550e 100644
--- a/protocols/MSN/Icos/inbox.ico
+++ b/protocols/MSN/res/inbox.ico
diff --git a/protocols/MSN/Icos/invite.ico b/protocols/MSN/res/invite.ico
index 94c37db75e..94c37db75e 100644
--- a/protocols/MSN/Icos/invite.ico
+++ b/protocols/MSN/res/invite.ico
diff --git a/protocols/MSN/Icos/list_al.ico b/protocols/MSN/res/list_al.ico
index 3ac6fb073d..3ac6fb073d 100644
--- a/protocols/MSN/Icos/list_al.ico
+++ b/protocols/MSN/res/list_al.ico
diff --git a/protocols/MSN/Icos/list_bl.ico b/protocols/MSN/res/list_bl.ico
index fefdefd97e..fefdefd97e 100644
--- a/protocols/MSN/Icos/list_bl.ico
+++ b/protocols/MSN/res/list_bl.ico
diff --git a/protocols/MSN/Icos/list_fl.ico b/protocols/MSN/res/list_fl.ico
index ad34437946..ad34437946 100644
--- a/protocols/MSN/Icos/list_fl.ico
+++ b/protocols/MSN/res/list_fl.ico
diff --git a/protocols/MSN/Icos/list_ph.ico b/protocols/MSN/res/list_ph.ico
index b28e2a2bed..b28e2a2bed 100644
--- a/protocols/MSN/Icos/list_ph.ico
+++ b/protocols/MSN/res/list_ph.ico
diff --git a/protocols/MSN/Icos/list_rl.ico b/protocols/MSN/res/list_rl.ico
index 704b802c62..704b802c62 100644
--- a/protocols/MSN/Icos/list_rl.ico
+++ b/protocols/MSN/res/list_rl.ico
diff --git a/protocols/MSN/Icos/msn.ico b/protocols/MSN/res/msn.ico
index a8534a836e..a8534a836e 100644
--- a/protocols/MSN/Icos/msn.ico
+++ b/protocols/MSN/res/msn.ico
diff --git a/protocols/MSN/msn.rc b/protocols/MSN/res/msn.rc
index 084e0d3582..c309a0aa08 100644
--- a/protocols/MSN/msn.rc
+++ b/protocols/MSN/res/msn.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -279,18 +279,18 @@ END
 

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

 // remains consistent on all systems.

-IDI_MSN                 ICON                    "Icos\\msn.ico"

-IDI_MSNBLOCK            ICON                    "Icos\\msnblock.ico"

-IDI_SERVICES            ICON                    "Icos\\services.ico"

-IDI_INBOX               ICON                    "Icos\\inbox.ico"

-IDI_INVITE              ICON                    "Icos\\invite.ico"

-IDI_NETMEETING          ICON                    "Icos\\netmeeting.ico"

-IDI_PROFILE             ICON                    "Icos\\profile.ico"

-IDI_LIST_FL             ICON                    "Icos\\list_fl.ico"

-IDI_LIST_AL             ICON                    "Icos\\list_al.ico"

-IDI_LIST_BL             ICON                    "Icos\\list_bl.ico"

-IDI_LIST_RL             ICON                    "Icos\\list_rl.ico"

-IDI_LIST_LC             ICON                    "Icos\\list_ph.ico"

+IDI_MSN                 ICON                    "msn.ico"

+IDI_MSNBLOCK            ICON                    "msnblock.ico"

+IDI_SERVICES            ICON                    "services.ico"

+IDI_INBOX               ICON                    "inbox.ico"

+IDI_INVITE              ICON                    "invite.ico"

+IDI_NETMEETING          ICON                    "netmeeting.ico"

+IDI_PROFILE             ICON                    "profile.ico"

+IDI_LIST_FL             ICON                    "list_fl.ico"

+IDI_LIST_AL             ICON                    "list_al.ico"

+IDI_LIST_BL             ICON                    "list_bl.ico"

+IDI_LIST_RL             ICON                    "list_rl.ico"

+IDI_LIST_LC             ICON                    "list_ph.ico"

 

 #ifdef APSTUDIO_INVOKED

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

@@ -300,7 +300,7 @@ IDI_LIST_LC             ICON                    "Icos\\list_ph.ico"
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/protocols/MSN/Icos/msnblock.ico b/protocols/MSN/res/msnblock.ico
index 6f59309853..6f59309853 100644
--- a/protocols/MSN/Icos/msnblock.ico
+++ b/protocols/MSN/res/msnblock.ico
diff --git a/protocols/MSN/Icos/netmeeting.ico b/protocols/MSN/res/netmeeting.ico
index bd771e38d8..bd771e38d8 100644
--- a/protocols/MSN/Icos/netmeeting.ico
+++ b/protocols/MSN/res/netmeeting.ico
diff --git a/protocols/MSN/Icos/profile.ico b/protocols/MSN/res/profile.ico
index 715b7a1bec..715b7a1bec 100644
--- a/protocols/MSN/Icos/profile.ico
+++ b/protocols/MSN/res/profile.ico
diff --git a/protocols/MSN/Icos/services.ico b/protocols/MSN/res/services.ico
index bd6f8e0f2c..bd6f8e0f2c 100644
--- a/protocols/MSN/Icos/services.ico
+++ b/protocols/MSN/res/services.ico
diff --git a/protocols/MSN/version.rc b/protocols/MSN/res/version.rc
index be75d9fafa..df06238f1f 100644
--- a/protocols/MSN/version.rc
+++ b/protocols/MSN/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/MSN/SDK/icftypes.h b/protocols/MSN/src/SDK/icftypes.h
index d2b30b2cb1..d2b30b2cb1 100644
--- a/protocols/MSN/SDK/icftypes.h
+++ b/protocols/MSN/src/SDK/icftypes.h
diff --git a/protocols/MSN/SDK/netfw.h b/protocols/MSN/src/SDK/netfw.h
index a767129740..a767129740 100644
--- a/protocols/MSN/SDK/netfw.h
+++ b/protocols/MSN/src/SDK/netfw.h
diff --git a/protocols/MSN/des.c b/protocols/MSN/src/des.c
index 030fb983cd..030fb983cd 100644
--- a/protocols/MSN/des.c
+++ b/protocols/MSN/src/des.c
diff --git a/protocols/MSN/des.h b/protocols/MSN/src/des.h
index e1fc923fad..e1fc923fad 100644
--- a/protocols/MSN/des.h
+++ b/protocols/MSN/src/des.h
diff --git a/protocols/MSN/ezxml.c b/protocols/MSN/src/ezxml.c
index a910c1e905..a910c1e905 100644
--- a/protocols/MSN/ezxml.c
+++ b/protocols/MSN/src/ezxml.c
diff --git a/protocols/MSN/ezxml.h b/protocols/MSN/src/ezxml.h
index 37a0385541..37a0385541 100644
--- a/protocols/MSN/ezxml.h
+++ b/protocols/MSN/src/ezxml.h
diff --git a/protocols/MSN/msn.cpp b/protocols/MSN/src/msn.cpp
index de85a0c6bf..0b1dfbf957 100644
--- a/protocols/MSN/msn.cpp
+++ b/protocols/MSN/src/msn.cpp
@@ -46,7 +46,7 @@ static const PLUGININFOEX pluginInfo =
 	sizeof(PLUGININFOEX),

 	"MSN Protocol",

 	__VERSION_DWORD,

-	"Adds support for communicating with users of the MSN Messenger network",

+	"Adds support for communicating with users of the MSN Messenger network.",

 	"Boris Krasnovskiy, George Hazan, Richard Hughes",

 	"borkra@miranda-im.org",

 	"© 2001-2012 Richard Hughes, George Hazan, Boris Krasnovskiy",

diff --git a/protocols/MSN/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp
index 32bbe01e0d..32bbe01e0d 100644
--- a/protocols/MSN/msn_auth.cpp
+++ b/protocols/MSN/src/msn_auth.cpp
diff --git a/protocols/MSN/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index 620477c6a3..620477c6a3 100644
--- a/protocols/MSN/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
diff --git a/protocols/MSN/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index 5a239dd986..5a239dd986 100644
--- a/protocols/MSN/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
diff --git a/protocols/MSN/msn_contact.cpp b/protocols/MSN/src/msn_contact.cpp
index 086bf6b3ed..086bf6b3ed 100644
--- a/protocols/MSN/msn_contact.cpp
+++ b/protocols/MSN/src/msn_contact.cpp
diff --git a/protocols/MSN/msn_errors.cpp b/protocols/MSN/src/msn_errors.cpp
index d2c5558927..d2c5558927 100644
--- a/protocols/MSN/msn_errors.cpp
+++ b/protocols/MSN/src/msn_errors.cpp
diff --git a/protocols/MSN/msn_ftold.cpp b/protocols/MSN/src/msn_ftold.cpp
index 6ed5ce08af..6ed5ce08af 100644
--- a/protocols/MSN/msn_ftold.cpp
+++ b/protocols/MSN/src/msn_ftold.cpp
diff --git a/protocols/MSN/msn_global.h b/protocols/MSN/src/msn_global.h
index 0e348901f7..0e348901f7 100644
--- a/protocols/MSN/msn_global.h
+++ b/protocols/MSN/src/msn_global.h
diff --git a/protocols/MSN/msn_http.cpp b/protocols/MSN/src/msn_http.cpp
index a53f9401fb..a53f9401fb 100644
--- a/protocols/MSN/msn_http.cpp
+++ b/protocols/MSN/src/msn_http.cpp
diff --git a/protocols/MSN/msn_libstr.cpp b/protocols/MSN/src/msn_libstr.cpp
index 4eb7a1c220..4eb7a1c220 100644
--- a/protocols/MSN/msn_libstr.cpp
+++ b/protocols/MSN/src/msn_libstr.cpp
diff --git a/protocols/MSN/msn_links.cpp b/protocols/MSN/src/msn_links.cpp
index 1d54afd64c..1d54afd64c 100644
--- a/protocols/MSN/msn_links.cpp
+++ b/protocols/MSN/src/msn_links.cpp
diff --git a/protocols/MSN/msn_lists.cpp b/protocols/MSN/src/msn_lists.cpp
index 4930db54d6..4930db54d6 100644
--- a/protocols/MSN/msn_lists.cpp
+++ b/protocols/MSN/src/msn_lists.cpp
diff --git a/protocols/MSN/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 869642d1d4..869642d1d4 100644
--- a/protocols/MSN/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
diff --git a/protocols/MSN/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index 1913483b36..1913483b36 100644
--- a/protocols/MSN/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
diff --git a/protocols/MSN/msn_mime.cpp b/protocols/MSN/src/msn_mime.cpp
index b925e101bb..b925e101bb 100644
--- a/protocols/MSN/msn_mime.cpp
+++ b/protocols/MSN/src/msn_mime.cpp
diff --git a/protocols/MSN/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index c313fd4467..1a31662de7 100644
--- a/protocols/MSN/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -143,12 +143,12 @@ void CMsnProto::InitCustomFolders(void)
 	if (InitCstFldRan) return; 

 

 	TCHAR folder[MAX_PATH];

-	TCHAR* tszModuleName = mir_a2t( m_szModuleName );

+	TCHAR *tszModuleName = mir_a2t(m_szModuleName);

 

-	mir_sntprintf(folder, SIZEOF(folder), _T("%%miranda_avatarcache%%\\%s"), tszModuleName);

+	mir_sntprintf(folder, SIZEOF(folder), _T("%%miranda_userdata%%\\Avatars\\%s"), tszModuleName);

 	hMSNAvatarsFolder = FoldersRegisterCustomPathT(m_szModuleName, "Avatars", folder);

 

-	mir_sntprintf(folder, SIZEOF(folder), _T("%%miranda_userdata%%\\%s\\CustomSmiley"), tszModuleName);

+	mir_sntprintf(folder, SIZEOF(folder), _T("%%miranda_userdata%%\\Avatars\\%s"), tszModuleName);

 	hCustomSmileyFolder = FoldersRegisterCustomPathT(m_szModuleName, "Custom Smiley", folder);

 

 	mir_free(tszModuleName);

@@ -191,9 +191,9 @@ void  CMsnProto::MSN_GetAvatarFileName(HANDLE hContact, TCHAR* pszDest, size_t c
 	TCHAR* path = (TCHAR*)alloca(cbLen * sizeof(TCHAR));

 	if (hMSNAvatarsFolder == NULL || FoldersGetCustomPathT(hMSNAvatarsFolder, path, (int)cbLen, _T("")))

 	{

-		TCHAR *tmpPath = Utils_ReplaceVarsT(_T("%miranda_avatarcache%"));

+		TCHAR *tmpPath = Utils_ReplaceVarsT(_T("%miranda_userdata%"));

 		TCHAR *sztModuleName = mir_a2t(m_szModuleName);

-		tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%s"), tmpPath, sztModuleName);

+		tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\Avatars\\%s"), tmpPath, sztModuleName);

 		mir_free(sztModuleName);

 		mir_free(tmpPath);

 	}

diff --git a/protocols/MSN/msn_msgqueue.cpp b/protocols/MSN/src/msn_msgqueue.cpp
index eeafdfea2f..eeafdfea2f 100644
--- a/protocols/MSN/msn_msgqueue.cpp
+++ b/protocols/MSN/src/msn_msgqueue.cpp
diff --git a/protocols/MSN/msn_msgsplit.cpp b/protocols/MSN/src/msn_msgsplit.cpp
index 0a58278e17..0a58278e17 100644
--- a/protocols/MSN/msn_msgsplit.cpp
+++ b/protocols/MSN/src/msn_msgsplit.cpp
diff --git a/protocols/MSN/msn_natdetect.cpp b/protocols/MSN/src/msn_natdetect.cpp
index 0d17f4a530..0d17f4a530 100644
--- a/protocols/MSN/msn_natdetect.cpp
+++ b/protocols/MSN/src/msn_natdetect.cpp
diff --git a/protocols/MSN/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index b92e21ee5b..b92e21ee5b 100644
--- a/protocols/MSN/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
diff --git a/protocols/MSN/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp
index 599dee57fd..599dee57fd 100644
--- a/protocols/MSN/msn_p2p.cpp
+++ b/protocols/MSN/src/msn_p2p.cpp
diff --git a/protocols/MSN/msn_p2ps.cpp b/protocols/MSN/src/msn_p2ps.cpp
index a3b5965ac8..a3b5965ac8 100644
--- a/protocols/MSN/msn_p2ps.cpp
+++ b/protocols/MSN/src/msn_p2ps.cpp
diff --git a/protocols/MSN/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 41fe2f09e5..41fe2f09e5 100644
--- a/protocols/MSN/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
diff --git a/protocols/MSN/msn_proto.h b/protocols/MSN/src/msn_proto.h
index 5b349bbfc7..5b349bbfc7 100644
--- a/protocols/MSN/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
diff --git a/protocols/MSN/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp
index b565305199..b565305199 100644
--- a/protocols/MSN/msn_soapab.cpp
+++ b/protocols/MSN/src/msn_soapab.cpp
diff --git a/protocols/MSN/msn_soapstore.cpp b/protocols/MSN/src/msn_soapstore.cpp
index 1e565d0ca9..1e565d0ca9 100644
--- a/protocols/MSN/msn_soapstore.cpp
+++ b/protocols/MSN/src/msn_soapstore.cpp
diff --git a/protocols/MSN/msn_srv.cpp b/protocols/MSN/src/msn_srv.cpp
index a01cd401da..a01cd401da 100644
--- a/protocols/MSN/msn_srv.cpp
+++ b/protocols/MSN/src/msn_srv.cpp
diff --git a/protocols/MSN/msn_ssl.cpp b/protocols/MSN/src/msn_ssl.cpp
index f17f738add..f17f738add 100644
--- a/protocols/MSN/msn_ssl.cpp
+++ b/protocols/MSN/src/msn_ssl.cpp
diff --git a/protocols/MSN/msn_std.cpp b/protocols/MSN/src/msn_std.cpp
index 588df3c9e9..588df3c9e9 100644
--- a/protocols/MSN/msn_std.cpp
+++ b/protocols/MSN/src/msn_std.cpp
diff --git a/protocols/MSN/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index 806be891dc..806be891dc 100644
--- a/protocols/MSN/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
diff --git a/protocols/MSN/msn_switchboard.cpp b/protocols/MSN/src/msn_switchboard.cpp
index 05bfae3ecc..05bfae3ecc 100644
--- a/protocols/MSN/msn_switchboard.cpp
+++ b/protocols/MSN/src/msn_switchboard.cpp
diff --git a/protocols/MSN/msn_threads.cpp b/protocols/MSN/src/msn_threads.cpp
index ca625b4fa1..ca625b4fa1 100644
--- a/protocols/MSN/msn_threads.cpp
+++ b/protocols/MSN/src/msn_threads.cpp
diff --git a/protocols/MSN/msn_useropts.cpp b/protocols/MSN/src/msn_useropts.cpp
index d8d247cf4b..d8d247cf4b 100644
--- a/protocols/MSN/msn_useropts.cpp
+++ b/protocols/MSN/src/msn_useropts.cpp
diff --git a/protocols/MSN/msn_ws.cpp b/protocols/MSN/src/msn_ws.cpp
index 653343e7f8..653343e7f8 100644
--- a/protocols/MSN/msn_ws.cpp
+++ b/protocols/MSN/src/msn_ws.cpp
diff --git a/protocols/MSN/resource.h b/protocols/MSN/src/resource.h
index 16a5491319..16a5491319 100644
--- a/protocols/MSN/resource.h
+++ b/protocols/MSN/src/resource.h
diff --git a/protocols/MSN/version.h b/protocols/MSN/src/version.h
index cb78075b09..cb78075b09 100644
--- a/protocols/MSN/version.h
+++ b/protocols/MSN/src/version.h