GTalkExt, ICQ, IRC, Jabber: folders restructurization

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

604 files changed, 1095 insertions, 1361 deletions

diff --git a/include/m_version.h b/include/m_version.h
new file mode 100644
index 0000000000..66eb09e3bb
--- /dev/null
+++ b/include/m_version.h
@@ -0,0 +1,37 @@
+/*

+

+Miranda IM: the free IM client for Microsoft* Windows*

+

+Copyright 2000-2010 Miranda ICQ/IM project, 

+all portions of this codebase are copyrighted to the people 

+listed in contributors.txt.

+

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation; either version 2

+of the License, or (at your option) any later version.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program; if not, write to the Free Software

+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+*/

+#ifndef M_VERSION_H__

+#define M_VERSION_H__

+

+#ifndef MIRANDA_MAKE_VERSION

+#define MIRANDA_MAKE_VERSION(a,b,c,d)   (((((DWORD)(a))&0xFF)<<24)|((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))

+#endif

+

+#define MIRANDA_VERSION_FILEVERSION 0,93,3,1887                               

+#define MIRANDA_VERSION_STRING      "0.93.3.1887"                             

+#define MIRANDA_VERSION_DISPLAY     "0.93.3 alpha build #1887"                

+#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 93, 3, 1887)      

+#define MIRANDA_VERSION_CORE        MIRANDA_MAKE_VERSION(0, 93, 3, 0)       

+#define MIRANDA_VERSION_CORE_STRING "0.93.3.0"                              

+                                                                              

+#endif // M_VERSION_H__                                                       

diff --git a/protocols/GTalkExt/GTalkExt.vcxproj b/protocols/GTalkExt/GTalkExt.vcxproj
index b6877ca108..9ab144d008 100644
--- a/protocols/GTalkExt/GTalkExt.vcxproj
+++ b/protocols/GTalkExt/GTalkExt.vcxproj
@@ -168,34 +168,34 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

-    <ClCompile Include="stdafx.cpp">

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

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

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

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

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

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

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

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\settings.rc" />

diff --git a/protocols/GTalkExt/GTalkExt.vcxproj.filters b/protocols/GTalkExt/GTalkExt.vcxproj.filters
index 5f44404546..74f1960ed1 100644
--- a/protocols/GTalkExt/GTalkExt.vcxproj.filters
+++ b/protocols/GTalkExt/GTalkExt.vcxproj.filters
@@ -15,78 +15,78 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="avatar.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="db.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dllmain.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="GTalkExt.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="handlers.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="inbox.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="menu.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="notifications.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popups.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="stdafx.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="tipper_items.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="avatar.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="db.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="handlers.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="inbox.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="menu.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="notifications.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="popups.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resources.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="stdafx.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="targetver.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="tipper_items.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/protocols/GTalkExt/gtalkext-translation.txt b/protocols/GTalkExt/docs/gtalkext-translation.txt
index f5a7c6ac5c..f5a7c6ac5c 100644
--- a/protocols/GTalkExt/gtalkext-translation.txt
+++ b/protocols/GTalkExt/docs/gtalkext-translation.txt
diff --git a/protocols/GTalkExt/res/settings.rc b/protocols/GTalkExt/res/settings.rc
index 3e8eb0f0e0..efad07e0b9 100644
--- a/protocols/GTalkExt/res/settings.rc
+++ b/protocols/GTalkExt/res/settings.rc
@@ -1,4 +1,4 @@
-#include "resources.h"

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

 #include "winres.h"

 #include "m_utils.h"

 

@@ -80,5 +80,5 @@ VS_VERSION_INFO VERSIONINFO
 	}

 }

 

-IDI_POPUP ICON "res\\PopupIcon.ico"

-IDI_PSEUDOAVA PNG "res\\pseudoava.png"
\ No newline at end of file
+IDI_POPUP ICON "PopupIcon.ico"

+IDI_PSEUDOAVA PNG "pseudoava.png"
\ No newline at end of file
diff --git a/protocols/GTalkExt/GTalkExt.cpp b/protocols/GTalkExt/src/GTalkExt.cpp
index 7646bd10be..7646bd10be 100644
--- a/protocols/GTalkExt/GTalkExt.cpp
+++ b/protocols/GTalkExt/src/GTalkExt.cpp
diff --git a/protocols/GTalkExt/avatar.cpp b/protocols/GTalkExt/src/avatar.cpp
index 1e55937a44..1e55937a44 100644
--- a/protocols/GTalkExt/avatar.cpp
+++ b/protocols/GTalkExt/src/avatar.cpp
diff --git a/protocols/GTalkExt/avatar.h b/protocols/GTalkExt/src/avatar.h
index f07631deff..f07631deff 100644
--- a/protocols/GTalkExt/avatar.h
+++ b/protocols/GTalkExt/src/avatar.h
diff --git a/protocols/GTalkExt/db.cpp b/protocols/GTalkExt/src/db.cpp
index a1658dbdcf..a1658dbdcf 100644
--- a/protocols/GTalkExt/db.cpp
+++ b/protocols/GTalkExt/src/db.cpp
diff --git a/protocols/GTalkExt/db.h b/protocols/GTalkExt/src/db.h
index 9db6cc94ce..9db6cc94ce 100644
--- a/protocols/GTalkExt/db.h
+++ b/protocols/GTalkExt/src/db.h
diff --git a/protocols/GTalkExt/dllmain.cpp b/protocols/GTalkExt/src/dllmain.cpp
index e1097a3ea6..e1097a3ea6 100644
--- a/protocols/GTalkExt/dllmain.cpp
+++ b/protocols/GTalkExt/src/dllmain.cpp
diff --git a/protocols/GTalkExt/handlers.cpp b/protocols/GTalkExt/src/handlers.cpp
index 7bd814a802..7bd814a802 100644
--- a/protocols/GTalkExt/handlers.cpp
+++ b/protocols/GTalkExt/src/handlers.cpp
diff --git a/protocols/GTalkExt/handlers.h b/protocols/GTalkExt/src/handlers.h
index 10ffa8cb81..10ffa8cb81 100644
--- a/protocols/GTalkExt/handlers.h
+++ b/protocols/GTalkExt/src/handlers.h
diff --git a/protocols/GTalkExt/inbox.cpp b/protocols/GTalkExt/src/inbox.cpp
index 53a4aa2fcb..53a4aa2fcb 100644
--- a/protocols/GTalkExt/inbox.cpp
+++ b/protocols/GTalkExt/src/inbox.cpp
diff --git a/protocols/GTalkExt/inbox.h b/protocols/GTalkExt/src/inbox.h
index 0b00128ab9..0b00128ab9 100644
--- a/protocols/GTalkExt/inbox.h
+++ b/protocols/GTalkExt/src/inbox.h
diff --git a/protocols/GTalkExt/menu.cpp b/protocols/GTalkExt/src/menu.cpp
index 26c81a165f..26c81a165f 100644
--- a/protocols/GTalkExt/menu.cpp
+++ b/protocols/GTalkExt/src/menu.cpp
diff --git a/protocols/GTalkExt/menu.h b/protocols/GTalkExt/src/menu.h
index c06457672a..c06457672a 100644
--- a/protocols/GTalkExt/menu.h
+++ b/protocols/GTalkExt/src/menu.h
diff --git a/protocols/GTalkExt/notifications.cpp b/protocols/GTalkExt/src/notifications.cpp
index 9a1819a7f1..9a1819a7f1 100644
--- a/protocols/GTalkExt/notifications.cpp
+++ b/protocols/GTalkExt/src/notifications.cpp
diff --git a/protocols/GTalkExt/notifications.h b/protocols/GTalkExt/src/notifications.h
index 94d6e6353f..94d6e6353f 100644
--- a/protocols/GTalkExt/notifications.h
+++ b/protocols/GTalkExt/src/notifications.h
diff --git a/protocols/GTalkExt/options.cpp b/protocols/GTalkExt/src/options.cpp
index e64e23679c..e64e23679c 100644
--- a/protocols/GTalkExt/options.cpp
+++ b/protocols/GTalkExt/src/options.cpp
diff --git a/protocols/GTalkExt/options.h b/protocols/GTalkExt/src/options.h
index bc720e22ed..bc720e22ed 100644
--- a/protocols/GTalkExt/options.h
+++ b/protocols/GTalkExt/src/options.h
diff --git a/protocols/GTalkExt/popups.cpp b/protocols/GTalkExt/src/popups.cpp
index 99ab94470b..99ab94470b 100644
--- a/protocols/GTalkExt/popups.cpp
+++ b/protocols/GTalkExt/src/popups.cpp
diff --git a/protocols/GTalkExt/popups.h b/protocols/GTalkExt/src/popups.h
index f9e142e0e6..f9e142e0e6 100644
--- a/protocols/GTalkExt/popups.h
+++ b/protocols/GTalkExt/src/popups.h
diff --git a/protocols/GTalkExt/resources.h b/protocols/GTalkExt/src/resources.h
index d72e34dcef..d72e34dcef 100644
--- a/protocols/GTalkExt/resources.h
+++ b/protocols/GTalkExt/src/resources.h
diff --git a/protocols/GTalkExt/stdafx.cpp b/protocols/GTalkExt/src/stdafx.cpp
index bdf32c5876..bdf32c5876 100644
--- a/protocols/GTalkExt/stdafx.cpp
+++ b/protocols/GTalkExt/src/stdafx.cpp
diff --git a/protocols/GTalkExt/stdafx.h b/protocols/GTalkExt/src/stdafx.h
index d9712d7e9c..d9712d7e9c 100644
--- a/protocols/GTalkExt/stdafx.h
+++ b/protocols/GTalkExt/src/stdafx.h
diff --git a/protocols/GTalkExt/targetver.h b/protocols/GTalkExt/src/targetver.h
index feb11bf4f2..feb11bf4f2 100644
--- a/protocols/GTalkExt/targetver.h
+++ b/protocols/GTalkExt/src/targetver.h
diff --git a/protocols/GTalkExt/tipper_items.cpp b/protocols/GTalkExt/src/tipper_items.cpp
index f09be10b32..f09be10b32 100644
--- a/protocols/GTalkExt/tipper_items.cpp
+++ b/protocols/GTalkExt/src/tipper_items.cpp
diff --git a/protocols/GTalkExt/tipper_items.h b/protocols/GTalkExt/src/tipper_items.h
index 0b94d1fd24..0b94d1fd24 100644
--- a/protocols/GTalkExt/tipper_items.h
+++ b/protocols/GTalkExt/src/tipper_items.h
diff --git a/protocols/IRCG/ircg-translation.txt b/protocols/IRCG/Docs/ircg-translation.txt
index 2c072af2d4..2c072af2d4 100644
--- a/protocols/IRCG/ircg-translation.txt
+++ b/protocols/IRCG/Docs/ircg-translation.txt
diff --git a/protocols/IRCG/IRC_10.vcxproj b/protocols/IRCG/IRC_10.vcxproj
index 0bd68e3977..f528b26a37 100644
--- a/protocols/IRCG/IRC_10.vcxproj
+++ b/protocols/IRCG/IRC_10.vcxproj
@@ -193,58 +193,39 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

-    <ClCompile Include="main.cpp">

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

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

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

-    <None Include="Icons\apply.ico" />

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

-    <None Include="Icons\dcc.ico" />

-    <None Include="Icons\delete.ico" />

-    <None Include="Icons\edit.ico" />

-    <None Include="Icons\irc.ico" />

-    <None Include="Icons\list.ico" />

-    <None Include="Icons\manager.ico" />

-    <None Include="Icons\question.ico" />

-    <None Include="Icons\quick.ico" />

-    <None Include="Icons\rename.ico" />

-    <None Include="Icons\server.ico" />

-    <None Include="Icons\show.ico" />

-    <None Include="Icons\whois.ico" />

-    <None Include="Icons\world.ico" />

-    <None Include="Docs\IRC_license.txt" />

-    <None Include="Docs\IRC_Readme.txt" />

     <None Include="Docs\IRC_servers.ini" />

-    <None Include="Docs\IRC_Translate.txt" />

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/IRCG/IRC_10.vcxproj.filters b/protocols/IRCG/IRC_10.vcxproj.filters
index 202bb2d6da..fcd43c9931 100644
--- a/protocols/IRCG/IRC_10.vcxproj.filters
+++ b/protocols/IRCG/IRC_10.vcxproj.filters
@@ -19,142 +19,85 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="clist.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="commandmonitor.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="input.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="irclib.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ircproto.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MString.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="output.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="scripting.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="services.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="tools.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ui_utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="userinfo.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="windows.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commandmonitor.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="irc.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="irc_dlg.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="irclib.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MString.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ui_utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\apply.ico">

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\dcc.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\delete.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\edit.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\irc.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\list.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\manager.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\question.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\quick.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\rename.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\server.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\show.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\whois.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\world.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Docs\IRC_license.txt">

-      <Filter>Documentation</Filter>

-    </None>

-    <None Include="Docs\IRC_Readme.txt">

-      <Filter>Documentation</Filter>

-    </None>

     <None Include="Docs\IRC_servers.ini">

       <Filter>Documentation</Filter>

     </None>

-    <None Include="Docs\IRC_Translate.txt">

-      <Filter>Documentation</Filter>

-    </None>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="IRC.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/IRCG/proto_irc/Proto_IRC.vcxproj b/protocols/IRCG/proto_irc/Proto_IRC.vcxproj
index 84ec6a3d9a..62b71b47a5 100644
--- a/protocols/IRCG/proto_irc/Proto_IRC.vcxproj
+++ b/protocols/IRCG/proto_irc/Proto_IRC.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/IRCG/proto_irc/Proto_IRC.vcxproj.filters b/protocols/IRCG/proto_irc/Proto_IRC.vcxproj.filters
index 0232af997d..025928f5f9 100644
--- a/protocols/IRCG/proto_irc/Proto_IRC.vcxproj.filters
+++ b/protocols/IRCG/proto_irc/Proto_IRC.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_IRC.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/IRCG/proto_irc/ico/Away.ico b/protocols/IRCG/proto_irc/res/Away.ico
index 48059b577a..48059b577a 100644
--- a/protocols/IRCG/proto_irc/ico/Away.ico
+++ b/protocols/IRCG/proto_irc/res/Away.ico
diff --git a/protocols/IRCG/proto_irc/ico/Offline.ico b/protocols/IRCG/proto_irc/res/Offline.ico
index 4882899757..4882899757 100644
--- a/protocols/IRCG/proto_irc/ico/Offline.ico
+++ b/protocols/IRCG/proto_irc/res/Offline.ico
diff --git a/protocols/IRCG/proto_irc/ico/Online.ico b/protocols/IRCG/proto_irc/res/Online.ico
index e816afd6ee..e816afd6ee 100644
--- a/protocols/IRCG/proto_irc/ico/Online.ico
+++ b/protocols/IRCG/proto_irc/res/Online.ico
diff --git a/protocols/IRCG/proto_irc/Proto_IRC.rc b/protocols/IRCG/proto_irc/res/Proto_IRC.rc
index 09bc0ad668..3e087d3e03 100644
--- a/protocols/IRCG/proto_irc/Proto_IRC.rc
+++ b/protocols/IRCG/proto_irc/res/Proto_IRC.rc
diff --git a/protocols/IRCG/proto_irc/resource.h b/protocols/IRCG/proto_irc/src/resource.h
index bf3cbb6839..bf3cbb6839 100644
--- a/protocols/IRCG/proto_irc/resource.h
+++ b/protocols/IRCG/proto_irc/src/resource.h
diff --git a/protocols/IRCG/IRC.rc b/protocols/IRCG/res/IRC.rc
index fb6b45e313..9e22fe99a4 100644
--- a/protocols/IRCG/IRC.rc
+++ b/protocols/IRCG/res/IRC.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -28,22 +28,22 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

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

 // remains consistent on all systems.

-IDI_MAIN                ICON                    "Icons/irc.ico"

-IDI_ADD                 ICON                    "Icons/add.ico"

-IDI_BLOCK               ICON                    "Icons/block.ico"

-IDI_DELETE              ICON                    "Icons/delete.ico"

-IDI_APPLY               ICON                    "Icons/apply.ico"

-IDI_WHOIS               ICON                    "Icons/whois.ico"

-IDI_LIST                ICON                    "Icons/list.ico"

-IDI_MANAGER             ICON                    "Icons/manager.ico"

-IDI_QUICK               ICON                    "Icons/quick.ico"

-IDI_RENAME              ICON                    "Icons/rename.ico"

-IDI_SHOW                ICON                    "Icons/show.ico"

-IDI_LOGO                ICON                    "Icons/world.ico"

-IDI_DCC                 ICON                    "Icons/dcc.ico"

-IDI_SERVER              ICON                    "Icons/server.ico"

-IDI_EDIT                ICON                    "Icons/edit.ico"

-IDI_IRCQUESTION         ICON                    "Icons/question.ico"

+IDI_MAIN                ICON                    "irc.ico"

+IDI_ADD                 ICON                    "add.ico"

+IDI_BLOCK               ICON                    "block.ico"

+IDI_DELETE              ICON                    "delete.ico"

+IDI_APPLY               ICON                    "apply.ico"

+IDI_WHOIS               ICON                    "whois.ico"

+IDI_LIST                ICON                    "list.ico"

+IDI_MANAGER             ICON                    "manager.ico"

+IDI_QUICK               ICON                    "quick.ico"

+IDI_RENAME              ICON                    "rename.ico"

+IDI_SHOW                ICON                    "show.ico"

+IDI_LOGO                ICON                    "world.ico"

+IDI_DCC                 ICON                    "dcc.ico"

+IDI_SERVER              ICON                    "server.ico"

+IDI_EDIT                ICON                    "edit.ico"

+IDI_IRCQUESTION         ICON                    "question.ico"

 

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

 //

@@ -688,7 +688,7 @@ END
 // TEXT

 //

 

-IDR_SERVERS             TEXT                    "Docs\\IRC_servers.ini"

+IDR_SERVERS             TEXT                    "..\\docs\\IRC_servers.ini"

 #endif    // Neutral resources

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

 

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

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/protocols/IRCG/Icons/add.ico b/protocols/IRCG/res/add.ico
index a6a7e6f38c..a6a7e6f38c 100644
--- a/protocols/IRCG/Icons/add.ico
+++ b/protocols/IRCG/res/add.ico
diff --git a/protocols/IRCG/Icons/apply.ico b/protocols/IRCG/res/apply.ico
index 19957e4ac8..19957e4ac8 100644
--- a/protocols/IRCG/Icons/apply.ico
+++ b/protocols/IRCG/res/apply.ico
diff --git a/protocols/IRCG/Icons/block.ico b/protocols/IRCG/res/block.ico
index 073acb134f..073acb134f 100644
--- a/protocols/IRCG/Icons/block.ico
+++ b/protocols/IRCG/res/block.ico
diff --git a/protocols/IRCG/Icons/dcc.ico b/protocols/IRCG/res/dcc.ico
index 3d3b83d936..3d3b83d936 100644
--- a/protocols/IRCG/Icons/dcc.ico
+++ b/protocols/IRCG/res/dcc.ico
diff --git a/protocols/IRCG/Icons/delete.ico b/protocols/IRCG/res/delete.ico
index 9108e38cfd..9108e38cfd 100644
--- a/protocols/IRCG/Icons/delete.ico
+++ b/protocols/IRCG/res/delete.ico
diff --git a/protocols/IRCG/Icons/edit.ico b/protocols/IRCG/res/edit.ico
index 0c3764bec4..0c3764bec4 100644
--- a/protocols/IRCG/Icons/edit.ico
+++ b/protocols/IRCG/res/edit.ico
diff --git a/protocols/IRCG/Icons/irc.ico b/protocols/IRCG/res/irc.ico
index 27cc764c94..27cc764c94 100644
--- a/protocols/IRCG/Icons/irc.ico
+++ b/protocols/IRCG/res/irc.ico
diff --git a/protocols/IRCG/Icons/list.ico b/protocols/IRCG/res/list.ico
index a7004e37aa..a7004e37aa 100644
--- a/protocols/IRCG/Icons/list.ico
+++ b/protocols/IRCG/res/list.ico
diff --git a/protocols/IRCG/Icons/manager.ico b/protocols/IRCG/res/manager.ico
index 217534bc74..217534bc74 100644
--- a/protocols/IRCG/Icons/manager.ico
+++ b/protocols/IRCG/res/manager.ico
diff --git a/protocols/IRCG/Icons/question.ico b/protocols/IRCG/res/question.ico
index 0454d67afb..0454d67afb 100644
--- a/protocols/IRCG/Icons/question.ico
+++ b/protocols/IRCG/res/question.ico
diff --git a/protocols/IRCG/Icons/quick.ico b/protocols/IRCG/res/quick.ico
index 078f7490c9..078f7490c9 100644
--- a/protocols/IRCG/Icons/quick.ico
+++ b/protocols/IRCG/res/quick.ico
diff --git a/protocols/IRCG/Icons/rename.ico b/protocols/IRCG/res/rename.ico
index 0434c1bd02..0434c1bd02 100644
--- a/protocols/IRCG/Icons/rename.ico
+++ b/protocols/IRCG/res/rename.ico
diff --git a/protocols/IRCG/Icons/server.ico b/protocols/IRCG/res/server.ico
index db008452f0..db008452f0 100644
--- a/protocols/IRCG/Icons/server.ico
+++ b/protocols/IRCG/res/server.ico
diff --git a/protocols/IRCG/Icons/show.ico b/protocols/IRCG/res/show.ico
index ce7136ae4a..ce7136ae4a 100644
--- a/protocols/IRCG/Icons/show.ico
+++ b/protocols/IRCG/res/show.ico
diff --git a/protocols/IRCG/version.rc b/protocols/IRCG/res/version.rc
index 3089b54d06..175296edb0 100644
--- a/protocols/IRCG/version.rc
+++ b/protocols/IRCG/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include <windows.h>

-#include "version.h"

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

 

 #ifdef _WIN32

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

diff --git a/protocols/IRCG/Icons/whois.ico b/protocols/IRCG/res/whois.ico
index e66f079830..e66f079830 100644
--- a/protocols/IRCG/Icons/whois.ico
+++ b/protocols/IRCG/res/whois.ico
diff --git a/protocols/IRCG/Icons/world.ico b/protocols/IRCG/res/world.ico
index f462de9a04..f462de9a04 100644
--- a/protocols/IRCG/Icons/world.ico
+++ b/protocols/IRCG/res/world.ico
diff --git a/protocols/IRCG/MString.cpp b/protocols/IRCG/src/MString.cpp
index 70016e427e..70016e427e 100644
--- a/protocols/IRCG/MString.cpp
+++ b/protocols/IRCG/src/MString.cpp
diff --git a/protocols/IRCG/MString.h b/protocols/IRCG/src/MString.h
index 7cc16ff4a3..7cc16ff4a3 100644
--- a/protocols/IRCG/MString.h
+++ b/protocols/IRCG/src/MString.h
diff --git a/protocols/IRCG/clist.cpp b/protocols/IRCG/src/clist.cpp
index 94bb460db9..94bb460db9 100644
--- a/protocols/IRCG/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
diff --git a/protocols/IRCG/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 79d4579ae6..79d4579ae6 100644
--- a/protocols/IRCG/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
diff --git a/protocols/IRCG/commandmonitor.h b/protocols/IRCG/src/commandmonitor.h
index 940cb9cc02..940cb9cc02 100644
--- a/protocols/IRCG/commandmonitor.h
+++ b/protocols/IRCG/src/commandmonitor.h
diff --git a/protocols/IRCG/input.cpp b/protocols/IRCG/src/input.cpp
index c564b7844c..c564b7844c 100644
--- a/protocols/IRCG/input.cpp
+++ b/protocols/IRCG/src/input.cpp
diff --git a/protocols/IRCG/irc.h b/protocols/IRCG/src/irc.h
index 9fe6584d87..9fe6584d87 100644
--- a/protocols/IRCG/irc.h
+++ b/protocols/IRCG/src/irc.h
diff --git a/protocols/IRCG/irc_dlg.h b/protocols/IRCG/src/irc_dlg.h
index 887e9f0d0c..887e9f0d0c 100644
--- a/protocols/IRCG/irc_dlg.h
+++ b/protocols/IRCG/src/irc_dlg.h
diff --git a/protocols/IRCG/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index c018b57a02..c018b57a02 100644
--- a/protocols/IRCG/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
diff --git a/protocols/IRCG/irclib.h b/protocols/IRCG/src/irclib.h
index 7dcb5a4c01..7dcb5a4c01 100644
--- a/protocols/IRCG/irclib.h
+++ b/protocols/IRCG/src/irclib.h
diff --git a/protocols/IRCG/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 9ff2a1c851..9ff2a1c851 100644
--- a/protocols/IRCG/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
diff --git a/protocols/IRCG/main.cpp b/protocols/IRCG/src/main.cpp
index ea802d43cd..ea802d43cd 100644
--- a/protocols/IRCG/main.cpp
+++ b/protocols/IRCG/src/main.cpp
diff --git a/protocols/IRCG/options.cpp b/protocols/IRCG/src/options.cpp
index 69a991374b..69a991374b 100644
--- a/protocols/IRCG/options.cpp
+++ b/protocols/IRCG/src/options.cpp
diff --git a/protocols/IRCG/output.cpp b/protocols/IRCG/src/output.cpp
index 6a97f45baf..6a97f45baf 100644
--- a/protocols/IRCG/output.cpp
+++ b/protocols/IRCG/src/output.cpp
diff --git a/protocols/IRCG/resource.h b/protocols/IRCG/src/resource.h
index 948b3a4085..948b3a4085 100644
--- a/protocols/IRCG/resource.h
+++ b/protocols/IRCG/src/resource.h
diff --git a/protocols/IRCG/scripting.cpp b/protocols/IRCG/src/scripting.cpp
index 26c6bc2a55..26c6bc2a55 100644
--- a/protocols/IRCG/scripting.cpp
+++ b/protocols/IRCG/src/scripting.cpp
diff --git a/protocols/IRCG/services.cpp b/protocols/IRCG/src/services.cpp
index e3b363ac15..e3b363ac15 100644
--- a/protocols/IRCG/services.cpp
+++ b/protocols/IRCG/src/services.cpp
diff --git a/protocols/IRCG/tools.cpp b/protocols/IRCG/src/tools.cpp
index 83ac7ae60f..83ac7ae60f 100644
--- a/protocols/IRCG/tools.cpp
+++ b/protocols/IRCG/src/tools.cpp
diff --git a/protocols/IRCG/ui_utils.cpp b/protocols/IRCG/src/ui_utils.cpp
index d7c8e4b6b6..d7c8e4b6b6 100644
--- a/protocols/IRCG/ui_utils.cpp
+++ b/protocols/IRCG/src/ui_utils.cpp
diff --git a/protocols/IRCG/ui_utils.h b/protocols/IRCG/src/ui_utils.h
index 60566ce913..60566ce913 100644
--- a/protocols/IRCG/ui_utils.h
+++ b/protocols/IRCG/src/ui_utils.h
diff --git a/protocols/IRCG/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp
index 8f6378a3ce..8f6378a3ce 100644
--- a/protocols/IRCG/userinfo.cpp
+++ b/protocols/IRCG/src/userinfo.cpp
diff --git a/protocols/IRCG/version.h b/protocols/IRCG/src/version.h
index 4def5ec467..4def5ec467 100644
--- a/protocols/IRCG/version.h
+++ b/protocols/IRCG/src/version.h
diff --git a/protocols/IRCG/windows.cpp b/protocols/IRCG/src/windows.cpp
index 313e99353c..313e99353c 100644
--- a/protocols/IRCG/windows.cpp
+++ b/protocols/IRCG/src/windows.cpp
diff --git a/protocols/IcqOscarJ/icqoscarj-translation.txt b/protocols/IcqOscarJ/docs/icqoscarj-translation.txt
index 520c8a1ce6..520c8a1ce6 100644
--- a/protocols/IcqOscarJ/icqoscarj-translation.txt
+++ b/protocols/IcqOscarJ/docs/icqoscarj-translation.txt
diff --git a/protocols/IcqOscarJ/icons_pack/ICONS.rc b/protocols/IcqOscarJ/icons_pack/ICONS.rc
deleted file mode 100644
index b0c7ea1b05..0000000000
--- a/protocols/IcqOscarJ/icons_pack/ICONS.rc
+++ /dev/null
@@ -1,132 +0,0 @@
-//Microsoft Developer Studio generated resource script.

-//

-#include "../resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

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

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "winres.h"

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

-#undef APSTUDIO_READONLY_SYMBOLS

-

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

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

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

-//

-// Icon

-//

-

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

-// remains consistent on all systems.

-IDI_XSTATUS1            ICON    DISCARDABLE     "../icos/xstatus01.ico"

-IDI_XSTATUS2            ICON    DISCARDABLE     "../icos/xstatus02.ico"

-IDI_XSTATUS3            ICON    DISCARDABLE     "../icos/xstatus03.ico"

-IDI_XSTATUS4            ICON    DISCARDABLE     "../icos/xstatus04.ico"

-IDI_XSTATUS5            ICON    DISCARDABLE     "../icos/xstatus05.ico"

-IDI_XSTATUS6            ICON    DISCARDABLE     "../icos/xstatus06.ico"

-IDI_XSTATUS7            ICON    DISCARDABLE     "../icos/xstatus07.ico"

-IDI_XSTATUS8            ICON    DISCARDABLE     "../icos/xstatus08.ico"

-IDI_XSTATUS9            ICON    DISCARDABLE     "../icos/xstatus09.ico"

-IDI_XSTATUS10           ICON    DISCARDABLE     "../icos/xstatus10.ico"

-IDI_XSTATUS11           ICON    DISCARDABLE     "../icos/xstatus11.ico"

-IDI_XSTATUS12           ICON    DISCARDABLE     "../icos/xstatus12.ico"

-IDI_XSTATUS13           ICON    DISCARDABLE     "../icos/xstatus13.ico"

-IDI_XSTATUS14           ICON    DISCARDABLE     "../icos/xstatus14.ico"

-IDI_XSTATUS15           ICON    DISCARDABLE     "../icos/xstatus15.ico"

-IDI_XSTATUS16           ICON    DISCARDABLE     "../icos/xstatus16.ico"

-IDI_XSTATUS17           ICON    DISCARDABLE     "../icos/xstatus17.ico"

-IDI_XSTATUS18           ICON    DISCARDABLE     "../icos/xstatus18.ico"

-IDI_XSTATUS19           ICON    DISCARDABLE     "../icos/xstatus19.ico"

-IDI_XSTATUS20           ICON    DISCARDABLE     "../icos/xstatus20.ico"

-IDI_XSTATUS21           ICON    DISCARDABLE     "../icos/xstatus21.ico"

-IDI_XSTATUS22           ICON    DISCARDABLE     "../icos/xstatus22.ico"

-IDI_XSTATUS23           ICON    DISCARDABLE     "../icos/xstatus23.ico"

-IDI_XSTATUS24           ICON    DISCARDABLE     "../icos/xstatus24.ico"

-IDI_XSTATUS25           ICON    DISCARDABLE     "../icos/xstatus25.ico"

-IDI_XSTATUS26           ICON    DISCARDABLE     "../icos/xstatus26.ico"

-IDI_XSTATUS27           ICON    DISCARDABLE     "../icos/xstatus27.ico"

-IDI_XSTATUS28           ICON    DISCARDABLE     "../icos/xstatus28.ico"

-IDI_XSTATUS29           ICON    DISCARDABLE     "../icos/xstatus29.ico"

-IDI_XSTATUS30           ICON    DISCARDABLE     "../icos/xstatus30.ico"

-IDI_XSTATUS31           ICON    DISCARDABLE     "../icos/xstatus31.ico"

-IDI_XSTATUS32           ICON    DISCARDABLE     "../icos/xstatus32.ico"

-IDI_XSTATUS33           ICON    DISCARDABLE     "../icos/xstatus33.ico"

-IDI_XSTATUS34           ICON    DISCARDABLE     "../icos/xstatus34.ico"

-IDI_XSTATUS35           ICON    DISCARDABLE     "../icos/xstatus35.ico"

-IDI_XSTATUS36           ICON    DISCARDABLE     "../icos/xstatus36.ico"

-IDI_XSTATUS37           ICON    DISCARDABLE     "../icos/xstatus37.ico"

-IDI_XSTATUS38           ICON    DISCARDABLE     "../icos/xstatus38.ico"

-IDI_XSTATUS39           ICON    DISCARDABLE     "../icos/xstatus39.ico"

-IDI_XSTATUS40           ICON    DISCARDABLE     "../icos/xstatus40.ico"

-IDI_XSTATUS41           ICON    DISCARDABLE     "../icos/xstatus41.ico"

-IDI_XSTATUS42           ICON    DISCARDABLE     "../icos/xstatus42.ico"

-IDI_XSTATUS43           ICON    DISCARDABLE     "../icos/xstatus43.ico"

-IDI_XSTATUS44           ICON    DISCARDABLE     "../icos/xstatus44.ico"

-IDI_XSTATUS45           ICON    DISCARDABLE     "../icos/xstatus45.ico"

-IDI_XSTATUS46           ICON    DISCARDABLE     "../icos/xstatus46.ico"

-IDI_XSTATUS47           ICON    DISCARDABLE     "../icos/xstatus47.ico"

-IDI_XSTATUS48           ICON    DISCARDABLE     "../icos/xstatus48.ico"

-IDI_XSTATUS49           ICON    DISCARDABLE     "../icos/xstatus49.ico"

-IDI_XSTATUS50           ICON    DISCARDABLE     "../icos/xstatus50.ico"

-IDI_XSTATUS51           ICON    DISCARDABLE     "../icos/xstatus51.ico"

-IDI_XSTATUS52           ICON    DISCARDABLE     "../icos/xstatus52.ico"

-IDI_XSTATUS53           ICON    DISCARDABLE     "../icos/xstatus53.ico"

-IDI_XSTATUS54           ICON    DISCARDABLE     "../icos/xstatus54.ico"

-IDI_XSTATUS55           ICON    DISCARDABLE     "../icos/xstatus55.ico"

-IDI_XSTATUS56           ICON    DISCARDABLE     "../icos/xstatus56.ico"

-IDI_XSTATUS57           ICON    DISCARDABLE     "../icos/xstatus57.ico"

-IDI_XSTATUS58           ICON    DISCARDABLE     "../icos/xstatus58.ico"

-IDI_XSTATUS59           ICON    DISCARDABLE     "../icos/xstatus59.ico"

-IDI_XSTATUS60           ICON    DISCARDABLE     "../icos/xstatus60.ico"

-IDI_XSTATUS61           ICON    DISCARDABLE     "../icos/xstatus61.ico"

-IDI_XSTATUS62           ICON    DISCARDABLE     "../icos/xstatus62.ico"

-IDI_XSTATUS63           ICON    DISCARDABLE     "../icos/xstatus63.ico"

-IDI_XSTATUS64           ICON    DISCARDABLE     "../icos/xstatus64.ico"

-IDI_XSTATUS65           ICON    DISCARDABLE     "../icos/xstatus65.ico"

-IDI_XSTATUS66           ICON    DISCARDABLE     "../icos/xstatus66.ico"

-IDI_XSTATUS67           ICON    DISCARDABLE     "../icos/xstatus67.ico"

-IDI_XSTATUS68           ICON    DISCARDABLE     "../icos/xstatus68.ico"

-IDI_XSTATUS69           ICON    DISCARDABLE     "../icos/xstatus69.ico"

-IDI_XSTATUS70           ICON    DISCARDABLE     "../icos/xstatus70.ico"

-IDI_XSTATUS71           ICON    DISCARDABLE     "../icos/xstatus71.ico"

-IDI_XSTATUS72           ICON    DISCARDABLE     "../icos/xstatus72.ico"

-IDI_XSTATUS73           ICON    DISCARDABLE     "../icos/xstatus73.ico"

-IDI_XSTATUS74           ICON    DISCARDABLE     "../icos/xstatus74.ico"

-IDI_XSTATUS75           ICON    DISCARDABLE     "../icos/xstatus75.ico"

-IDI_XSTATUS76           ICON    DISCARDABLE     "../icos/xstatus76.ico"

-IDI_XSTATUS77           ICON    DISCARDABLE     "../icos/xstatus77.ico"

-IDI_XSTATUS78           ICON    DISCARDABLE     "../icos/xstatus78.ico"

-IDI_XSTATUS79           ICON    DISCARDABLE     "../icos/xstatus79.ico"

-IDI_XSTATUS80           ICON    DISCARDABLE     "../icos/xstatus80.ico"

-IDI_XSTATUS81           ICON    DISCARDABLE     "../icos/xstatus81.ico"

-IDI_XSTATUS82           ICON    DISCARDABLE     "../icos/xstatus82.ico"

-IDI_XSTATUS83           ICON    DISCARDABLE     "../icos/xstatus83.ico"

-IDI_XSTATUS84           ICON    DISCARDABLE     "../icos/xstatus84.ico"

-IDI_XSTATUS85           ICON    DISCARDABLE     "../icos/xstatus85.ico"

-IDI_XSTATUS86           ICON    DISCARDABLE     "../icos/xstatus86.ico"

-

-

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

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-   IDS_IDENTIFY            "# Custom Status Icons #"

-END

-

-

-

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

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

-

diff --git a/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj b/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj
index 8200455671..a4ef138a57 100644
--- a/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj
+++ b/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj
@@ -122,7 +122,10 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

+  </ItemGroup>

+  <ItemGroup>

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/IcqOscarJ/icons_pack/res/ICONS.rc b/protocols/IcqOscarJ/icons_pack/res/ICONS.rc
new file mode 100644
index 0000000000..3c6fbe73e6
--- /dev/null
+++ b/protocols/IcqOscarJ/icons_pack/res/ICONS.rc
@@ -0,0 +1,132 @@
+//Microsoft Developer Studio generated resource script.

+//

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

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "winres.h"

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

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

+// remains consistent on all systems.

+IDI_XSTATUS1            ICON         "xstatus01.ico"

+IDI_XSTATUS2            ICON         "xstatus02.ico"

+IDI_XSTATUS3            ICON         "xstatus03.ico"

+IDI_XSTATUS4            ICON         "xstatus04.ico"

+IDI_XSTATUS5            ICON         "xstatus05.ico"

+IDI_XSTATUS6            ICON         "xstatus06.ico"

+IDI_XSTATUS7            ICON         "xstatus07.ico"

+IDI_XSTATUS8            ICON         "xstatus08.ico"

+IDI_XSTATUS9            ICON         "xstatus09.ico"

+IDI_XSTATUS10           ICON         "xstatus10.ico"

+IDI_XSTATUS11           ICON         "xstatus11.ico"

+IDI_XSTATUS12           ICON         "xstatus12.ico"

+IDI_XSTATUS13           ICON         "xstatus13.ico"

+IDI_XSTATUS14           ICON         "xstatus14.ico"

+IDI_XSTATUS15           ICON         "xstatus15.ico"

+IDI_XSTATUS16           ICON         "xstatus16.ico"

+IDI_XSTATUS17           ICON         "xstatus17.ico"

+IDI_XSTATUS18           ICON         "xstatus18.ico"

+IDI_XSTATUS19           ICON         "xstatus19.ico"

+IDI_XSTATUS20           ICON         "xstatus20.ico"

+IDI_XSTATUS21           ICON         "xstatus21.ico"

+IDI_XSTATUS22           ICON         "xstatus22.ico"

+IDI_XSTATUS23           ICON         "xstatus23.ico"

+IDI_XSTATUS24           ICON         "xstatus24.ico"

+IDI_XSTATUS25           ICON         "xstatus25.ico"

+IDI_XSTATUS26           ICON         "xstatus26.ico"

+IDI_XSTATUS27           ICON         "xstatus27.ico"

+IDI_XSTATUS28           ICON         "xstatus28.ico"

+IDI_XSTATUS29           ICON         "xstatus29.ico"

+IDI_XSTATUS30           ICON         "xstatus30.ico"

+IDI_XSTATUS31           ICON         "xstatus31.ico"

+IDI_XSTATUS32           ICON         "xstatus32.ico"

+IDI_XSTATUS33           ICON         "xstatus33.ico"

+IDI_XSTATUS34           ICON         "xstatus34.ico"

+IDI_XSTATUS35           ICON         "xstatus35.ico"

+IDI_XSTATUS36           ICON         "xstatus36.ico"

+IDI_XSTATUS37           ICON         "xstatus37.ico"

+IDI_XSTATUS38           ICON         "xstatus38.ico"

+IDI_XSTATUS39           ICON         "xstatus39.ico"

+IDI_XSTATUS40           ICON         "xstatus40.ico"

+IDI_XSTATUS41           ICON         "xstatus41.ico"

+IDI_XSTATUS42           ICON         "xstatus42.ico"

+IDI_XSTATUS43           ICON         "xstatus43.ico"

+IDI_XSTATUS44           ICON         "xstatus44.ico"

+IDI_XSTATUS45           ICON         "xstatus45.ico"

+IDI_XSTATUS46           ICON         "xstatus46.ico"

+IDI_XSTATUS47           ICON         "xstatus47.ico"

+IDI_XSTATUS48           ICON         "xstatus48.ico"

+IDI_XSTATUS49           ICON         "xstatus49.ico"

+IDI_XSTATUS50           ICON         "xstatus50.ico"

+IDI_XSTATUS51           ICON         "xstatus51.ico"

+IDI_XSTATUS52           ICON         "xstatus52.ico"

+IDI_XSTATUS53           ICON         "xstatus53.ico"

+IDI_XSTATUS54           ICON         "xstatus54.ico"

+IDI_XSTATUS55           ICON         "xstatus55.ico"

+IDI_XSTATUS56           ICON         "xstatus56.ico"

+IDI_XSTATUS57           ICON         "xstatus57.ico"

+IDI_XSTATUS58           ICON         "xstatus58.ico"

+IDI_XSTATUS59           ICON         "xstatus59.ico"

+IDI_XSTATUS60           ICON         "xstatus60.ico"

+IDI_XSTATUS61           ICON         "xstatus61.ico"

+IDI_XSTATUS62           ICON         "xstatus62.ico"

+IDI_XSTATUS63           ICON         "xstatus63.ico"

+IDI_XSTATUS64           ICON         "xstatus64.ico"

+IDI_XSTATUS65           ICON         "xstatus65.ico"

+IDI_XSTATUS66           ICON         "xstatus66.ico"

+IDI_XSTATUS67           ICON         "xstatus67.ico"

+IDI_XSTATUS68           ICON         "xstatus68.ico"

+IDI_XSTATUS69           ICON         "xstatus69.ico"

+IDI_XSTATUS70           ICON         "xstatus70.ico"

+IDI_XSTATUS71           ICON         "xstatus71.ico"

+IDI_XSTATUS72           ICON         "xstatus72.ico"

+IDI_XSTATUS73           ICON         "xstatus73.ico"

+IDI_XSTATUS74           ICON         "xstatus74.ico"

+IDI_XSTATUS75           ICON         "xstatus75.ico"

+IDI_XSTATUS76           ICON         "xstatus76.ico"

+IDI_XSTATUS77           ICON         "xstatus77.ico"

+IDI_XSTATUS78           ICON         "xstatus78.ico"

+IDI_XSTATUS79           ICON         "xstatus79.ico"

+IDI_XSTATUS80           ICON         "xstatus80.ico"

+IDI_XSTATUS81           ICON         "xstatus81.ico"

+IDI_XSTATUS82           ICON         "xstatus82.ico"

+IDI_XSTATUS83           ICON         "xstatus83.ico"

+IDI_XSTATUS84           ICON         "xstatus84.ico"

+IDI_XSTATUS85           ICON         "xstatus85.ico"

+IDI_XSTATUS86           ICON         "xstatus86.ico"

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+   IDS_IDENTIFY            "# Custom Status Icons #"

+END

+

+

+

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

+/////////////////////////////////////////////////////////////////////////////

+

diff --git a/protocols/IcqOscarJ/icos/Xstatus34.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus34.ico
index 38114d9acf..38114d9acf 100644
--- a/protocols/IcqOscarJ/icos/Xstatus34.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus34.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus35.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus35.ico
index c5c30aaeb7..c5c30aaeb7 100644
--- a/protocols/IcqOscarJ/icos/Xstatus35.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus35.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus36.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus36.ico
index dee0c22ca5..dee0c22ca5 100644
--- a/protocols/IcqOscarJ/icos/Xstatus36.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus36.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus38.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus38.ico
index afadf91c75..afadf91c75 100644
--- a/protocols/IcqOscarJ/icos/Xstatus38.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus38.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus39.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus39.ico
index b54a71dfe4..b54a71dfe4 100644
--- a/protocols/IcqOscarJ/icos/Xstatus39.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus39.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus40.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus40.ico
index ea17ad64eb..ea17ad64eb 100644
--- a/protocols/IcqOscarJ/icos/Xstatus40.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus40.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus41.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus41.ico
index 59782c42e0..59782c42e0 100644
--- a/protocols/IcqOscarJ/icos/Xstatus41.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus41.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus42.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus42.ico
index bb73d54be7..bb73d54be7 100644
--- a/protocols/IcqOscarJ/icos/Xstatus42.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus42.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus45.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus45.ico
index dbbd46b51b..dbbd46b51b 100644
--- a/protocols/IcqOscarJ/icos/Xstatus45.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus45.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus46.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus46.ico
index 377b5b7a1b..377b5b7a1b 100644
--- a/protocols/IcqOscarJ/icos/Xstatus46.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus46.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus47.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus47.ico
index f2333035af..f2333035af 100644
--- a/protocols/IcqOscarJ/icos/Xstatus47.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus47.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus48.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus48.ico
index af9bc70b11..af9bc70b11 100644
--- a/protocols/IcqOscarJ/icos/Xstatus48.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus48.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus49.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus49.ico
index 274eb57cc2..274eb57cc2 100644
--- a/protocols/IcqOscarJ/icos/Xstatus49.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus49.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus50.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus50.ico
index f86143e326..f86143e326 100644
--- a/protocols/IcqOscarJ/icos/Xstatus50.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus50.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus51.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus51.ico
index a0cd9fb014..a0cd9fb014 100644
--- a/protocols/IcqOscarJ/icos/Xstatus51.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus51.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus52.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus52.ico
index 47addb388a..47addb388a 100644
--- a/protocols/IcqOscarJ/icos/Xstatus52.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus52.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus53.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus53.ico
index d3ef8d1154..d3ef8d1154 100644
--- a/protocols/IcqOscarJ/icos/Xstatus53.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus53.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus54.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus54.ico
index 8cfb718724..8cfb718724 100644
--- a/protocols/IcqOscarJ/icos/Xstatus54.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus54.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus56.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus56.ico
index 60dbf31dc6..60dbf31dc6 100644
--- a/protocols/IcqOscarJ/icos/Xstatus56.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus56.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus57.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus57.ico
index cf58a2c4f9..cf58a2c4f9 100644
--- a/protocols/IcqOscarJ/icos/Xstatus57.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus57.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus58.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus58.ico
index e421d43285..e421d43285 100644
--- a/protocols/IcqOscarJ/icos/Xstatus58.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus58.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus59.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus59.ico
index 9ebab2cb61..9ebab2cb61 100644
--- a/protocols/IcqOscarJ/icos/Xstatus59.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus59.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus60.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus60.ico
index 44c7c56542..44c7c56542 100644
--- a/protocols/IcqOscarJ/icos/Xstatus60.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus60.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus61.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus61.ico
index 70751da56c..70751da56c 100644
--- a/protocols/IcqOscarJ/icos/Xstatus61.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus61.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus62.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus62.ico
index 1024cd9af3..1024cd9af3 100644
--- a/protocols/IcqOscarJ/icos/Xstatus62.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus62.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus63.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus63.ico
index ae1e0c8c87..ae1e0c8c87 100644
--- a/protocols/IcqOscarJ/icos/Xstatus63.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus63.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus65.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus65.ico
index 784978cc7b..784978cc7b 100644
--- a/protocols/IcqOscarJ/icos/Xstatus65.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus65.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus66.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus66.ico
index 46174f0280..46174f0280 100644
--- a/protocols/IcqOscarJ/icos/Xstatus66.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus66.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus67.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus67.ico
index 52cd285f23..52cd285f23 100644
--- a/protocols/IcqOscarJ/icos/Xstatus67.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus67.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus68.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus68.ico
index 72e77bbe24..72e77bbe24 100644
--- a/protocols/IcqOscarJ/icos/Xstatus68.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus68.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus69.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus69.ico
index f4c396f5e3..f4c396f5e3 100644
--- a/protocols/IcqOscarJ/icos/Xstatus69.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus69.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus70.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus70.ico
index 9c422ad470..9c422ad470 100644
--- a/protocols/IcqOscarJ/icos/Xstatus70.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus70.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus71.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus71.ico
index 4fc5b36117..4fc5b36117 100644
--- a/protocols/IcqOscarJ/icos/Xstatus71.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus71.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus72.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus72.ico
index f759dca12d..f759dca12d 100644
--- a/protocols/IcqOscarJ/icos/Xstatus72.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus72.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus73.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus73.ico
index 3a6edc17ce..3a6edc17ce 100644
--- a/protocols/IcqOscarJ/icos/Xstatus73.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus73.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus74.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus74.ico
index 52683e7266..52683e7266 100644
--- a/protocols/IcqOscarJ/icos/Xstatus74.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus74.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus75.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus75.ico
index 2ff37ebed6..2ff37ebed6 100644
--- a/protocols/IcqOscarJ/icos/Xstatus75.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus75.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus76.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus76.ico
index b4b1304d0a..b4b1304d0a 100644
--- a/protocols/IcqOscarJ/icos/Xstatus76.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus76.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus77.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus77.ico
index 4394522002..4394522002 100644
--- a/protocols/IcqOscarJ/icos/Xstatus77.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus77.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus78.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus78.ico
index e7681eaaa1..e7681eaaa1 100644
--- a/protocols/IcqOscarJ/icos/Xstatus78.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus78.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus79.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus79.ico
index 22b8bde3f3..22b8bde3f3 100644
--- a/protocols/IcqOscarJ/icos/Xstatus79.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus79.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus81.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus81.ico
index 658c06df23..658c06df23 100644
--- a/protocols/IcqOscarJ/icos/Xstatus81.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus81.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus82.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus82.ico
index 5a02cd4b0e..5a02cd4b0e 100644
--- a/protocols/IcqOscarJ/icos/Xstatus82.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus82.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus83.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus83.ico
index df1b96b669..df1b96b669 100644
--- a/protocols/IcqOscarJ/icos/Xstatus83.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus83.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus84.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus84.ico
index 59461759dc..59461759dc 100644
--- a/protocols/IcqOscarJ/icos/Xstatus84.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus84.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus86.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus86.ico
index 6a1c484040..6a1c484040 100644
--- a/protocols/IcqOscarJ/icos/Xstatus86.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus86.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus01.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus01.ico
index 98e1a70a8c..98e1a70a8c 100644
--- a/protocols/IcqOscarJ/icos/xstatus01.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus01.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus02.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus02.ico
index 6153e0d4ab..6153e0d4ab 100644
--- a/protocols/IcqOscarJ/icos/xstatus02.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus02.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus03.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus03.ico
index 70796a2128..70796a2128 100644
--- a/protocols/IcqOscarJ/icos/xstatus03.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus03.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus04.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus04.ico
index 0c86d1a6b3..0c86d1a6b3 100644
--- a/protocols/IcqOscarJ/icos/xstatus04.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus04.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus05.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus05.ico
index a7f0bfc99e..a7f0bfc99e 100644
--- a/protocols/IcqOscarJ/icos/xstatus05.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus05.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus06.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus06.ico
index 7f565d4ac1..7f565d4ac1 100644
--- a/protocols/IcqOscarJ/icos/xstatus06.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus06.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus07.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus07.ico
index 46c7087662..46c7087662 100644
--- a/protocols/IcqOscarJ/icos/xstatus07.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus07.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus08.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus08.ico
index 63c385f9da..63c385f9da 100644
--- a/protocols/IcqOscarJ/icos/xstatus08.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus08.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus09.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus09.ico
index d7fdbd4bd5..d7fdbd4bd5 100644
--- a/protocols/IcqOscarJ/icos/xstatus09.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus09.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus10.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus10.ico
index baf014ec1c..baf014ec1c 100644
--- a/protocols/IcqOscarJ/icos/xstatus10.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus10.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus11.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus11.ico
index 2007ba936a..2007ba936a 100644
--- a/protocols/IcqOscarJ/icos/xstatus11.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus11.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus12.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus12.ico
index b0daef70f4..b0daef70f4 100644
--- a/protocols/IcqOscarJ/icos/xstatus12.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus12.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus13.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus13.ico
index b0ae976442..b0ae976442 100644
--- a/protocols/IcqOscarJ/icos/xstatus13.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus13.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus14.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus14.ico
index 17cfd90007..17cfd90007 100644
--- a/protocols/IcqOscarJ/icos/xstatus14.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus14.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus15.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus15.ico
index 702ba16f2d..702ba16f2d 100644
--- a/protocols/IcqOscarJ/icos/xstatus15.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus15.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus16.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus16.ico
index 853dc12fd2..853dc12fd2 100644
--- a/protocols/IcqOscarJ/icos/xstatus16.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus16.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus17.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus17.ico
index dd891cf169..dd891cf169 100644
--- a/protocols/IcqOscarJ/icos/xstatus17.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus17.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus18.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus18.ico
index a95d361dcd..a95d361dcd 100644
--- a/protocols/IcqOscarJ/icos/xstatus18.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus18.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus19.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus19.ico
index 8eb3821554..8eb3821554 100644
--- a/protocols/IcqOscarJ/icos/xstatus19.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus19.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus20.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus20.ico
index 0d90d8ba1c..0d90d8ba1c 100644
--- a/protocols/IcqOscarJ/icos/xstatus20.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus20.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus21.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus21.ico
index fa21d3a4e3..fa21d3a4e3 100644
--- a/protocols/IcqOscarJ/icos/xstatus21.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus21.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus22.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus22.ico
index ad8faded21..ad8faded21 100644
--- a/protocols/IcqOscarJ/icos/xstatus22.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus22.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus23.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus23.ico
index f6b92255b6..f6b92255b6 100644
--- a/protocols/IcqOscarJ/icos/xstatus23.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus23.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus24.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus24.ico
index 3ad736d73b..3ad736d73b 100644
--- a/protocols/IcqOscarJ/icos/xstatus24.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus24.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus25.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus25.ico
index 1c0214cd1a..1c0214cd1a 100644
--- a/protocols/IcqOscarJ/icos/xstatus25.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus25.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus26.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus26.ico
index b085157f52..b085157f52 100644
--- a/protocols/IcqOscarJ/icos/xstatus26.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus26.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus27.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus27.ico
index c3fb1e6678..c3fb1e6678 100644
--- a/protocols/IcqOscarJ/icos/xstatus27.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus27.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus28.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus28.ico
index e3cc32037e..e3cc32037e 100644
--- a/protocols/IcqOscarJ/icos/xstatus28.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus28.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus29.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus29.ico
index 3217396cbe..3217396cbe 100644
--- a/protocols/IcqOscarJ/icos/xstatus29.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus29.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus30.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus30.ico
index db97d2d4ea..db97d2d4ea 100644
--- a/protocols/IcqOscarJ/icos/xstatus30.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus30.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus31.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus31.ico
index 1176383b5b..1176383b5b 100644
--- a/protocols/IcqOscarJ/icos/xstatus31.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus31.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus32.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus32.ico
index c68ca5bd2a..c68ca5bd2a 100644
--- a/protocols/IcqOscarJ/icos/xstatus32.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus32.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus33.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus33.ico
index ed8632d5eb..ed8632d5eb 100644
--- a/protocols/IcqOscarJ/icos/xstatus33.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus33.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus37.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus37.ico
index 4bb33ec9ac..4bb33ec9ac 100644
--- a/protocols/IcqOscarJ/icos/xstatus37.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus37.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus43.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus43.ico
index 6f49a31dc4..6f49a31dc4 100644
--- a/protocols/IcqOscarJ/icos/xstatus43.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus43.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus44.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus44.ico
index 4644afa89f..4644afa89f 100644
--- a/protocols/IcqOscarJ/icos/xstatus44.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus44.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus55.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus55.ico
index 7ad6286985..7ad6286985 100644
--- a/protocols/IcqOscarJ/icos/xstatus55.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus55.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus64.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus64.ico
index 1144ba9b49..1144ba9b49 100644
--- a/protocols/IcqOscarJ/icos/xstatus64.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus64.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus80.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus80.ico
index 30f7dd2670..30f7dd2670 100644
--- a/protocols/IcqOscarJ/icos/xstatus80.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus80.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus85.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus85.ico
index b9db7058ba..b9db7058ba 100644
--- a/protocols/IcqOscarJ/icos/xstatus85.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus85.ico
diff --git a/protocols/IcqOscarJ/icons_pack/src/resource.h b/protocols/IcqOscarJ/icons_pack/src/resource.h
new file mode 100644
index 0000000000..119ed41495
--- /dev/null
+++ b/protocols/IcqOscarJ/icons_pack/src/resource.h
@@ -0,0 +1,101 @@
+//{{NO_DEPENDENCIES}}

+// Microsoft Developer Studio generated include file.

+// Used by resources.rc

+//

+#define IDI_XSTATUS1                    201

+#define IDI_XSTATUS2                    202

+#define IDI_XSTATUS3                    203

+#define IDI_XSTATUS4                    204

+#define IDI_XSTATUS5                    205

+#define IDI_XSTATUS6                    206

+#define IDI_XSTATUS7                    207

+#define IDI_XSTATUS8                    208

+#define IDI_XSTATUS9                    209

+#define IDI_XSTATUS10                   210

+#define IDI_XSTATUS11                   211

+#define IDI_XSTATUS12                   212

+#define IDI_XSTATUS13                   213

+#define IDI_XSTATUS14                   214

+#define IDI_XSTATUS15                   215

+#define IDI_XSTATUS16                   216

+#define IDI_XSTATUS17                   217

+#define IDI_XSTATUS18                   218

+#define IDI_XSTATUS19                   219

+#define IDI_XSTATUS20                   220

+#define IDI_XSTATUS21                   221

+#define IDI_XSTATUS22                   222

+#define IDI_XSTATUS23                   223

+#define IDI_XSTATUS24                   224

+#define IDI_XSTATUS25                   225

+#define IDI_XSTATUS26                   226

+#define IDI_XSTATUS27                   227

+#define IDI_XSTATUS28                   228

+#define IDI_XSTATUS29                   229

+#define IDI_XSTATUS30                   230

+#define IDI_XSTATUS31                   231

+#define IDI_XSTATUS32                   232

+#define IDI_XSTATUS33                   233

+#define IDI_XSTATUS34                   234

+#define IDI_XSTATUS35                   235

+#define IDI_XSTATUS36                   236

+#define IDI_XSTATUS37                   237

+#define IDI_XSTATUS38                   238

+#define IDI_XSTATUS39                   239

+#define IDI_XSTATUS40                   240

+#define IDI_XSTATUS41                   241

+#define IDI_XSTATUS42                   242

+#define IDI_XSTATUS43                   243

+#define IDI_XSTATUS44                   244

+#define IDI_XSTATUS45                   245

+#define IDI_XSTATUS46                   246

+#define IDI_XSTATUS47                   247

+#define IDI_XSTATUS48                   248

+#define IDI_XSTATUS49                   249

+#define IDI_XSTATUS50                   250

+#define IDI_XSTATUS51                   251

+#define IDI_XSTATUS52                   252

+#define IDI_XSTATUS53                   253

+#define IDI_XSTATUS54                   254

+#define IDI_XSTATUS55                   255

+#define IDI_XSTATUS56                   256

+#define IDI_XSTATUS57                   257

+#define IDI_XSTATUS58                   258

+#define IDI_XSTATUS59                   259

+#define IDI_XSTATUS60                   260

+#define IDI_XSTATUS61                   261

+#define IDI_XSTATUS62                   262

+#define IDI_XSTATUS63                   263

+#define IDI_XSTATUS64                   264

+#define IDI_XSTATUS65                   265

+#define IDI_XSTATUS66                   266

+#define IDI_XSTATUS67                   267

+#define IDI_XSTATUS68                   268

+#define IDI_XSTATUS69                   269

+#define IDI_XSTATUS70                   270

+#define IDI_XSTATUS71                   271

+#define IDI_XSTATUS72                   272

+#define IDI_XSTATUS73                   273

+#define IDI_XSTATUS74                   274

+#define IDI_XSTATUS75                   275

+#define IDI_XSTATUS76                   276

+#define IDI_XSTATUS77                   277

+#define IDI_XSTATUS78                   278

+#define IDI_XSTATUS79                   279

+#define IDI_XSTATUS80                   280

+#define IDI_XSTATUS81                   281

+#define IDI_XSTATUS82                   282

+#define IDI_XSTATUS83                   283

+#define IDI_XSTATUS84                   284

+#define IDI_XSTATUS85                   285

+#define IDI_XSTATUS86                   286

+

+// Next default values for new objects

+// 

+#ifdef APSTUDIO_INVOKED

+#ifndef APSTUDIO_READONLY_SYMBOLS

+#define _APS_NEXT_RESOURCE_VALUE        113

+#define _APS_NEXT_COMMAND_VALUE         40001

+#define _APS_NEXT_CONTROL_VALUE         1026

+#define _APS_NEXT_SYMED_VALUE           101

+#endif

+#endif

diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj b/protocols/IcqOscarJ/icqoscar8_10.vcxproj
index 00cbc0213f..b94751a495 100644
--- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj
+++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj
@@ -197,106 +197,102 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    <ClInclude Include="changeinfo\changeinfo.h" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

-    <None Include="docs\icq-readme.txt" />

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

   </ItemGroup>

   <ItemGroup>

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

-  </ItemGroup>

-  <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    <ClCompile Include="UI\askauthentication.cpp" />

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

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

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

-    <ClCompile Include="UI\loginpassword.cpp" />

-    <ClCompile Include="UI\userinfotab.cpp" />

-    <ClCompile Include="changeinfo\constants.cpp" />

-    <ClCompile Include="changeinfo\db.cpp" />

-    <ClCompile Include="changeinfo\dlgproc.cpp" />

-    <ClCompile Include="changeinfo\editlist.cpp" />

-    <ClCompile Include="changeinfo\editstring.cpp" />

-    <ClCompile Include="changeinfo\main.cpp" />

-    <ClCompile Include="changeinfo\upload.cpp" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    <ClCompile Include="icqoscar.cpp">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
index a7310551e1..3917331d49 100644
--- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
+++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
@@ -33,248 +33,240 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="capabilities.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="channels.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="cookies.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="families.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="guids.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="i18n.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="iconlib.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_advsearch.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_avatar.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_constants.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_direct.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_fieldnames.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_http.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_packet.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_proto.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_rates.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_server.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icq_servlist.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icqosc_svcs.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icqoscar.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="init.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="log.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="oscar_filetransfer.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="stdpackets.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="tlv.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utilities.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="changeinfo\changeinfo.h">

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

       <Filter>Changeinfo</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="docs\icq-readme.txt">

-      <Filter>Documentation</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resources.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="chan_01login.cpp">

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

       <Filter>FLAP Channels</Filter>

     </ClCompile>

-    <ClCompile Include="chan_02data.cpp">

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

       <Filter>FLAP Channels</Filter>

     </ClCompile>

-    <ClCompile Include="chan_03error.cpp">

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

       <Filter>FLAP Channels</Filter>

     </ClCompile>

-    <ClCompile Include="chan_04close.cpp">

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

       <Filter>FLAP Channels</Filter>

     </ClCompile>

-    <ClCompile Include="chan_05ping.cpp">

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

       <Filter>FLAP Channels</Filter>

     </ClCompile>

-    <ClCompile Include="fam_01service.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_02location.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_03buddy.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_04message.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_09bos.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_0alookup.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_0bstatus.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_13servclist.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_15icqserver.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="fam_17signon.cpp">

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

       <Filter>SNAC Families</Filter>

     </ClCompile>

-    <ClCompile Include="icq_direct.cpp">

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

       <Filter>Direct Connection</Filter>

     </ClCompile>

-    <ClCompile Include="icq_directmsg.cpp">

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

       <Filter>Direct Connection</Filter>

     </ClCompile>

-    <ClCompile Include="icq_filerequests.cpp">

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

       <Filter>Direct Connection</Filter>

     </ClCompile>

-    <ClCompile Include="icq_filetransfer.cpp">

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

       <Filter>Direct Connection</Filter>

     </ClCompile>

-    <ClCompile Include="oscar_filetransfer.cpp">

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

       <Filter>Direct Connection</Filter>

     </ClCompile>

-    <ClCompile Include="icq_advsearch.cpp">

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

-    <ClCompile Include="icq_db.cpp">

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

-    <ClCompile Include="icq_popups.cpp">

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

-    <ClCompile Include="icq_proto.cpp">

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

-    <ClCompile Include="icq_xstatus.cpp">

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

-    <ClCompile Include="icqosc_svcs.cpp">

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

-    <ClCompile Include="init.cpp">

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

-    <ClCompile Include="log.cpp">

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

-    <ClCompile Include="UI\askauthentication.cpp">

+    <ClCompile Include="src\UI\askauthentication.cpp">

       <Filter>UI</Filter>

     </ClCompile>

-    <ClCompile Include="icq_firstrun.cpp">

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

       <Filter>UI</Filter>

     </ClCompile>

-    <ClCompile Include="icq_opts.cpp">

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

       <Filter>UI</Filter>

     </ClCompile>

-    <ClCompile Include="icq_uploadui.cpp">

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

       <Filter>UI</Filter>

     </ClCompile>

-    <ClCompile Include="UI\loginpassword.cpp">

+    <ClCompile Include="src\UI\loginpassword.cpp">

       <Filter>UI</Filter>

     </ClCompile>

-    <ClCompile Include="UI\userinfotab.cpp">

+    <ClCompile Include="src\UI\userinfotab.cpp">

       <Filter>UI</Filter>

     </ClCompile>

-    <ClCompile Include="changeinfo\constants.cpp">

+    <ClCompile Include="src\changeinfo\constants.cpp">

       <Filter>Changeinfo</Filter>

     </ClCompile>

-    <ClCompile Include="changeinfo\db.cpp">

+    <ClCompile Include="src\changeinfo\db.cpp">

       <Filter>Changeinfo</Filter>

     </ClCompile>

-    <ClCompile Include="changeinfo\dlgproc.cpp">

+    <ClCompile Include="src\changeinfo\dlgproc.cpp">

       <Filter>Changeinfo</Filter>

     </ClCompile>

-    <ClCompile Include="changeinfo\editlist.cpp">

+    <ClCompile Include="src\changeinfo\editlist.cpp">

       <Filter>Changeinfo</Filter>

     </ClCompile>

-    <ClCompile Include="changeinfo\editstring.cpp">

+    <ClCompile Include="src\changeinfo\editstring.cpp">

       <Filter>Changeinfo</Filter>

     </ClCompile>

-    <ClCompile Include="changeinfo\main.cpp">

+    <ClCompile Include="src\changeinfo\main.cpp">

       <Filter>Changeinfo</Filter>

     </ClCompile>

-    <ClCompile Include="changeinfo\upload.cpp">

+    <ClCompile Include="src\changeinfo\upload.cpp">

       <Filter>Changeinfo</Filter>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    <ClCompile Include="icq_menu.cpp">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

       <Filter>Miranda Bits</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj b/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj
index de86e8248c..012196ddaf 100644
--- a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj
+++ b/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj.filters b/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj.filters
index 12cfc7e376..6f24876932 100644
--- a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj.filters
+++ b/protocols/IcqOscarJ/proto_icq/Proto_ICQ.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_ICQ.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/IcqOscarJ/proto_icq/icos/Away.ico b/protocols/IcqOscarJ/proto_icq/res/Away.ico
index ec77463401..ec77463401 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Away.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Away.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/DND.ico b/protocols/IcqOscarJ/proto_icq/res/DND.ico
index 1e321b41e2..1e321b41e2 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/DND.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/DND.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/FFC.ico b/protocols/IcqOscarJ/proto_icq/res/FFC.ico
index 2bb381d6a3..2bb381d6a3 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/FFC.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/FFC.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Invisible.ico b/protocols/IcqOscarJ/proto_icq/res/Invisible.ico
index 9962090108..9962090108 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Invisible.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Invisible.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/NA.ico b/protocols/IcqOscarJ/proto_icq/res/NA.ico
index 6cb72f1510..6cb72f1510 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/NA.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/NA.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Occupied.ico b/protocols/IcqOscarJ/proto_icq/res/Occupied.ico
index 711bcd53e5..711bcd53e5 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Occupied.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Occupied.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Offline.ico b/protocols/IcqOscarJ/proto_icq/res/Offline.ico
index 3684dbc20b..3684dbc20b 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Offline.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Offline.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Online.ico b/protocols/IcqOscarJ/proto_icq/res/Online.ico
index 8c828871bb..8c828871bb 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Online.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Online.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Phone.ico b/protocols/IcqOscarJ/proto_icq/res/Phone.ico
index 476461a8d0..476461a8d0 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Phone.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Phone.ico
diff --git a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.rc b/protocols/IcqOscarJ/proto_icq/res/Proto_ICQ.rc
index 51337c2e4f..64c5e8b7bd 100644
--- a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.rc
+++ b/protocols/IcqOscarJ/proto_icq/res/Proto_ICQ.rc
diff --git a/protocols/IcqOscarJ/proto_icq/resource.h b/protocols/IcqOscarJ/proto_icq/src/resource.h
index 51271432b6..51271432b6 100644
--- a/protocols/IcqOscarJ/proto_icq/resource.h
+++ b/protocols/IcqOscarJ/proto_icq/src/resource.h
diff --git a/protocols/IcqOscarJ/icos/auth_ask.ico b/protocols/IcqOscarJ/res/auth_ask.ico
index 1db6f7f23e..1db6f7f23e 100644
--- a/protocols/IcqOscarJ/icos/auth_ask.ico
+++ b/protocols/IcqOscarJ/res/auth_ask.ico
diff --git a/protocols/IcqOscarJ/icos/auth_grant.ico b/protocols/IcqOscarJ/res/auth_grant.ico
index 44d5b29a31..44d5b29a31 100644
--- a/protocols/IcqOscarJ/icos/auth_grant.ico
+++ b/protocols/IcqOscarJ/res/auth_grant.ico
diff --git a/protocols/IcqOscarJ/icos/auth_revoke.ico b/protocols/IcqOscarJ/res/auth_revoke.ico
index e483681727..e483681727 100644
--- a/protocols/IcqOscarJ/icos/auth_revoke.ico
+++ b/protocols/IcqOscarJ/res/auth_revoke.ico
diff --git a/protocols/IcqOscarJ/changeinfo/expandst.ico b/protocols/IcqOscarJ/res/expandst.ico
index 17367fe8d3..17367fe8d3 100644
--- a/protocols/IcqOscarJ/changeinfo/expandst.ico
+++ b/protocols/IcqOscarJ/res/expandst.ico
diff --git a/protocols/IcqOscarJ/icos/icq.ico b/protocols/IcqOscarJ/res/icq.ico
index 98a99aca1c..98a99aca1c 100644
--- a/protocols/IcqOscarJ/icos/icq.ico
+++ b/protocols/IcqOscarJ/res/icq.ico
diff --git a/protocols/IcqOscarJ/resources.rc b/protocols/IcqOscarJ/res/resources.rc
index 563f6eeb5e..d1dc830ab1 100644
--- a/protocols/IcqOscarJ/resources.rc
+++ b/protocols/IcqOscarJ/res/resources.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include "winres.h"

-#include "version.h"

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

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

 #undef APSTUDIO_READONLY_SYMBOLS

 

@@ -26,12 +26,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

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

 // remains consistent on all systems.

-IDI_ICQ                 ICON                    "icos/icq.ico"

-IDI_AUTH_ASK            ICON                    "icos/auth_ask.ico"

-IDI_AUTH_GRANT          ICON                    "icos/auth_grant.ico"

-IDI_AUTH_REVOKE         ICON                    "icos/auth_revoke.ico"

-IDI_SERVLIST_ADD        ICON                    "icos/srvlist_add.ico"

-IDI_EXPANDSTRINGEDIT    ICON                    "changeinfo/expandst.ico"

+IDI_ICQ                 ICON                    "icq.ico"

+IDI_AUTH_ASK            ICON                    "auth_ask.ico"

+IDI_AUTH_GRANT          ICON                    "auth_grant.ico"

+IDI_AUTH_REVOKE         ICON                    "auth_revoke.ico"

+IDI_SERVLIST_ADD        ICON                    "srvlist_add.ico"

+IDI_EXPANDSTRINGEDIT    ICON                    "expandst.ico"

 

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

 //

@@ -522,13 +522,13 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

 BEGIN

     "#include ""winres.h""\0"

-    "#include ""version.h""\0"

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

 END

 

 3 TEXTINCLUDE 

diff --git a/protocols/IcqOscarJ/icos/srvlist_add.ico b/protocols/IcqOscarJ/res/srvlist_add.ico
index 18b12f8c38..18b12f8c38 100644
--- a/protocols/IcqOscarJ/icos/srvlist_add.ico
+++ b/protocols/IcqOscarJ/res/srvlist_add.ico
diff --git a/protocols/IcqOscarJ/UI/askauthentication.cpp b/protocols/IcqOscarJ/src/UI/askauthentication.cpp
index 818d5ce6de..818d5ce6de 100644
--- a/protocols/IcqOscarJ/UI/askauthentication.cpp
+++ b/protocols/IcqOscarJ/src/UI/askauthentication.cpp
diff --git a/protocols/IcqOscarJ/UI/icqoscar.h b/protocols/IcqOscarJ/src/UI/icqoscar.h
index 77283f6f7f..77283f6f7f 100644
--- a/protocols/IcqOscarJ/UI/icqoscar.h
+++ b/protocols/IcqOscarJ/src/UI/icqoscar.h
diff --git a/protocols/IcqOscarJ/UI/loginpassword.cpp b/protocols/IcqOscarJ/src/UI/loginpassword.cpp
index ab65212331..ab65212331 100644
--- a/protocols/IcqOscarJ/UI/loginpassword.cpp
+++ b/protocols/IcqOscarJ/src/UI/loginpassword.cpp
diff --git a/protocols/IcqOscarJ/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
index 91d28c0e04..91d28c0e04 100644
--- a/protocols/IcqOscarJ/UI/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
diff --git a/protocols/IcqOscarJ/capabilities.cpp b/protocols/IcqOscarJ/src/capabilities.cpp
index f994f861af..f994f861af 100644
--- a/protocols/IcqOscarJ/capabilities.cpp
+++ b/protocols/IcqOscarJ/src/capabilities.cpp
diff --git a/protocols/IcqOscarJ/capabilities.h b/protocols/IcqOscarJ/src/capabilities.h
index 3b6590dd09..3b6590dd09 100644
--- a/protocols/IcqOscarJ/capabilities.h
+++ b/protocols/IcqOscarJ/src/capabilities.h
diff --git a/protocols/IcqOscarJ/chan_01login.cpp b/protocols/IcqOscarJ/src/chan_01login.cpp
index 3c4c4febc6..3c4c4febc6 100644
--- a/protocols/IcqOscarJ/chan_01login.cpp
+++ b/protocols/IcqOscarJ/src/chan_01login.cpp
diff --git a/protocols/IcqOscarJ/chan_02data.cpp b/protocols/IcqOscarJ/src/chan_02data.cpp
index d55e0262e9..d55e0262e9 100644
--- a/protocols/IcqOscarJ/chan_02data.cpp
+++ b/protocols/IcqOscarJ/src/chan_02data.cpp
diff --git a/protocols/IcqOscarJ/chan_03error.cpp b/protocols/IcqOscarJ/src/chan_03error.cpp
index 71c6e2ea7c..71c6e2ea7c 100644
--- a/protocols/IcqOscarJ/chan_03error.cpp
+++ b/protocols/IcqOscarJ/src/chan_03error.cpp
diff --git a/protocols/IcqOscarJ/chan_04close.cpp b/protocols/IcqOscarJ/src/chan_04close.cpp
index 3c9ee46350..3c9ee46350 100644
--- a/protocols/IcqOscarJ/chan_04close.cpp
+++ b/protocols/IcqOscarJ/src/chan_04close.cpp
diff --git a/protocols/IcqOscarJ/chan_05ping.cpp b/protocols/IcqOscarJ/src/chan_05ping.cpp
index 2a2b843509..2a2b843509 100644
--- a/protocols/IcqOscarJ/chan_05ping.cpp
+++ b/protocols/IcqOscarJ/src/chan_05ping.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/changeinfo.h b/protocols/IcqOscarJ/src/changeinfo/changeinfo.h
index ecc4fc3106..ecc4fc3106 100644
--- a/protocols/IcqOscarJ/changeinfo/changeinfo.h
+++ b/protocols/IcqOscarJ/src/changeinfo/changeinfo.h
diff --git a/protocols/IcqOscarJ/changeinfo/constants.cpp b/protocols/IcqOscarJ/src/changeinfo/constants.cpp
index 92403a74f0..92403a74f0 100644
--- a/protocols/IcqOscarJ/changeinfo/constants.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/constants.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/db.cpp b/protocols/IcqOscarJ/src/changeinfo/db.cpp
index 643dcaa034..643dcaa034 100644
--- a/protocols/IcqOscarJ/changeinfo/db.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/db.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/dlgproc.cpp b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
index 404777aa97..404777aa97 100644
--- a/protocols/IcqOscarJ/changeinfo/dlgproc.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/editlist.cpp b/protocols/IcqOscarJ/src/changeinfo/editlist.cpp
index f2a1470fd3..f2a1470fd3 100644
--- a/protocols/IcqOscarJ/changeinfo/editlist.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/editlist.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/editstring.cpp b/protocols/IcqOscarJ/src/changeinfo/editstring.cpp
index 288351e8d3..288351e8d3 100644
--- a/protocols/IcqOscarJ/changeinfo/editstring.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/editstring.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/icqoscar.h b/protocols/IcqOscarJ/src/changeinfo/icqoscar.h
index 77283f6f7f..77283f6f7f 100644
--- a/protocols/IcqOscarJ/changeinfo/icqoscar.h
+++ b/protocols/IcqOscarJ/src/changeinfo/icqoscar.h
diff --git a/protocols/IcqOscarJ/changeinfo/main.cpp b/protocols/IcqOscarJ/src/changeinfo/main.cpp
index 22669be3aa..22669be3aa 100644
--- a/protocols/IcqOscarJ/changeinfo/main.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/main.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/upload.cpp b/protocols/IcqOscarJ/src/changeinfo/upload.cpp
index a468dc9f2b..a468dc9f2b 100644
--- a/protocols/IcqOscarJ/changeinfo/upload.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/upload.cpp
diff --git a/protocols/IcqOscarJ/channels.h b/protocols/IcqOscarJ/src/channels.h
index ba10483b56..ba10483b56 100644
--- a/protocols/IcqOscarJ/channels.h
+++ b/protocols/IcqOscarJ/src/channels.h
diff --git a/protocols/IcqOscarJ/cookies.cpp b/protocols/IcqOscarJ/src/cookies.cpp
index 87ffb4bc07..87ffb4bc07 100644
--- a/protocols/IcqOscarJ/cookies.cpp
+++ b/protocols/IcqOscarJ/src/cookies.cpp
diff --git a/protocols/IcqOscarJ/cookies.h b/protocols/IcqOscarJ/src/cookies.h
index 05e0d170eb..05e0d170eb 100644
--- a/protocols/IcqOscarJ/cookies.h
+++ b/protocols/IcqOscarJ/src/cookies.h
diff --git a/protocols/IcqOscarJ/directpackets.cpp b/protocols/IcqOscarJ/src/directpackets.cpp
index 594f005675..594f005675 100644
--- a/protocols/IcqOscarJ/directpackets.cpp
+++ b/protocols/IcqOscarJ/src/directpackets.cpp
diff --git a/protocols/IcqOscarJ/fam_01service.cpp b/protocols/IcqOscarJ/src/fam_01service.cpp
index 9bc06f19ab..9bc06f19ab 100755..100644
--- a/protocols/IcqOscarJ/fam_01service.cpp
+++ b/protocols/IcqOscarJ/src/fam_01service.cpp
diff --git a/protocols/IcqOscarJ/fam_02location.cpp b/protocols/IcqOscarJ/src/fam_02location.cpp
index 2398cf18c6..2398cf18c6 100755..100644
--- a/protocols/IcqOscarJ/fam_02location.cpp
+++ b/protocols/IcqOscarJ/src/fam_02location.cpp
diff --git a/protocols/IcqOscarJ/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp
index caa41d966c..caa41d966c 100644
--- a/protocols/IcqOscarJ/fam_03buddy.cpp
+++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp
diff --git a/protocols/IcqOscarJ/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp
index 7d1bc6a829..7d1bc6a829 100644
--- a/protocols/IcqOscarJ/fam_04message.cpp
+++ b/protocols/IcqOscarJ/src/fam_04message.cpp
diff --git a/protocols/IcqOscarJ/fam_09bos.cpp b/protocols/IcqOscarJ/src/fam_09bos.cpp
index 327e045a96..327e045a96 100644
--- a/protocols/IcqOscarJ/fam_09bos.cpp
+++ b/protocols/IcqOscarJ/src/fam_09bos.cpp
diff --git a/protocols/IcqOscarJ/fam_0alookup.cpp b/protocols/IcqOscarJ/src/fam_0alookup.cpp
index da77295ecb..da77295ecb 100644
--- a/protocols/IcqOscarJ/fam_0alookup.cpp
+++ b/protocols/IcqOscarJ/src/fam_0alookup.cpp
diff --git a/protocols/IcqOscarJ/fam_0bstatus.cpp b/protocols/IcqOscarJ/src/fam_0bstatus.cpp
index 7a979007e2..7a979007e2 100644
--- a/protocols/IcqOscarJ/fam_0bstatus.cpp
+++ b/protocols/IcqOscarJ/src/fam_0bstatus.cpp
diff --git a/protocols/IcqOscarJ/fam_13servclist.cpp b/protocols/IcqOscarJ/src/fam_13servclist.cpp
index 5df30ee5ec..5df30ee5ec 100644
--- a/protocols/IcqOscarJ/fam_13servclist.cpp
+++ b/protocols/IcqOscarJ/src/fam_13servclist.cpp
diff --git a/protocols/IcqOscarJ/fam_15icqserver.cpp b/protocols/IcqOscarJ/src/fam_15icqserver.cpp
index 3f332e4f27..3f332e4f27 100644
--- a/protocols/IcqOscarJ/fam_15icqserver.cpp
+++ b/protocols/IcqOscarJ/src/fam_15icqserver.cpp
diff --git a/protocols/IcqOscarJ/fam_17signon.cpp b/protocols/IcqOscarJ/src/fam_17signon.cpp
index b35a432a48..b35a432a48 100644
--- a/protocols/IcqOscarJ/fam_17signon.cpp
+++ b/protocols/IcqOscarJ/src/fam_17signon.cpp
diff --git a/protocols/IcqOscarJ/families.h b/protocols/IcqOscarJ/src/families.h
index 61ac38f17a..61ac38f17a 100644
--- a/protocols/IcqOscarJ/families.h
+++ b/protocols/IcqOscarJ/src/families.h
diff --git a/protocols/IcqOscarJ/globals.h b/protocols/IcqOscarJ/src/globals.h
index c0d8326689..c0d8326689 100644
--- a/protocols/IcqOscarJ/globals.h
+++ b/protocols/IcqOscarJ/src/globals.h
diff --git a/protocols/IcqOscarJ/guids.h b/protocols/IcqOscarJ/src/guids.h
index 24073deec4..24073deec4 100644
--- a/protocols/IcqOscarJ/guids.h
+++ b/protocols/IcqOscarJ/src/guids.h
diff --git a/protocols/IcqOscarJ/i18n.cpp b/protocols/IcqOscarJ/src/i18n.cpp
index 535feebcdf..535feebcdf 100644
--- a/protocols/IcqOscarJ/i18n.cpp
+++ b/protocols/IcqOscarJ/src/i18n.cpp
diff --git a/protocols/IcqOscarJ/i18n.h b/protocols/IcqOscarJ/src/i18n.h
index eaeaad54f3..eaeaad54f3 100644
--- a/protocols/IcqOscarJ/i18n.h
+++ b/protocols/IcqOscarJ/src/i18n.h
diff --git a/protocols/IcqOscarJ/iconlib.cpp b/protocols/IcqOscarJ/src/iconlib.cpp
index 7c93bae17a..7c93bae17a 100644
--- a/protocols/IcqOscarJ/iconlib.cpp
+++ b/protocols/IcqOscarJ/src/iconlib.cpp
diff --git a/protocols/IcqOscarJ/iconlib.h b/protocols/IcqOscarJ/src/iconlib.h
index 3a7482f872..3a7482f872 100644
--- a/protocols/IcqOscarJ/iconlib.h
+++ b/protocols/IcqOscarJ/src/iconlib.h
diff --git a/protocols/IcqOscarJ/icq_advsearch.cpp b/protocols/IcqOscarJ/src/icq_advsearch.cpp
index 6c3a3ffa89..6c3a3ffa89 100644
--- a/protocols/IcqOscarJ/icq_advsearch.cpp
+++ b/protocols/IcqOscarJ/src/icq_advsearch.cpp
diff --git a/protocols/IcqOscarJ/icq_advsearch.h b/protocols/IcqOscarJ/src/icq_advsearch.h
index 83bf35af93..83bf35af93 100644
--- a/protocols/IcqOscarJ/icq_advsearch.h
+++ b/protocols/IcqOscarJ/src/icq_advsearch.h
diff --git a/protocols/IcqOscarJ/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index 6e61f2bc0d..6e61f2bc0d 100644
--- a/protocols/IcqOscarJ/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
diff --git a/protocols/IcqOscarJ/icq_avatar.h b/protocols/IcqOscarJ/src/icq_avatar.h
index 6bfcb65c45..6bfcb65c45 100644
--- a/protocols/IcqOscarJ/icq_avatar.h
+++ b/protocols/IcqOscarJ/src/icq_avatar.h
diff --git a/protocols/IcqOscarJ/icq_clients.cpp b/protocols/IcqOscarJ/src/icq_clients.cpp
index bb1ebb5621..bb1ebb5621 100644
--- a/protocols/IcqOscarJ/icq_clients.cpp
+++ b/protocols/IcqOscarJ/src/icq_clients.cpp
diff --git a/protocols/IcqOscarJ/icq_constants.h b/protocols/IcqOscarJ/src/icq_constants.h
index 4da90f1bc0..4da90f1bc0 100644
--- a/protocols/IcqOscarJ/icq_constants.h
+++ b/protocols/IcqOscarJ/src/icq_constants.h
diff --git a/protocols/IcqOscarJ/icq_db.cpp b/protocols/IcqOscarJ/src/icq_db.cpp
index f199860df8..f199860df8 100644
--- a/protocols/IcqOscarJ/icq_db.cpp
+++ b/protocols/IcqOscarJ/src/icq_db.cpp
diff --git a/protocols/IcqOscarJ/icq_db.h b/protocols/IcqOscarJ/src/icq_db.h
index 5bfc22d58b..5bfc22d58b 100644
--- a/protocols/IcqOscarJ/icq_db.h
+++ b/protocols/IcqOscarJ/src/icq_db.h
diff --git a/protocols/IcqOscarJ/icq_direct.cpp b/protocols/IcqOscarJ/src/icq_direct.cpp
index 7779f1bad7..7779f1bad7 100644
--- a/protocols/IcqOscarJ/icq_direct.cpp
+++ b/protocols/IcqOscarJ/src/icq_direct.cpp
diff --git a/protocols/IcqOscarJ/icq_direct.h b/protocols/IcqOscarJ/src/icq_direct.h
index 3cf91cb493..3cf91cb493 100644
--- a/protocols/IcqOscarJ/icq_direct.h
+++ b/protocols/IcqOscarJ/src/icq_direct.h
diff --git a/protocols/IcqOscarJ/icq_directmsg.cpp b/protocols/IcqOscarJ/src/icq_directmsg.cpp
index 89fbb7cea5..89fbb7cea5 100644
--- a/protocols/IcqOscarJ/icq_directmsg.cpp
+++ b/protocols/IcqOscarJ/src/icq_directmsg.cpp
diff --git a/protocols/IcqOscarJ/icq_fieldnames.cpp b/protocols/IcqOscarJ/src/icq_fieldnames.cpp
index d953a081cf..d953a081cf 100644
--- a/protocols/IcqOscarJ/icq_fieldnames.cpp
+++ b/protocols/IcqOscarJ/src/icq_fieldnames.cpp
diff --git a/protocols/IcqOscarJ/icq_fieldnames.h b/protocols/IcqOscarJ/src/icq_fieldnames.h
index cf15475299..cf15475299 100644
--- a/protocols/IcqOscarJ/icq_fieldnames.h
+++ b/protocols/IcqOscarJ/src/icq_fieldnames.h
diff --git a/protocols/IcqOscarJ/icq_filerequests.cpp b/protocols/IcqOscarJ/src/icq_filerequests.cpp
index d85de72580..d85de72580 100644
--- a/protocols/IcqOscarJ/icq_filerequests.cpp
+++ b/protocols/IcqOscarJ/src/icq_filerequests.cpp
diff --git a/protocols/IcqOscarJ/icq_filetransfer.cpp b/protocols/IcqOscarJ/src/icq_filetransfer.cpp
index 61484c3987..61484c3987 100644
--- a/protocols/IcqOscarJ/icq_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/icq_filetransfer.cpp
diff --git a/protocols/IcqOscarJ/icq_firstrun.cpp b/protocols/IcqOscarJ/src/icq_firstrun.cpp
index 1208d6d0ec..1208d6d0ec 100644
--- a/protocols/IcqOscarJ/icq_firstrun.cpp
+++ b/protocols/IcqOscarJ/src/icq_firstrun.cpp
diff --git a/protocols/IcqOscarJ/icq_http.cpp b/protocols/IcqOscarJ/src/icq_http.cpp
index 3e50db43ed..3e50db43ed 100644
--- a/protocols/IcqOscarJ/icq_http.cpp
+++ b/protocols/IcqOscarJ/src/icq_http.cpp
diff --git a/protocols/IcqOscarJ/icq_http.h b/protocols/IcqOscarJ/src/icq_http.h
index 017a5ea5fc..017a5ea5fc 100644
--- a/protocols/IcqOscarJ/icq_http.h
+++ b/protocols/IcqOscarJ/src/icq_http.h
diff --git a/protocols/IcqOscarJ/icq_infoupdate.cpp b/protocols/IcqOscarJ/src/icq_infoupdate.cpp
index 014df20e01..014df20e01 100644
--- a/protocols/IcqOscarJ/icq_infoupdate.cpp
+++ b/protocols/IcqOscarJ/src/icq_infoupdate.cpp
diff --git a/protocols/IcqOscarJ/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index f3dd072cde..f3dd072cde 100644
--- a/protocols/IcqOscarJ/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
diff --git a/protocols/IcqOscarJ/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index 44c1881d14..44c1881d14 100644
--- a/protocols/IcqOscarJ/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
diff --git a/protocols/IcqOscarJ/icq_packet.cpp b/protocols/IcqOscarJ/src/icq_packet.cpp
index 79241cf297..79241cf297 100644
--- a/protocols/IcqOscarJ/icq_packet.cpp
+++ b/protocols/IcqOscarJ/src/icq_packet.cpp
diff --git a/protocols/IcqOscarJ/icq_packet.h b/protocols/IcqOscarJ/src/icq_packet.h
index ccaeb91fcc..ccaeb91fcc 100644
--- a/protocols/IcqOscarJ/icq_packet.h
+++ b/protocols/IcqOscarJ/src/icq_packet.h
diff --git a/protocols/IcqOscarJ/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp
index 21ca36348d..21ca36348d 100644
--- a/protocols/IcqOscarJ/icq_popups.cpp
+++ b/protocols/IcqOscarJ/src/icq_popups.cpp
diff --git a/protocols/IcqOscarJ/icq_popups.h b/protocols/IcqOscarJ/src/icq_popups.h
index a42c230634..a42c230634 100644
--- a/protocols/IcqOscarJ/icq_popups.h
+++ b/protocols/IcqOscarJ/src/icq_popups.h
diff --git a/protocols/IcqOscarJ/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index d1490fac2e..d1490fac2e 100755..100644
--- a/protocols/IcqOscarJ/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
diff --git a/protocols/IcqOscarJ/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index aa903689ad..aa903689ad 100755..100644
--- a/protocols/IcqOscarJ/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
diff --git a/protocols/IcqOscarJ/icq_rates.cpp b/protocols/IcqOscarJ/src/icq_rates.cpp
index e7513ec148..e7513ec148 100644
--- a/protocols/IcqOscarJ/icq_rates.cpp
+++ b/protocols/IcqOscarJ/src/icq_rates.cpp
diff --git a/protocols/IcqOscarJ/icq_rates.h b/protocols/IcqOscarJ/src/icq_rates.h
index ab16e74007..ab16e74007 100644
--- a/protocols/IcqOscarJ/icq_rates.h
+++ b/protocols/IcqOscarJ/src/icq_rates.h
diff --git a/protocols/IcqOscarJ/icq_server.cpp b/protocols/IcqOscarJ/src/icq_server.cpp
index 63a5d63d84..63a5d63d84 100644
--- a/protocols/IcqOscarJ/icq_server.cpp
+++ b/protocols/IcqOscarJ/src/icq_server.cpp
diff --git a/protocols/IcqOscarJ/icq_server.h b/protocols/IcqOscarJ/src/icq_server.h
index eba3ecfa42..eba3ecfa42 100644
--- a/protocols/IcqOscarJ/icq_server.h
+++ b/protocols/IcqOscarJ/src/icq_server.h
diff --git a/protocols/IcqOscarJ/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index b2adc4831c..b2adc4831c 100644
--- a/protocols/IcqOscarJ/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
diff --git a/protocols/IcqOscarJ/icq_servlist.h b/protocols/IcqOscarJ/src/icq_servlist.h
index 76118ce3c0..76118ce3c0 100644
--- a/protocols/IcqOscarJ/icq_servlist.h
+++ b/protocols/IcqOscarJ/src/icq_servlist.h
diff --git a/protocols/IcqOscarJ/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp
index f5e5c937b3..f5e5c937b3 100644
--- a/protocols/IcqOscarJ/icq_uploadui.cpp
+++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp
diff --git a/protocols/IcqOscarJ/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 92ae0eea14..b567105dbe 100644
--- a/protocols/IcqOscarJ/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -29,6 +29,7 @@
 // -----------------------------------------------------------------------------

 #include "icqoscar.h"

 #include "m_extraicons.h"

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

 

 

 extern HANDLE hExtraXStatus;

diff --git a/protocols/IcqOscarJ/icq_xtraz.cpp b/protocols/IcqOscarJ/src/icq_xtraz.cpp
index 2b73274365..2b73274365 100644
--- a/protocols/IcqOscarJ/icq_xtraz.cpp
+++ b/protocols/IcqOscarJ/src/icq_xtraz.cpp
diff --git a/protocols/IcqOscarJ/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
index ee6dd1731c..ee6dd1731c 100755..100644
--- a/protocols/IcqOscarJ/icqosc_svcs.cpp
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
diff --git a/protocols/IcqOscarJ/icqosc_svcs.h b/protocols/IcqOscarJ/src/icqosc_svcs.h
index 844eecee51..844eecee51 100644
--- a/protocols/IcqOscarJ/icqosc_svcs.h
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.h
diff --git a/protocols/IcqOscarJ/icqoscar.cpp b/protocols/IcqOscarJ/src/icqoscar.cpp
index 5ce67145cd..5ce67145cd 100644
--- a/protocols/IcqOscarJ/icqoscar.cpp
+++ b/protocols/IcqOscarJ/src/icqoscar.cpp
diff --git a/protocols/IcqOscarJ/icqoscar.h b/protocols/IcqOscarJ/src/icqoscar.h
index ef0e32a6fd..ef0e32a6fd 100755..100644
--- a/protocols/IcqOscarJ/icqoscar.h
+++ b/protocols/IcqOscarJ/src/icqoscar.h
diff --git a/protocols/IcqOscarJ/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index 450ea73b16..450ea73b16 100644
--- a/protocols/IcqOscarJ/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
diff --git a/protocols/IcqOscarJ/init.h b/protocols/IcqOscarJ/src/init.h
index 0e93a8a89f..0e93a8a89f 100644
--- a/protocols/IcqOscarJ/init.h
+++ b/protocols/IcqOscarJ/src/init.h
diff --git a/protocols/IcqOscarJ/log.cpp b/protocols/IcqOscarJ/src/log.cpp
index 402863a456..402863a456 100644
--- a/protocols/IcqOscarJ/log.cpp
+++ b/protocols/IcqOscarJ/src/log.cpp
diff --git a/protocols/IcqOscarJ/log.h b/protocols/IcqOscarJ/src/log.h
index 6da25df0d7..6da25df0d7 100644
--- a/protocols/IcqOscarJ/log.h
+++ b/protocols/IcqOscarJ/src/log.h
diff --git a/protocols/IcqOscarJ/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
index 9630abc070..9630abc070 100644
--- a/protocols/IcqOscarJ/oscar_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
diff --git a/protocols/IcqOscarJ/oscar_filetransfer.h b/protocols/IcqOscarJ/src/oscar_filetransfer.h
index fa6ec9169e..fa6ec9169e 100644
--- a/protocols/IcqOscarJ/oscar_filetransfer.h
+++ b/protocols/IcqOscarJ/src/oscar_filetransfer.h
diff --git a/protocols/IcqOscarJ/resource.h b/protocols/IcqOscarJ/src/resource.h
index 2bdec69fe0..1dbd905dde 100644
--- a/protocols/IcqOscarJ/resource.h
+++ b/protocols/IcqOscarJ/src/resource.h
@@ -15,92 +15,6 @@
 #define IDI_AUTH_GRANT                  151

 #define IDI_AUTH_REVOKE                 152

 #define IDI_SERVLIST_ADD                160

-#define IDI_XSTATUS1                    201

-#define IDI_XSTATUS2                    202

-#define IDI_XSTATUS3                    203

-#define IDI_XSTATUS4                    204

-#define IDI_XSTATUS5                    205

-#define IDI_XSTATUS6                    206

-#define IDI_XSTATUS7                    207

-#define IDI_XSTATUS8                    208

-#define IDI_XSTATUS9                    209

-#define IDI_XSTATUS10                   210

-#define IDI_XSTATUS11                   211

-#define IDI_XSTATUS12                   212

-#define IDI_XSTATUS13                   213

-#define IDI_XSTATUS14                   214

-#define IDI_XSTATUS15                   215

-#define IDI_XSTATUS16                   216

-#define IDI_XSTATUS17                   217

-#define IDI_XSTATUS18                   218

-#define IDI_XSTATUS19                   219

-#define IDI_XSTATUS20                   220

-#define IDI_XSTATUS21                   221

-#define IDI_XSTATUS22                   222

-#define IDI_XSTATUS23                   223

-#define IDI_XSTATUS24                   224

-#define IDI_XSTATUS25                   225

-#define IDI_XSTATUS26                   226

-#define IDI_XSTATUS27                   227

-#define IDI_XSTATUS28                   228

-#define IDI_XSTATUS29                   229

-#define IDI_XSTATUS30                   230

-#define IDI_XSTATUS31                   231

-#define IDI_XSTATUS32                   232

-#define IDI_XSTATUS33                   233

-#define IDI_XSTATUS34                   234

-#define IDI_XSTATUS35                   235

-#define IDI_XSTATUS36                   236

-#define IDI_XSTATUS37                   237

-#define IDI_XSTATUS38                   238

-#define IDI_XSTATUS39                   239

-#define IDI_XSTATUS40                   240

-#define IDI_XSTATUS41                   241

-#define IDI_XSTATUS42                   242

-#define IDI_XSTATUS43                   243

-#define IDI_XSTATUS44                   244

-#define IDI_XSTATUS45                   245

-#define IDI_XSTATUS46                   246

-#define IDI_XSTATUS47                   247

-#define IDI_XSTATUS48                   248

-#define IDI_XSTATUS49                   249

-#define IDI_XSTATUS50                   250

-#define IDI_XSTATUS51                   251

-#define IDI_XSTATUS52                   252

-#define IDI_XSTATUS53                   253

-#define IDI_XSTATUS54                   254

-#define IDI_XSTATUS55                   255

-#define IDI_XSTATUS56                   256

-#define IDI_XSTATUS57                   257

-#define IDI_XSTATUS58                   258

-#define IDI_XSTATUS59                   259

-#define IDI_XSTATUS60                   260

-#define IDI_XSTATUS61                   261

-#define IDI_XSTATUS62                   262

-#define IDI_XSTATUS63                   263

-#define IDI_XSTATUS64                   264

-#define IDI_XSTATUS65                   265

-#define IDI_XSTATUS66                   266

-#define IDI_XSTATUS67                   267

-#define IDI_XSTATUS68                   268

-#define IDI_XSTATUS69                   269

-#define IDI_XSTATUS70                   270

-#define IDI_XSTATUS71                   271

-#define IDI_XSTATUS72                   272

-#define IDI_XSTATUS73                   273

-#define IDI_XSTATUS74                   274

-#define IDI_XSTATUS75                   275

-#define IDI_XSTATUS76                   276

-#define IDI_XSTATUS77                   277

-#define IDI_XSTATUS78                   278

-#define IDI_XSTATUS79                   279

-#define IDI_XSTATUS80                   280

-#define IDI_XSTATUS81                   281

-#define IDI_XSTATUS82                   282

-#define IDI_XSTATUS83                   283

-#define IDI_XSTATUS84                   284

-#define IDI_XSTATUS85                   285

-#define IDI_XSTATUS86                   286

 #define IDD_INFO_ICQ                    240

 #define IDD_ICQADVANCEDSEARCH           242

 #define IDD_ICQUPLOADLIST               253

diff --git a/protocols/IcqOscarJ/stdpackets.cpp b/protocols/IcqOscarJ/src/stdpackets.cpp
index 3bc9502560..3bc9502560 100644
--- a/protocols/IcqOscarJ/stdpackets.cpp
+++ b/protocols/IcqOscarJ/src/stdpackets.cpp
diff --git a/protocols/IcqOscarJ/stdpackets.h b/protocols/IcqOscarJ/src/stdpackets.h
index b656d713c6..b656d713c6 100644
--- a/protocols/IcqOscarJ/stdpackets.h
+++ b/protocols/IcqOscarJ/src/stdpackets.h
diff --git a/protocols/IcqOscarJ/tlv.cpp b/protocols/IcqOscarJ/src/tlv.cpp
index 7c4eafca3a..7c4eafca3a 100644
--- a/protocols/IcqOscarJ/tlv.cpp
+++ b/protocols/IcqOscarJ/src/tlv.cpp
diff --git a/protocols/IcqOscarJ/tlv.h b/protocols/IcqOscarJ/src/tlv.h
index 5cee00c7c4..5cee00c7c4 100644
--- a/protocols/IcqOscarJ/tlv.h
+++ b/protocols/IcqOscarJ/src/tlv.h
diff --git a/protocols/IcqOscarJ/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp
index 70f7547108..70f7547108 100644
--- a/protocols/IcqOscarJ/utilities.cpp
+++ b/protocols/IcqOscarJ/src/utilities.cpp
diff --git a/protocols/IcqOscarJ/utilities.h b/protocols/IcqOscarJ/src/utilities.h
index 962ecce15f..962ecce15f 100644
--- a/protocols/IcqOscarJ/utilities.h
+++ b/protocols/IcqOscarJ/src/utilities.h
diff --git a/protocols/IcqOscarJ/version.h b/protocols/IcqOscarJ/src/version.h
index 0231d7a7ea..0231d7a7ea 100644
--- a/protocols/IcqOscarJ/version.h
+++ b/protocols/IcqOscarJ/src/version.h
diff --git a/protocols/JabberG/jabberg-translation.txt b/protocols/JabberG/docs/jabberg-translation.txt
index 3e58b30b19..3e58b30b19 100644
--- a/protocols/JabberG/jabberg-translation.txt
+++ b/protocols/JabberG/docs/jabberg-translation.txt
diff --git a/protocols/JabberG/jabber_10.vcxproj b/protocols/JabberG/jabber_10.vcxproj
index ae333da2a6..2003650b39 100644
--- a/protocols/JabberG/jabber_10.vcxproj
+++ b/protocols/JabberG/jabber_10.vcxproj
@@ -199,150 +199,92 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="jabber.cpp">

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="icos\add2roster.ico" />

-    <None Include="icos\addcontact.ico" />

-    <None Include="icos\arrow_down.ico" />

-    <None Include="icos\arrow_up.ico" />

-    <None Include="icos\auth_revoke.ico" />

-    <None Include="icos\bookmarks.ico" />

-    <None Include="icos\command.ico" />

-    <None Include="icos\console.ico" />

-    <None Include="icos\delete.ico" />

-    <None Include="icos\disco_fail.ico" />

-    <None Include="icos\disco_in_progress.ico" />

-    <None Include="icos\disco_ok.ico" />

-    <None Include="icos\filter.ico" />

-    <None Include="icos\go.ico" />

-    <None Include="icos\grant.ico" />

-    <None Include="icos\group.ico" />

-    <None Include="icos\home.ico" />

-    <None Include="icos\jabber.ico" />

-    <None Include="icos\key.ico" />

-    <None Include="icos\login.ico" />

-    <None Include="icos\message_allow.ico" />

-    <None Include="icos\message_deny.ico" />

-    <None Include="icos\notes.ico" />

-    <None Include="icos\open.ico" />

-    <None Include="icos\openid.ico" />

-    <None Include="icos\pages.ico" />

-    <None Include="icos\plist_active.ico" />

-    <None Include="icos\plist_any.ico" />

-    <None Include="icos\plist_default.ico" />

-    <None Include="icos\presence_in_allow.ico" />

-    <None Include="icos\presence_in_deny.ico" />

-    <None Include="icos\presence_out_allow.ico" />

-    <None Include="icos\presence_out_deny.ico" />

-    <None Include="icos\privacy_lists.ico" />

-    <None Include="icos\query_allow.ico" />

-    <None Include="icos\query_deny.ico" />

-    <None Include="icos\refresh.ico" />

-    <None Include="icos\refresh_node.ico" />

-    <None Include="icos\rename.ico" />

-    <None Include="icos\request.ico" />

-    <None Include="icos\reset_filter.ico" />

-    <None Include="icos\roster.ico" />

-    <None Include="icos\rss.ico" />

-    <None Include="icos\save.ico" />

-    <None Include="icos\send_note.ico" />

-    <None Include="icos\server.ico" />

-    <None Include="icos\service_discovery.ico" />

-    <None Include="icos\store.ico" />

-    <None Include="icos\transport.ico" />

-    <None Include="icos\transport_local.ico" />

-    <None Include="icos\user2room.ico" />

-    <None Include="icos\view_as_list.ico" />

-    <None Include="icos\view_as_tree.ico" />

-    <None Include="icos\weather.ico" />

-    <None Include="docs\changelog_jabber.txt" />

-    <None Include="docs\readme_jabber.txt" />

-  </ItemGroup>

-  <ItemGroup>

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

diff --git a/protocols/JabberG/jabber_10.vcxproj.filters b/protocols/JabberG/jabber_10.vcxproj.filters
index e5d93e91ba..d671a671c9 100644
--- a/protocols/JabberG/jabber_10.vcxproj.filters
+++ b/protocols/JabberG/jabber_10.vcxproj.filters
@@ -15,414 +15,248 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="jabber.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_adhoc.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_agent.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_bookmarks.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_byte.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_caps.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_chat.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_console.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_disco.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_events.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_file.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_form.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_ft.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_groupchat.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_ibb.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_icolib.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_iq.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_iq_handlers.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_iqid.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_iqid_muc.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_libstr.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_list.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_menu.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_message_handlers.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_message_manager.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_misc.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_notes.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_opt.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_opttree.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_password.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_presence_manager.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_privacy.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_proto.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_proxy.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_rc.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_search.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_secur.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_send_manager.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_std.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_svc.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_thread.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_treelist.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_userinfo.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_util.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_vcard.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_ws.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_xml.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_xstatus.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_zstream.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="MString.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ui_utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="jabber_captcha.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="jabber.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_byte.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_caps.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_disco.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_ibb.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_iq.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_list.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_message_manager.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_notes.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_opttree.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_presence_manager.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_privacy.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_proto.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_proxy.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_rc.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_search.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_secur.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_send_manager.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_xml.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="MString.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ui_utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_db_utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_icolib.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="jabber_xstatus.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="icos\add2roster.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\addcontact.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\arrow_down.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\arrow_up.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\auth_revoke.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\bookmarks.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\command.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\console.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\delete.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\disco_fail.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\disco_in_progress.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\disco_ok.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\filter.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\go.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\grant.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\group.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\home.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\jabber.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\key.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\login.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\message_allow.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\message_deny.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\notes.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\open.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\openid.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\pages.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\plist_active.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\plist_any.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\plist_default.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\presence_in_allow.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\presence_in_deny.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\presence_out_allow.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\presence_out_deny.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\privacy_lists.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\query_allow.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\query_deny.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\refresh.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\refresh_node.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\rename.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\request.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\reset_filter.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\roster.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\rss.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\save.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\send_note.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\server.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\service_discovery.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\store.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\transport.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\transport_local.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\user2room.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\view_as_list.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\view_as_tree.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icos\weather.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="docs\changelog_jabber.txt" />

-    <None Include="docs\readme_jabber.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="jabber.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS.rc b/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS.rc
deleted file mode 100644
index 9497ab6117..0000000000
--- a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS.rc
+++ /dev/null
@@ -1,198 +0,0 @@
-//Microsoft Developer Studio generated resource script.

-//

-

-#define APSTUDIO_READONLY_SYMBOLS

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

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "winres.h"

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

-#undef APSTUDIO_READONLY_SYMBOLS

-

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

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

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

-//

-// Icon

-//

-

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

-// remains consistent on all systems.

-201                     ICON    DISCARDABLE     "icos/moods/afraid.ico"

-202                     ICON    DISCARDABLE     "icos/moods/amazed.ico"

-203                     ICON    DISCARDABLE     "icos/moods/amorous.ico"

-204                     ICON    DISCARDABLE     "icos/moods/angry.ico"

-205                     ICON    DISCARDABLE     "icos/moods/annoyed.ico"

-206                     ICON    DISCARDABLE     "icos/moods/anxious.ico"

-207                     ICON    DISCARDABLE     "icos/moods/aroused.ico"

-208                     ICON    DISCARDABLE     "icos/moods/ashamed.ico"

-209                     ICON    DISCARDABLE     "icos/moods/bored.ico"

-210                     ICON    DISCARDABLE     "icos/moods/brave.ico"

-211                     ICON    DISCARDABLE     "icos/moods/calm.ico"

-212                     ICON    DISCARDABLE     "icos/moods/cautious.ico"

-213                     ICON    DISCARDABLE     "icos/moods/cold.ico"

-214                     ICON    DISCARDABLE     "icos/moods/confident.ico"

-215                     ICON    DISCARDABLE     "icos/moods/confused.ico"

-216                     ICON    DISCARDABLE     "icos/moods/contemplative.ico"

-217                     ICON    DISCARDABLE     "icos/moods/contented.ico"

-218                     ICON    DISCARDABLE     "icos/moods/cranky.ico"

-219                     ICON    DISCARDABLE     "icos/moods/crazy.ico"

-220                     ICON    DISCARDABLE     "icos/moods/creative.ico"

-221                     ICON    DISCARDABLE     "icos/moods/curious.ico"

-222                     ICON    DISCARDABLE     "icos/moods/dejected.ico"

-223                     ICON    DISCARDABLE     "icos/moods/depressed.ico"

-224                     ICON    DISCARDABLE     "icos/moods/disappointed.ico"

-225                     ICON    DISCARDABLE     "icos/moods/disgusted.ico"

-226                     ICON    DISCARDABLE     "icos/moods/dismayed.ico"

-227                     ICON    DISCARDABLE     "icos/moods/distracted.ico"

-228                     ICON    DISCARDABLE     "icos/moods/embarrassed.ico"

-229                     ICON    DISCARDABLE     "icos/moods/envious.ico"

-230                     ICON    DISCARDABLE     "icos/moods/excited.ico"

-231                     ICON    DISCARDABLE     "icos/moods/flirtatious.ico"

-232                     ICON    DISCARDABLE     "icos/moods/frustrated.ico"

-233                     ICON    DISCARDABLE     "icos/moods/grateful.ico"

-234                     ICON    DISCARDABLE     "icos/moods/grieving.ico"

-235                     ICON    DISCARDABLE     "icos/moods/grumpy.ico"

-236                     ICON    DISCARDABLE     "icos/moods/guilty.ico"

-237                     ICON    DISCARDABLE     "icos/moods/happy.ico"

-238                     ICON    DISCARDABLE     "icos/moods/hopeful.ico"

-239                     ICON    DISCARDABLE     "icos/moods/hot.ico"

-240                     ICON    DISCARDABLE     "icos/moods/humbled.ico"

-241                     ICON    DISCARDABLE     "icos/moods/humiliated.ico"

-242                     ICON    DISCARDABLE     "icos/moods/hungry.ico"

-243                     ICON    DISCARDABLE     "icos/moods/hurt.ico"

-244                     ICON    DISCARDABLE     "icos/moods/impressed.ico"

-245                     ICON    DISCARDABLE     "icos/moods/in_awe.ico"

-246                     ICON    DISCARDABLE     "icos/moods/in_love.ico"

-247                     ICON    DISCARDABLE     "icos/moods/indignant.ico"

-248                     ICON    DISCARDABLE     "icos/moods/interested.ico"

-249                     ICON    DISCARDABLE     "icos/moods/intoxicated.ico"

-250                     ICON    DISCARDABLE     "icos/moods/invincible.ico"

-251                     ICON    DISCARDABLE     "icos/moods/jealous.ico"

-252                     ICON    DISCARDABLE     "icos/moods/lonely.ico"

-253                     ICON    DISCARDABLE     "icos/moods/lost.ico"

-254                     ICON    DISCARDABLE     "icos/moods/lucky.ico"

-255                     ICON    DISCARDABLE     "icos/moods/mean.ico"

-256                     ICON    DISCARDABLE     "icos/moods/moody.ico"

-257                     ICON    DISCARDABLE     "icos/moods/nervous.ico"

-258                     ICON    DISCARDABLE     "icos/moods/neutral.ico"

-259                     ICON    DISCARDABLE     "icos/moods/offended.ico"

-260                     ICON    DISCARDABLE     "icos/moods/outraged.ico"

-261                     ICON    DISCARDABLE     "icos/moods/playful.ico"

-262                     ICON    DISCARDABLE     "icos/moods/proud.ico"

-263                     ICON    DISCARDABLE     "icos/moods/relaxed.ico"

-264                     ICON    DISCARDABLE     "icos/moods/relieved.ico"

-265                     ICON    DISCARDABLE     "icos/moods/remorseful.ico"

-266                     ICON    DISCARDABLE     "icos/moods/restless.ico"

-267                     ICON    DISCARDABLE     "icos/moods/sad.ico"

-268                     ICON    DISCARDABLE     "icos/moods/sarcastic.ico"

-269                     ICON    DISCARDABLE     "icos/moods/satisfied.ico"

-270                     ICON    DISCARDABLE     "icos/moods/serious.ico"

-271                     ICON    DISCARDABLE     "icos/moods/shocked.ico"

-272                     ICON    DISCARDABLE     "icos/moods/shy.ico"

-273                     ICON    DISCARDABLE     "icos/moods/sick.ico"

-274                     ICON    DISCARDABLE     "icos/moods/sleepy.ico"

-275                     ICON    DISCARDABLE     "icos/moods/spontaneous.ico"

-276                     ICON    DISCARDABLE     "icos/moods/stressed.ico"

-277                     ICON    DISCARDABLE     "icos/moods/strong.ico"

-278                     ICON    DISCARDABLE     "icos/moods/surprised.ico"

-279                     ICON    DISCARDABLE     "icos/moods/thankful.ico"

-280                     ICON    DISCARDABLE     "icos/moods/thirsty.ico"

-281                     ICON    DISCARDABLE     "icos/moods/tired.ico"

-282                     ICON    DISCARDABLE     "icos/moods/undefined.ico"

-283                     ICON    DISCARDABLE     "icos/moods/weak.ico"

-284                     ICON    DISCARDABLE     "icos/moods/worried.ico"

-

-

-300                     ICON    DISCARDABLE     "icos/activities/doing_chores.ico"

-301                     ICON    DISCARDABLE     "icos/activities/buying_groceries.ico"

-302                     ICON    DISCARDABLE     "icos/activities/cleaning.ico"

-303                     ICON    DISCARDABLE     "icos/activities/cooking.ico"

-304                     ICON    DISCARDABLE     "icos/activities/doing_maintenance.ico"

-305                     ICON    DISCARDABLE     "icos/activities/doing_the_dishes.ico"

-306                     ICON    DISCARDABLE     "icos/activities/doing_the_laundry.ico"

-307                     ICON    DISCARDABLE     "icos/activities/gardening.ico"

-308                     ICON    DISCARDABLE     "icos/activities/running_an_errand.ico"

-309                     ICON    DISCARDABLE     "icos/activities/walking_the_dog.ico"

-320                     ICON    DISCARDABLE     "icos/activities/drinking.ico"

-321                     ICON    DISCARDABLE     "icos/activities/having_a_beer.ico"

-322                     ICON    DISCARDABLE     "icos/activities/having_coffee.ico"

-323                     ICON    DISCARDABLE     "icos/activities/having_tea.ico"

-340                     ICON    DISCARDABLE     "icos/activities/eating.ico"

-341                     ICON    DISCARDABLE     "icos/activities/having_a_snack.ico"

-342                     ICON    DISCARDABLE     "icos/activities/having_breakfast.ico"

-343                     ICON    DISCARDABLE     "icos/activities/having_dinner.ico"

-344                     ICON    DISCARDABLE     "icos/activities/having_lunch.ico"

-360                     ICON    DISCARDABLE     "icos/activities/exercising.ico"

-361                     ICON    DISCARDABLE     "icos/activities/cycling.ico"

-362                     ICON    DISCARDABLE     "icos/activities/dancing.ico"

-363                     ICON    DISCARDABLE     "icos/activities/hiking.ico"

-364                     ICON    DISCARDABLE     "icos/activities/jogging.ico"

-365                     ICON    DISCARDABLE     "icos/activities/playing_sports.ico"

-366                     ICON    DISCARDABLE     "icos/activities/running.ico"

-367                     ICON    DISCARDABLE     "icos/activities/skiing.ico"

-368                     ICON    DISCARDABLE     "icos/activities/swimming.ico"

-369                     ICON    DISCARDABLE     "icos/activities/working_out.ico"

-380                     ICON    DISCARDABLE     "icos/activities/grooming.ico"

-381                     ICON    DISCARDABLE     "icos/activities/at_the_spa.ico"

-382                     ICON    DISCARDABLE     "icos/activities/brushing_teeth.ico"

-383                     ICON    DISCARDABLE     "icos/activities/getting_a_haircut.ico"

-384                     ICON    DISCARDABLE     "icos/activities/shaving.ico"

-385                     ICON    DISCARDABLE     "icos/activities/taking_a_bath.ico"

-386                     ICON    DISCARDABLE     "icos/activities/taking_a_shower.ico"

-400                     ICON    DISCARDABLE     "icos/activities/having_appointment.ico"

-420                     ICON    DISCARDABLE     "icos/activities/inactive.ico"

-421                     ICON    DISCARDABLE     "icos/activities/day_off.ico"

-422                     ICON    DISCARDABLE     "icos/activities/hanging_out.ico"

-423                     ICON    DISCARDABLE     "icos/activities/hiding.ico"

-424                     ICON    DISCARDABLE     "icos/activities/on_vacation.ico"

-425                     ICON    DISCARDABLE     "icos/activities/praying.ico"

-426                     ICON    DISCARDABLE     "icos/activities/scheduled_holiday.ico"

-427                     ICON    DISCARDABLE     "icos/activities/sleeping.ico"

-428                     ICON    DISCARDABLE     "icos/activities/thinking.ico"

-440                     ICON    DISCARDABLE     "icos/activities/relaxing.ico"

-441                     ICON    DISCARDABLE     "icos/activities/fishing.ico"

-442                     ICON    DISCARDABLE     "icos/activities/gaming.ico"

-443                     ICON    DISCARDABLE     "icos/activities/going_out.ico"

-444                     ICON    DISCARDABLE     "icos/activities/partying.ico"

-445                     ICON    DISCARDABLE     "icos/activities/reading.ico"

-446                     ICON    DISCARDABLE     "icos/activities/rehearsing.ico"

-447                     ICON    DISCARDABLE     "icos/activities/shopping.ico"

-448                     ICON    DISCARDABLE     "icos/activities/smoking.ico"

-449                     ICON    DISCARDABLE     "icos/activities/socializing.ico"

-450                     ICON    DISCARDABLE     "icos/activities/sunbathing.ico"

-451                     ICON    DISCARDABLE     "icos/activities/watching_tv.ico"

-452                     ICON    DISCARDABLE     "icos/activities/watching_a_movie.ico"

-460                     ICON    DISCARDABLE     "icos/activities/talking.ico"

-461                     ICON    DISCARDABLE     "icos/activities/in_real_life.ico"

-462                     ICON    DISCARDABLE     "icos/activities/on_the_phone.ico"

-463                     ICON    DISCARDABLE     "icos/activities/on_video_phone.ico"

-480                     ICON    DISCARDABLE     "icos/activities/traveling.ico"

-481                     ICON    DISCARDABLE     "icos/activities/commuting.ico"

-482                     ICON    DISCARDABLE     "icos/activities/cycling.ico"

-483                     ICON    DISCARDABLE     "icos/activities/driving.ico"

-484                     ICON    DISCARDABLE     "icos/activities/in_a_car.ico"

-485                     ICON    DISCARDABLE     "icos/activities/on_a_bus.ico"

-486                     ICON    DISCARDABLE     "icos/activities/on_a_plane.ico"

-487                     ICON    DISCARDABLE     "icos/activities/on_a_train.ico"

-488                     ICON    DISCARDABLE     "icos/activities/on_a_trip.ico"

-489                     ICON    DISCARDABLE     "icos/activities/walking.ico"

-500                     ICON    DISCARDABLE     "icos/activities/working.ico"

-501                     ICON    DISCARDABLE     "icos/activities/coding.ico"

-502                     ICON    DISCARDABLE     "icos/activities/in_a_meeting.ico"

-503                     ICON    DISCARDABLE     "icos/activities/studying.ico"

-504                     ICON    DISCARDABLE     "icos/activities/writing.ico"

-

-

-

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

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

-

diff --git a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj b/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj
index 5a4d9ff785..0f52450e72 100644
--- a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj
+++ b/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj
@@ -120,7 +120,7 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/JabberG/jabber_xstatus/res/JABBER_XSTATUS.rc b/protocols/JabberG/jabber_xstatus/res/JABBER_XSTATUS.rc
new file mode 100644
index 0000000000..40eb3e2084
--- /dev/null
+++ b/protocols/JabberG/jabber_xstatus/res/JABBER_XSTATUS.rc
@@ -0,0 +1,198 @@
+//Microsoft Developer Studio generated resource script.

+//

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "winres.h"

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

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

+// remains consistent on all systems.

+201                     ICON         "moods/afraid.ico"

+202                     ICON         "moods/amazed.ico"

+203                     ICON         "moods/amorous.ico"

+204                     ICON         "moods/angry.ico"

+205                     ICON         "moods/annoyed.ico"

+206                     ICON         "moods/anxious.ico"

+207                     ICON         "moods/aroused.ico"

+208                     ICON         "moods/ashamed.ico"

+209                     ICON         "moods/bored.ico"

+210                     ICON         "moods/brave.ico"

+211                     ICON         "moods/calm.ico"

+212                     ICON         "moods/cautious.ico"

+213                     ICON         "moods/cold.ico"

+214                     ICON         "moods/confident.ico"

+215                     ICON         "moods/confused.ico"

+216                     ICON         "moods/contemplative.ico"

+217                     ICON         "moods/contented.ico"

+218                     ICON         "moods/cranky.ico"

+219                     ICON         "moods/crazy.ico"

+220                     ICON         "moods/creative.ico"

+221                     ICON         "moods/curious.ico"

+222                     ICON         "moods/dejected.ico"

+223                     ICON         "moods/depressed.ico"

+224                     ICON         "moods/disappointed.ico"

+225                     ICON         "moods/disgusted.ico"

+226                     ICON         "moods/dismayed.ico"

+227                     ICON         "moods/distracted.ico"

+228                     ICON         "moods/embarrassed.ico"

+229                     ICON         "moods/envious.ico"

+230                     ICON         "moods/excited.ico"

+231                     ICON         "moods/flirtatious.ico"

+232                     ICON         "moods/frustrated.ico"

+233                     ICON         "moods/grateful.ico"

+234                     ICON         "moods/grieving.ico"

+235                     ICON         "moods/grumpy.ico"

+236                     ICON         "moods/guilty.ico"

+237                     ICON         "moods/happy.ico"

+238                     ICON         "moods/hopeful.ico"

+239                     ICON         "moods/hot.ico"

+240                     ICON         "moods/humbled.ico"

+241                     ICON         "moods/humiliated.ico"

+242                     ICON         "moods/hungry.ico"

+243                     ICON         "moods/hurt.ico"

+244                     ICON         "moods/impressed.ico"

+245                     ICON         "moods/in_awe.ico"

+246                     ICON         "moods/in_love.ico"

+247                     ICON         "moods/indignant.ico"

+248                     ICON         "moods/interested.ico"

+249                     ICON         "moods/intoxicated.ico"

+250                     ICON         "moods/invincible.ico"

+251                     ICON         "moods/jealous.ico"

+252                     ICON         "moods/lonely.ico"

+253                     ICON         "moods/lost.ico"

+254                     ICON         "moods/lucky.ico"

+255                     ICON         "moods/mean.ico"

+256                     ICON         "moods/moody.ico"

+257                     ICON         "moods/nervous.ico"

+258                     ICON         "moods/neutral.ico"

+259                     ICON         "moods/offended.ico"

+260                     ICON         "moods/outraged.ico"

+261                     ICON         "moods/playful.ico"

+262                     ICON         "moods/proud.ico"

+263                     ICON         "moods/relaxed.ico"

+264                     ICON         "moods/relieved.ico"

+265                     ICON         "moods/remorseful.ico"

+266                     ICON         "moods/restless.ico"

+267                     ICON         "moods/sad.ico"

+268                     ICON         "moods/sarcastic.ico"

+269                     ICON         "moods/satisfied.ico"

+270                     ICON         "moods/serious.ico"

+271                     ICON         "moods/shocked.ico"

+272                     ICON         "moods/shy.ico"

+273                     ICON         "moods/sick.ico"

+274                     ICON         "moods/sleepy.ico"

+275                     ICON         "moods/spontaneous.ico"

+276                     ICON         "moods/stressed.ico"

+277                     ICON         "moods/strong.ico"

+278                     ICON         "moods/surprised.ico"

+279                     ICON         "moods/thankful.ico"

+280                     ICON         "moods/thirsty.ico"

+281                     ICON         "moods/tired.ico"

+282                     ICON         "moods/undefined.ico"

+283                     ICON         "moods/weak.ico"

+284                     ICON         "moods/worried.ico"

+

+

+300                     ICON         "activities/doing_chores.ico"

+301                     ICON         "activities/buying_groceries.ico"

+302                     ICON         "activities/cleaning.ico"

+303                     ICON         "activities/cooking.ico"

+304                     ICON         "activities/doing_maintenance.ico"

+305                     ICON         "activities/doing_the_dishes.ico"

+306                     ICON         "activities/doing_the_laundry.ico"

+307                     ICON         "activities/gardening.ico"

+308                     ICON         "activities/running_an_errand.ico"

+309                     ICON         "activities/walking_the_dog.ico"

+320                     ICON         "activities/drinking.ico"

+321                     ICON         "activities/having_a_beer.ico"

+322                     ICON         "activities/having_coffee.ico"

+323                     ICON         "activities/having_tea.ico"

+340                     ICON         "activities/eating.ico"

+341                     ICON         "activities/having_a_snack.ico"

+342                     ICON         "activities/having_breakfast.ico"

+343                     ICON         "activities/having_dinner.ico"

+344                     ICON         "activities/having_lunch.ico"

+360                     ICON         "activities/exercising.ico"

+361                     ICON         "activities/cycling.ico"

+362                     ICON         "activities/dancing.ico"

+363                     ICON         "activities/hiking.ico"

+364                     ICON         "activities/jogging.ico"

+365                     ICON         "activities/playing_sports.ico"

+366                     ICON         "activities/running.ico"

+367                     ICON         "activities/skiing.ico"

+368                     ICON         "activities/swimming.ico"

+369                     ICON         "activities/working_out.ico"

+380                     ICON         "activities/grooming.ico"

+381                     ICON         "activities/at_the_spa.ico"

+382                     ICON         "activities/brushing_teeth.ico"

+383                     ICON         "activities/getting_a_haircut.ico"

+384                     ICON         "activities/shaving.ico"

+385                     ICON         "activities/taking_a_bath.ico"

+386                     ICON         "activities/taking_a_shower.ico"

+400                     ICON         "activities/having_appointment.ico"

+420                     ICON         "activities/inactive.ico"

+421                     ICON         "activities/day_off.ico"

+422                     ICON         "activities/hanging_out.ico"

+423                     ICON         "activities/hiding.ico"

+424                     ICON         "activities/on_vacation.ico"

+425                     ICON         "activities/praying.ico"

+426                     ICON         "activities/scheduled_holiday.ico"

+427                     ICON         "activities/sleeping.ico"

+428                     ICON         "activities/thinking.ico"

+440                     ICON         "activities/relaxing.ico"

+441                     ICON         "activities/fishing.ico"

+442                     ICON         "activities/gaming.ico"

+443                     ICON         "activities/going_out.ico"

+444                     ICON         "activities/partying.ico"

+445                     ICON         "activities/reading.ico"

+446                     ICON         "activities/rehearsing.ico"

+447                     ICON         "activities/shopping.ico"

+448                     ICON         "activities/smoking.ico"

+449                     ICON         "activities/socializing.ico"

+450                     ICON         "activities/sunbathing.ico"

+451                     ICON         "activities/watching_tv.ico"

+452                     ICON         "activities/watching_a_movie.ico"

+460                     ICON         "activities/talking.ico"

+461                     ICON         "activities/in_real_life.ico"

+462                     ICON         "activities/on_the_phone.ico"

+463                     ICON         "activities/on_video_phone.ico"

+480                     ICON         "activities/traveling.ico"

+481                     ICON         "activities/commuting.ico"

+482                     ICON         "activities/cycling.ico"

+483                     ICON         "activities/driving.ico"

+484                     ICON         "activities/in_a_car.ico"

+485                     ICON         "activities/on_a_bus.ico"

+486                     ICON         "activities/on_a_plane.ico"

+487                     ICON         "activities/on_a_train.ico"

+488                     ICON         "activities/on_a_trip.ico"

+489                     ICON         "activities/walking.ico"

+500                     ICON         "activities/working.ico"

+501                     ICON         "activities/coding.ico"

+502                     ICON         "activities/in_a_meeting.ico"

+503                     ICON         "activities/studying.ico"

+504                     ICON         "activities/writing.ico"

+

+

+

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

+/////////////////////////////////////////////////////////////////////////////

+

diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/at_the_spa.ico b/protocols/JabberG/jabber_xstatus/res/activities/at_the_spa.ico
index cca4982a86..cca4982a86 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/at_the_spa.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/at_the_spa.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/bicycling.ico b/protocols/JabberG/jabber_xstatus/res/activities/bicycling.ico
index 8e684f44ff..8e684f44ff 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/bicycling.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/bicycling.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/brushing_teeth.ico b/protocols/JabberG/jabber_xstatus/res/activities/brushing_teeth.ico
index ffe652710d..ffe652710d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/brushing_teeth.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/brushing_teeth.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/buying_groceries.ico b/protocols/JabberG/jabber_xstatus/res/activities/buying_groceries.ico
index d1502a55be..d1502a55be 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/buying_groceries.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/buying_groceries.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/cleaning.ico b/protocols/JabberG/jabber_xstatus/res/activities/cleaning.ico
index 722f98f472..722f98f472 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/cleaning.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/cleaning.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/coding.ico b/protocols/JabberG/jabber_xstatus/res/activities/coding.ico
index 63c812d442..63c812d442 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/coding.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/coding.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/commuting.ico b/protocols/JabberG/jabber_xstatus/res/activities/commuting.ico
index 197a7a7817..197a7a7817 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/commuting.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/commuting.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/cooking.ico b/protocols/JabberG/jabber_xstatus/res/activities/cooking.ico
index e0f5dd91a3..e0f5dd91a3 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/cooking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/cooking.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/cycling.ico b/protocols/JabberG/jabber_xstatus/res/activities/cycling.ico
index 0145d83b87..0145d83b87 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/cycling.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/cycling.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/dancing.ico b/protocols/JabberG/jabber_xstatus/res/activities/dancing.ico
index 97084e0885..97084e0885 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/dancing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/dancing.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/day_off.ico b/protocols/JabberG/jabber_xstatus/res/activities/day_off.ico
index 3d1ccabae0..3d1ccabae0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/day_off.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/day_off.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/doing_chores.ico b/protocols/JabberG/jabber_xstatus/res/activities/doing_chores.ico
index 0f619fa093..0f619fa093 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/doing_chores.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/doing_chores.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/doing_maintenance.ico b/protocols/JabberG/jabber_xstatus/res/activities/doing_maintenance.ico
index 4269f50c1f..4269f50c1f 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/doing_maintenance.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/doing_maintenance.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/doing_the_dishes.ico b/protocols/JabberG/jabber_xstatus/res/activities/doing_the_dishes.ico
index 853c7d2694..853c7d2694 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/doing_the_dishes.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/doing_the_dishes.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/doing_the_laundry.ico b/protocols/JabberG/jabber_xstatus/res/activities/doing_the_laundry.ico
index f24f5da48e..f24f5da48e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/doing_the_laundry.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/doing_the_laundry.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/drinking.ico b/protocols/JabberG/jabber_xstatus/res/activities/drinking.ico
index fe836c7e07..fe836c7e07 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/drinking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/drinking.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/driving.ico b/protocols/JabberG/jabber_xstatus/res/activities/driving.ico
index 0cb11be5b1..0cb11be5b1 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/driving.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/driving.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/eating.ico b/protocols/JabberG/jabber_xstatus/res/activities/eating.ico
index f6fa60ad88..f6fa60ad88 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/eating.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/eating.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/exercising.ico b/protocols/JabberG/jabber_xstatus/res/activities/exercising.ico
index 7ccc6c7684..7ccc6c7684 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/exercising.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/exercising.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/fishing.ico b/protocols/JabberG/jabber_xstatus/res/activities/fishing.ico
index c06b871787..c06b871787 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/fishing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/fishing.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/gaming.ico b/protocols/JabberG/jabber_xstatus/res/activities/gaming.ico
index a65b48d77b..a65b48d77b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/gaming.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/gaming.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/gardening.ico b/protocols/JabberG/jabber_xstatus/res/activities/gardening.ico
index f6ee46440d..f6ee46440d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/gardening.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/gardening.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/getting_a_haircut.ico b/protocols/JabberG/jabber_xstatus/res/activities/getting_a_haircut.ico
index 237a8c5252..237a8c5252 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/getting_a_haircut.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/getting_a_haircut.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/going_out.ico b/protocols/JabberG/jabber_xstatus/res/activities/going_out.ico
index ca66ddc627..ca66ddc627 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/going_out.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/going_out.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/grooming.ico b/protocols/JabberG/jabber_xstatus/res/activities/grooming.ico
index f01b5348cf..f01b5348cf 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/grooming.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/grooming.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/hanging_out.ico b/protocols/JabberG/jabber_xstatus/res/activities/hanging_out.ico
index d7f94262f2..d7f94262f2 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/hanging_out.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/hanging_out.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_a_beer.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_a_beer.ico
index 20d634f85e..20d634f85e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_a_beer.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_a_beer.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_a_snack.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_a_snack.ico
index be74f572fc..be74f572fc 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_a_snack.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_a_snack.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_appointment.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_appointment.ico
index 5e849b224e..5e849b224e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_appointment.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_appointment.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_breakfast.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_breakfast.ico
index c58ec2ef4e..c58ec2ef4e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_breakfast.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_breakfast.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_coffee.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_coffee.ico
index 2646fedb5e..2646fedb5e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_coffee.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_coffee.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_dinner.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_dinner.ico
index 8dbb710ecf..8dbb710ecf 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_dinner.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_dinner.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_lunch.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_lunch.ico
index 4235afbe91..4235afbe91 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_lunch.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_lunch.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_tea.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_tea.ico
index cf112ec7f5..cf112ec7f5 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_tea.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_tea.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/hiding.ico b/protocols/JabberG/jabber_xstatus/res/activities/hiding.ico
index a5cc19e99c..a5cc19e99c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/hiding.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/hiding.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/hiking.ico b/protocols/JabberG/jabber_xstatus/res/activities/hiking.ico
index 48e94d2358..48e94d2358 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/hiking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/hiking.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/in_a_car.ico b/protocols/JabberG/jabber_xstatus/res/activities/in_a_car.ico
index b97e49fcb0..b97e49fcb0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/in_a_car.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/in_a_car.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/in_a_meeting.ico b/protocols/JabberG/jabber_xstatus/res/activities/in_a_meeting.ico
index 371da3a59a..371da3a59a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/in_a_meeting.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/in_a_meeting.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/in_real_life.ico b/protocols/JabberG/jabber_xstatus/res/activities/in_real_life.ico
index bb9bc0f931..bb9bc0f931 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/in_real_life.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/in_real_life.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/inactive.ico b/protocols/JabberG/jabber_xstatus/res/activities/inactive.ico
index 74911a62ca..74911a62ca 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/inactive.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/inactive.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/jogging.ico b/protocols/JabberG/jabber_xstatus/res/activities/jogging.ico
index 082df08b77..082df08b77 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/jogging.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/jogging.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_bus.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_a_bus.ico
index 3f6c315e6a..3f6c315e6a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_bus.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_a_bus.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_plane.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_a_plane.ico
index 3391fb0d20..3391fb0d20 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_plane.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_a_plane.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_train.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_a_train.ico
index 5a455b7a8b..5a455b7a8b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_train.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_a_train.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_trip.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_a_trip.ico
index 287b16d0ce..287b16d0ce 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_trip.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_a_trip.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_the_phone.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_the_phone.ico
index 111397e7fa..111397e7fa 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_the_phone.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_the_phone.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_vacation.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_vacation.ico
index c9b43ef894..c9b43ef894 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_vacation.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_vacation.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_video_phone.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_video_phone.ico
index 45fa03ebfd..45fa03ebfd 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_video_phone.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_video_phone.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/partying.ico b/protocols/JabberG/jabber_xstatus/res/activities/partying.ico
index 3b02879831..3b02879831 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/partying.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/partying.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/playing_sports.ico b/protocols/JabberG/jabber_xstatus/res/activities/playing_sports.ico
index 2d5bca3a3c..2d5bca3a3c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/playing_sports.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/playing_sports.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/praying.ico b/protocols/JabberG/jabber_xstatus/res/activities/praying.ico
index d687a69a40..d687a69a40 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/praying.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/praying.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/reading.ico b/protocols/JabberG/jabber_xstatus/res/activities/reading.ico
index 8f218850b8..8f218850b8 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/reading.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/reading.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/rehearsing.ico b/protocols/JabberG/jabber_xstatus/res/activities/rehearsing.ico
index f01323b74d..f01323b74d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/rehearsing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/rehearsing.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/relaxing.ico b/protocols/JabberG/jabber_xstatus/res/activities/relaxing.ico
index d7cbe0abd5..d7cbe0abd5 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/relaxing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/relaxing.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/running.ico b/protocols/JabberG/jabber_xstatus/res/activities/running.ico
index bc4c3f151e..bc4c3f151e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/running.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/running.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/running_an_errand.ico b/protocols/JabberG/jabber_xstatus/res/activities/running_an_errand.ico
index c0dd30c95e..c0dd30c95e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/running_an_errand.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/running_an_errand.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/scheduled_holiday.ico b/protocols/JabberG/jabber_xstatus/res/activities/scheduled_holiday.ico
index 774980c16b..774980c16b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/scheduled_holiday.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/scheduled_holiday.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/shaving.ico b/protocols/JabberG/jabber_xstatus/res/activities/shaving.ico
index 7ed6b0bdc9..7ed6b0bdc9 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/shaving.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/shaving.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/shopping.ico b/protocols/JabberG/jabber_xstatus/res/activities/shopping.ico
index 71ba041daf..71ba041daf 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/shopping.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/shopping.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/skiing.ico b/protocols/JabberG/jabber_xstatus/res/activities/skiing.ico
index 9cd96cf809..9cd96cf809 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/skiing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/skiing.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/sleeping.ico b/protocols/JabberG/jabber_xstatus/res/activities/sleeping.ico
index e8fc48edf7..e8fc48edf7 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/sleeping.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/sleeping.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/smoking.ico b/protocols/JabberG/jabber_xstatus/res/activities/smoking.ico
index f3261a83a6..f3261a83a6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/smoking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/smoking.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/socializing.ico b/protocols/JabberG/jabber_xstatus/res/activities/socializing.ico
index 83297d3084..83297d3084 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/socializing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/socializing.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/studying.ico b/protocols/JabberG/jabber_xstatus/res/activities/studying.ico
index 9dba262974..9dba262974 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/studying.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/studying.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/sunbathing.ico b/protocols/JabberG/jabber_xstatus/res/activities/sunbathing.ico
index 22c489631c..22c489631c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/sunbathing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/sunbathing.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/swimming.ico b/protocols/JabberG/jabber_xstatus/res/activities/swimming.ico
index 2b455683d0..2b455683d0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/swimming.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/swimming.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/taking_a_bath.ico b/protocols/JabberG/jabber_xstatus/res/activities/taking_a_bath.ico
index b93f86c523..b93f86c523 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/taking_a_bath.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/taking_a_bath.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/taking_a_shower.ico b/protocols/JabberG/jabber_xstatus/res/activities/taking_a_shower.ico
index c2021e851b..c2021e851b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/taking_a_shower.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/taking_a_shower.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/talking.ico b/protocols/JabberG/jabber_xstatus/res/activities/talking.ico
index e747618b86..e747618b86 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/talking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/talking.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/thinking.ico b/protocols/JabberG/jabber_xstatus/res/activities/thinking.ico
index e8c8ebed48..e8c8ebed48 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/thinking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/thinking.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/traveling.ico b/protocols/JabberG/jabber_xstatus/res/activities/traveling.ico
index 2dfa197732..2dfa197732 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/traveling.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/traveling.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/walking.ico b/protocols/JabberG/jabber_xstatus/res/activities/walking.ico
index 586ed93029..586ed93029 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/walking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/walking.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/walking_the_dog.ico b/protocols/JabberG/jabber_xstatus/res/activities/walking_the_dog.ico
index 2be18c864f..2be18c864f 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/walking_the_dog.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/walking_the_dog.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/watching_a_movie.ico b/protocols/JabberG/jabber_xstatus/res/activities/watching_a_movie.ico
index c5c8603a4e..c5c8603a4e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/watching_a_movie.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/watching_a_movie.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/watching_tv.ico b/protocols/JabberG/jabber_xstatus/res/activities/watching_tv.ico
index 887f949657..887f949657 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/watching_tv.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/watching_tv.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/working.ico b/protocols/JabberG/jabber_xstatus/res/activities/working.ico
index 025581a407..025581a407 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/working.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/working.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/working_out.ico b/protocols/JabberG/jabber_xstatus/res/activities/working_out.ico
index 668a5aa7f6..668a5aa7f6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/working_out.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/working_out.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/writing.ico b/protocols/JabberG/jabber_xstatus/res/activities/writing.ico
index 64b74636e1..64b74636e1 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/writing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/writing.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/afraid.ico b/protocols/JabberG/jabber_xstatus/res/moods/afraid.ico
index d45fe8ee11..d45fe8ee11 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/afraid.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/afraid.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/amazed.ico b/protocols/JabberG/jabber_xstatus/res/moods/amazed.ico
index 49c2b23e60..49c2b23e60 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/amazed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/amazed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/amorous.ico b/protocols/JabberG/jabber_xstatus/res/moods/amorous.ico
index 302d2e0395..302d2e0395 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/amorous.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/amorous.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/angry.ico b/protocols/JabberG/jabber_xstatus/res/moods/angry.ico
index c8947a4d22..c8947a4d22 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/angry.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/angry.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/annoyed.ico b/protocols/JabberG/jabber_xstatus/res/moods/annoyed.ico
index 850c323a2d..850c323a2d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/annoyed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/annoyed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/anxious.ico b/protocols/JabberG/jabber_xstatus/res/moods/anxious.ico
index d7db20d85d..d7db20d85d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/anxious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/anxious.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/aroused.ico b/protocols/JabberG/jabber_xstatus/res/moods/aroused.ico
index c29feaa8c0..c29feaa8c0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/aroused.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/aroused.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/ashamed.ico b/protocols/JabberG/jabber_xstatus/res/moods/ashamed.ico
index 6a961f2226..6a961f2226 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/ashamed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/ashamed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/bored.ico b/protocols/JabberG/jabber_xstatus/res/moods/bored.ico
index 0bf725ae5e..0bf725ae5e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/bored.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/bored.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/brave.ico b/protocols/JabberG/jabber_xstatus/res/moods/brave.ico
index 8b6b917bc7..8b6b917bc7 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/brave.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/brave.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/calm.ico b/protocols/JabberG/jabber_xstatus/res/moods/calm.ico
index 0ed992ba0d..0ed992ba0d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/calm.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/calm.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/cautious.ico b/protocols/JabberG/jabber_xstatus/res/moods/cautious.ico
index df89f579f9..df89f579f9 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/cautious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/cautious.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/cold.ico b/protocols/JabberG/jabber_xstatus/res/moods/cold.ico
index b6b7c1e884..b6b7c1e884 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/cold.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/cold.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/confident.ico b/protocols/JabberG/jabber_xstatus/res/moods/confident.ico
index bce9395830..bce9395830 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/confident.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/confident.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/confused.ico b/protocols/JabberG/jabber_xstatus/res/moods/confused.ico
index 41f2e7eb4c..41f2e7eb4c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/confused.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/confused.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/contemplative.ico b/protocols/JabberG/jabber_xstatus/res/moods/contemplative.ico
index bd005f816f..bd005f816f 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/contemplative.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/contemplative.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/contented.ico b/protocols/JabberG/jabber_xstatus/res/moods/contented.ico
index e97d4b9db3..e97d4b9db3 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/contented.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/contented.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/cranky.ico b/protocols/JabberG/jabber_xstatus/res/moods/cranky.ico
index ce8468307a..ce8468307a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/cranky.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/cranky.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/crazy.ico b/protocols/JabberG/jabber_xstatus/res/moods/crazy.ico
index b2538674b6..b2538674b6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/crazy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/crazy.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/creative.ico b/protocols/JabberG/jabber_xstatus/res/moods/creative.ico
index 2ac57e40af..2ac57e40af 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/creative.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/creative.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/curious.ico b/protocols/JabberG/jabber_xstatus/res/moods/curious.ico
index 6bedb50282..6bedb50282 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/curious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/curious.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/dejected.ico b/protocols/JabberG/jabber_xstatus/res/moods/dejected.ico
index aea3675a09..aea3675a09 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/dejected.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/dejected.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/depressed.ico b/protocols/JabberG/jabber_xstatus/res/moods/depressed.ico
index 074ffd921d..074ffd921d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/depressed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/depressed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/disappointed.ico b/protocols/JabberG/jabber_xstatus/res/moods/disappointed.ico
index 092df4b59c..092df4b59c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/disappointed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/disappointed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/disgusted.ico b/protocols/JabberG/jabber_xstatus/res/moods/disgusted.ico
index d83ce3b7df..d83ce3b7df 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/disgusted.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/disgusted.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/dismayed.ico b/protocols/JabberG/jabber_xstatus/res/moods/dismayed.ico
index abda47285c..abda47285c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/dismayed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/dismayed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/distracted.ico b/protocols/JabberG/jabber_xstatus/res/moods/distracted.ico
index e9809551fc..e9809551fc 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/distracted.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/distracted.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/embarrassed.ico b/protocols/JabberG/jabber_xstatus/res/moods/embarrassed.ico
index 62cdcd4c60..62cdcd4c60 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/embarrassed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/embarrassed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/envious.ico b/protocols/JabberG/jabber_xstatus/res/moods/envious.ico
index 29a23da950..29a23da950 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/envious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/envious.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/excited.ico b/protocols/JabberG/jabber_xstatus/res/moods/excited.ico
index 42a149ef5b..42a149ef5b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/excited.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/excited.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/flirtatious.ico b/protocols/JabberG/jabber_xstatus/res/moods/flirtatious.ico
index af9b114955..af9b114955 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/flirtatious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/flirtatious.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/frustrated.ico b/protocols/JabberG/jabber_xstatus/res/moods/frustrated.ico
index 790573ad4d..790573ad4d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/frustrated.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/frustrated.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/grateful.ico b/protocols/JabberG/jabber_xstatus/res/moods/grateful.ico
index 857b34c6c2..857b34c6c2 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/grateful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/grateful.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/grieving.ico b/protocols/JabberG/jabber_xstatus/res/moods/grieving.ico
index 5b5774b9af..5b5774b9af 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/grieving.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/grieving.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/grumpy.ico b/protocols/JabberG/jabber_xstatus/res/moods/grumpy.ico
index f37395703a..f37395703a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/grumpy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/grumpy.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/guilty.ico b/protocols/JabberG/jabber_xstatus/res/moods/guilty.ico
index 154d32ed1e..154d32ed1e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/guilty.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/guilty.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/happy.ico b/protocols/JabberG/jabber_xstatus/res/moods/happy.ico
index f6b97adbd0..f6b97adbd0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/happy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/happy.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/hopeful.ico b/protocols/JabberG/jabber_xstatus/res/moods/hopeful.ico
index c012b33ee1..c012b33ee1 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/hopeful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/hopeful.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/hot.ico b/protocols/JabberG/jabber_xstatus/res/moods/hot.ico
index 1fc519a092..1fc519a092 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/hot.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/hot.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/humbled.ico b/protocols/JabberG/jabber_xstatus/res/moods/humbled.ico
index 8df3f7fca4..8df3f7fca4 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/humbled.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/humbled.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/humiliated.ico b/protocols/JabberG/jabber_xstatus/res/moods/humiliated.ico
index 6c2c2ebb92..6c2c2ebb92 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/humiliated.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/humiliated.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/hungry.ico b/protocols/JabberG/jabber_xstatus/res/moods/hungry.ico
index 9b4f03c9d9..9b4f03c9d9 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/hungry.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/hungry.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/hurt.ico b/protocols/JabberG/jabber_xstatus/res/moods/hurt.ico
index a23f46d955..a23f46d955 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/hurt.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/hurt.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/impressed.ico b/protocols/JabberG/jabber_xstatus/res/moods/impressed.ico
index c2af48ccc4..c2af48ccc4 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/impressed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/impressed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/in_awe.ico b/protocols/JabberG/jabber_xstatus/res/moods/in_awe.ico
index d0f4ee317b..d0f4ee317b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/in_awe.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/in_awe.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/in_love.ico b/protocols/JabberG/jabber_xstatus/res/moods/in_love.ico
index 81426556d9..81426556d9 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/in_love.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/in_love.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/indignant.ico b/protocols/JabberG/jabber_xstatus/res/moods/indignant.ico
index c2a566bbff..c2a566bbff 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/indignant.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/indignant.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/interested.ico b/protocols/JabberG/jabber_xstatus/res/moods/interested.ico
index 0e728994a7..0e728994a7 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/interested.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/interested.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/intoxicated.ico b/protocols/JabberG/jabber_xstatus/res/moods/intoxicated.ico
index e7295c7762..e7295c7762 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/intoxicated.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/intoxicated.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/invincible.ico b/protocols/JabberG/jabber_xstatus/res/moods/invincible.ico
index 08f145fc00..08f145fc00 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/invincible.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/invincible.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/jealous.ico b/protocols/JabberG/jabber_xstatus/res/moods/jealous.ico
index c1ac6dd000..c1ac6dd000 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/jealous.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/jealous.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/lonely.ico b/protocols/JabberG/jabber_xstatus/res/moods/lonely.ico
index 8ce7bbbe82..8ce7bbbe82 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/lonely.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/lonely.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/lost.ico b/protocols/JabberG/jabber_xstatus/res/moods/lost.ico
index db23931d39..db23931d39 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/lost.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/lost.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/lucky.ico b/protocols/JabberG/jabber_xstatus/res/moods/lucky.ico
index 4e2894114d..4e2894114d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/lucky.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/lucky.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/mean.ico b/protocols/JabberG/jabber_xstatus/res/moods/mean.ico
index 9a5825cf04..9a5825cf04 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/mean.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/mean.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/moody.ico b/protocols/JabberG/jabber_xstatus/res/moods/moody.ico
index d025001a5a..d025001a5a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/moody.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/moody.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/nervous.ico b/protocols/JabberG/jabber_xstatus/res/moods/nervous.ico
index a8b42584b6..a8b42584b6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/nervous.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/nervous.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/neutral.ico b/protocols/JabberG/jabber_xstatus/res/moods/neutral.ico
index bc3f8ad45c..bc3f8ad45c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/neutral.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/neutral.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/offended.ico b/protocols/JabberG/jabber_xstatus/res/moods/offended.ico
index eb74f4235c..eb74f4235c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/offended.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/offended.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/outraged.ico b/protocols/JabberG/jabber_xstatus/res/moods/outraged.ico
index 1b8e99ee31..1b8e99ee31 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/outraged.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/outraged.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/playful.ico b/protocols/JabberG/jabber_xstatus/res/moods/playful.ico
index b6f7e55745..b6f7e55745 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/playful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/playful.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/proud.ico b/protocols/JabberG/jabber_xstatus/res/moods/proud.ico
index 7ad6f97064..7ad6f97064 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/proud.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/proud.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/relaxed.ico b/protocols/JabberG/jabber_xstatus/res/moods/relaxed.ico
index bba4906d3e..bba4906d3e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/relaxed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/relaxed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/relieved.ico b/protocols/JabberG/jabber_xstatus/res/moods/relieved.ico
index 3bbb2ae30d..3bbb2ae30d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/relieved.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/relieved.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/remorseful.ico b/protocols/JabberG/jabber_xstatus/res/moods/remorseful.ico
index 095e18e468..095e18e468 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/remorseful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/remorseful.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/restless.ico b/protocols/JabberG/jabber_xstatus/res/moods/restless.ico
index 6e4083a57d..6e4083a57d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/restless.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/restless.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/sad.ico b/protocols/JabberG/jabber_xstatus/res/moods/sad.ico
index 07eae404a4..07eae404a4 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/sad.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/sad.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/sarcastic.ico b/protocols/JabberG/jabber_xstatus/res/moods/sarcastic.ico
index b23431bfaa..b23431bfaa 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/sarcastic.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/sarcastic.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/satisfied.ico b/protocols/JabberG/jabber_xstatus/res/moods/satisfied.ico
index aecdf590ff..aecdf590ff 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/satisfied.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/satisfied.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/serious.ico b/protocols/JabberG/jabber_xstatus/res/moods/serious.ico
index b9005bebb2..b9005bebb2 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/serious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/serious.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/shocked.ico b/protocols/JabberG/jabber_xstatus/res/moods/shocked.ico
index 011dea4e60..011dea4e60 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/shocked.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/shocked.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/shy.ico b/protocols/JabberG/jabber_xstatus/res/moods/shy.ico
index a7c02b7916..a7c02b7916 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/shy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/shy.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/sick.ico b/protocols/JabberG/jabber_xstatus/res/moods/sick.ico
index d3a0338b87..d3a0338b87 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/sick.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/sick.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/sleepy.ico b/protocols/JabberG/jabber_xstatus/res/moods/sleepy.ico
index 998164780e..998164780e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/sleepy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/sleepy.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/spontaneous.ico b/protocols/JabberG/jabber_xstatus/res/moods/spontaneous.ico
index 3670422597..3670422597 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/spontaneous.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/spontaneous.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/stressed.ico b/protocols/JabberG/jabber_xstatus/res/moods/stressed.ico
index 94f0472574..94f0472574 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/stressed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/stressed.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/strong.ico b/protocols/JabberG/jabber_xstatus/res/moods/strong.ico
index 01657488b6..01657488b6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/strong.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/strong.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/surprised.ico b/protocols/JabberG/jabber_xstatus/res/moods/surprised.ico
index 882cfcd60a..882cfcd60a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/surprised.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/surprised.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/thankful.ico b/protocols/JabberG/jabber_xstatus/res/moods/thankful.ico
index 56cfc59961..56cfc59961 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/thankful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/thankful.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/thirsty.ico b/protocols/JabberG/jabber_xstatus/res/moods/thirsty.ico
index d678569bd6..d678569bd6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/thirsty.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/thirsty.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/tired.ico b/protocols/JabberG/jabber_xstatus/res/moods/tired.ico
index 90292c7e0e..90292c7e0e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/tired.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/tired.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/undefined.ico b/protocols/JabberG/jabber_xstatus/res/moods/undefined.ico
index 078db99f8f..078db99f8f 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/undefined.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/undefined.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/weak.ico b/protocols/JabberG/jabber_xstatus/res/moods/weak.ico
index 408b769b93..408b769b93 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/weak.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/weak.ico
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/worried.ico b/protocols/JabberG/jabber_xstatus/res/moods/worried.ico
index 45942e7c43..45942e7c43 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/worried.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/worried.ico
diff --git a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj
index 1051ada6bb..59d93a3827 100644
--- a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj
+++ b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters
index f78bc8dede..ae91eacccf 100644
--- a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters
+++ b/protocols/JabberG/proto_jabber/Proto_Jabber.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_Jabber.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/JabberG/proto_jabber/icos/Away.ico b/protocols/JabberG/proto_jabber/res/Away.ico
index d9efcb6be9..d9efcb6be9 100644
--- a/protocols/JabberG/proto_jabber/icos/Away.ico
+++ b/protocols/JabberG/proto_jabber/res/Away.ico
diff --git a/protocols/JabberG/proto_jabber/icos/DND.ico b/protocols/JabberG/proto_jabber/res/DND.ico
index 5a96752278..5a96752278 100644
--- a/protocols/JabberG/proto_jabber/icos/DND.ico
+++ b/protocols/JabberG/proto_jabber/res/DND.ico
diff --git a/protocols/JabberG/proto_jabber/icos/FFC.ico b/protocols/JabberG/proto_jabber/res/FFC.ico
index 7a7ca70b2e..7a7ca70b2e 100644
--- a/protocols/JabberG/proto_jabber/icos/FFC.ico
+++ b/protocols/JabberG/proto_jabber/res/FFC.ico
diff --git a/protocols/JabberG/proto_jabber/icos/Invisible.ico b/protocols/JabberG/proto_jabber/res/Invisible.ico
index 4636cc20f3..4636cc20f3 100644
--- a/protocols/JabberG/proto_jabber/icos/Invisible.ico
+++ b/protocols/JabberG/proto_jabber/res/Invisible.ico
diff --git a/protocols/JabberG/proto_jabber/icos/NA.ico b/protocols/JabberG/proto_jabber/res/NA.ico
index f3c08d0ecf..f3c08d0ecf 100644
--- a/protocols/JabberG/proto_jabber/icos/NA.ico
+++ b/protocols/JabberG/proto_jabber/res/NA.ico
diff --git a/protocols/JabberG/proto_jabber/icos/Offline.ico b/protocols/JabberG/proto_jabber/res/Offline.ico
index ba6d39a5aa..ba6d39a5aa 100644
--- a/protocols/JabberG/proto_jabber/icos/Offline.ico
+++ b/protocols/JabberG/proto_jabber/res/Offline.ico
diff --git a/protocols/JabberG/proto_jabber/icos/Online.ico b/protocols/JabberG/proto_jabber/res/Online.ico
index 9e18c3dd74..9e18c3dd74 100644
--- a/protocols/JabberG/proto_jabber/icos/Online.ico
+++ b/protocols/JabberG/proto_jabber/res/Online.ico
diff --git a/protocols/JabberG/proto_jabber/Proto_Jabber.rc b/protocols/JabberG/proto_jabber/res/Proto_Jabber.rc
index b3188f3d4a..03cfefcd8b 100644
--- a/protocols/JabberG/proto_jabber/Proto_Jabber.rc
+++ b/protocols/JabberG/proto_jabber/res/Proto_Jabber.rc
diff --git a/protocols/JabberG/proto_jabber/resource.h b/protocols/JabberG/proto_jabber/src/resource.h
index d7b66a17e2..d7b66a17e2 100644
--- a/protocols/JabberG/proto_jabber/resource.h
+++ b/protocols/JabberG/proto_jabber/src/resource.h
diff --git a/protocols/JabberG/icos/add2roster.ico b/protocols/JabberG/res/add2roster.ico
index 0b0d1462c3..0b0d1462c3 100644
--- a/protocols/JabberG/icos/add2roster.ico
+++ b/protocols/JabberG/res/add2roster.ico
diff --git a/protocols/JabberG/icos/addcontact.ico b/protocols/JabberG/res/addcontact.ico
index 596593efb1..596593efb1 100644
--- a/protocols/JabberG/icos/addcontact.ico
+++ b/protocols/JabberG/res/addcontact.ico
diff --git a/protocols/JabberG/icos/arrow_down.ico b/protocols/JabberG/res/arrow_down.ico
index 777cbfe161..777cbfe161 100644
--- a/protocols/JabberG/icos/arrow_down.ico
+++ b/protocols/JabberG/res/arrow_down.ico
diff --git a/protocols/JabberG/icos/arrow_up.ico b/protocols/JabberG/res/arrow_up.ico
index 543644cbbc..543644cbbc 100644
--- a/protocols/JabberG/icos/arrow_up.ico
+++ b/protocols/JabberG/res/arrow_up.ico
diff --git a/protocols/JabberG/icos/auth_revoke.ico b/protocols/JabberG/res/auth_revoke.ico
index 42dda06ce4..42dda06ce4 100644
--- a/protocols/JabberG/icos/auth_revoke.ico
+++ b/protocols/JabberG/res/auth_revoke.ico
diff --git a/protocols/JabberG/icos/bookmarks.ico b/protocols/JabberG/res/bookmarks.ico
index e66ee868f9..e66ee868f9 100644
--- a/protocols/JabberG/icos/bookmarks.ico
+++ b/protocols/JabberG/res/bookmarks.ico
diff --git a/protocols/JabberG/icos/command.ico b/protocols/JabberG/res/command.ico
index 1138c0b882..1138c0b882 100644
--- a/protocols/JabberG/icos/command.ico
+++ b/protocols/JabberG/res/command.ico
diff --git a/protocols/JabberG/icos/console.ico b/protocols/JabberG/res/console.ico
index ec2ea2159f..ec2ea2159f 100644
--- a/protocols/JabberG/icos/console.ico
+++ b/protocols/JabberG/res/console.ico
diff --git a/protocols/JabberG/icos/delete.ico b/protocols/JabberG/res/delete.ico
index e4b674dcd5..e4b674dcd5 100644
--- a/protocols/JabberG/icos/delete.ico
+++ b/protocols/JabberG/res/delete.ico
diff --git a/protocols/JabberG/icos/disco_fail.ico b/protocols/JabberG/res/disco_fail.ico
index 39e5a1b800..39e5a1b800 100644
--- a/protocols/JabberG/icos/disco_fail.ico
+++ b/protocols/JabberG/res/disco_fail.ico
diff --git a/protocols/JabberG/icos/disco_in_progress.ico b/protocols/JabberG/res/disco_in_progress.ico
index c1c3e243c5..c1c3e243c5 100644
--- a/protocols/JabberG/icos/disco_in_progress.ico
+++ b/protocols/JabberG/res/disco_in_progress.ico
diff --git a/protocols/JabberG/icos/disco_ok.ico b/protocols/JabberG/res/disco_ok.ico
index d117a9ab46..d117a9ab46 100644
--- a/protocols/JabberG/icos/disco_ok.ico
+++ b/protocols/JabberG/res/disco_ok.ico
diff --git a/protocols/JabberG/icos/filter.ico b/protocols/JabberG/res/filter.ico
index f4d5347cea..f4d5347cea 100644
--- a/protocols/JabberG/icos/filter.ico
+++ b/protocols/JabberG/res/filter.ico
diff --git a/protocols/JabberG/icos/go.ico b/protocols/JabberG/res/go.ico
index 22abe8e7cc..22abe8e7cc 100644
--- a/protocols/JabberG/icos/go.ico
+++ b/protocols/JabberG/res/go.ico
diff --git a/protocols/JabberG/icos/grant.ico b/protocols/JabberG/res/grant.ico
index 8e18fe3754..8e18fe3754 100644
--- a/protocols/JabberG/icos/grant.ico
+++ b/protocols/JabberG/res/grant.ico
diff --git a/protocols/JabberG/icos/group.ico b/protocols/JabberG/res/group.ico
index 3e4cfcc606..3e4cfcc606 100644
--- a/protocols/JabberG/icos/group.ico
+++ b/protocols/JabberG/res/group.ico
diff --git a/protocols/JabberG/icos/home.ico b/protocols/JabberG/res/home.ico
index 2328a8ef16..2328a8ef16 100644
--- a/protocols/JabberG/icos/home.ico
+++ b/protocols/JabberG/res/home.ico
diff --git a/protocols/JabberG/icos/jabber.ico b/protocols/JabberG/res/jabber.ico
index 61644cbfe9..61644cbfe9 100644
--- a/protocols/JabberG/icos/jabber.ico
+++ b/protocols/JabberG/res/jabber.ico
diff --git a/protocols/JabberG/jabber.rc b/protocols/JabberG/res/jabber.rc
index a2daa20277..7e88d2cd4a 100644
--- a/protocols/JabberG/jabber.rc
+++ b/protocols/JabberG/res/jabber.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -780,6 +780,37 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,200,203,50,14

 END

 

+IDD_CONSOLE DIALOGEX 0, 0, 354, 240

+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

+EXSTYLE WS_EX_CONTROLPARENT

+CAPTION "XML Console"

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    CONTROL         "",IDC_CONSOLE,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x804,5,5,343,137

+    CONTROL         "Custom1",IDC_BTN_MSG,"MButtonClass",WS_TABSTOP,5,147,16,14

+    CONTROL         "Custom1",IDC_BTN_PRESENCE,"MButtonClass",WS_TABSTOP,21,147,16,14

+    CONTROL         "Custom1",IDC_BTN_IQ,"MButtonClass",WS_TABSTOP,37,147,16,14

+    CONTROL         "Custom1",IDC_BTN_FILTER,"MButtonClass",WS_TABSTOP,68,147,16,14

+    COMBOBOX        IDC_CB_FILTER,86,147,245,91,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "Custom1",IDC_BTN_FILTER_REFRESH,"MButtonClass",WS_TABSTOP,333,147,16,14

+    EDITTEXT        IDC_CONSOLEIN,5,166,343,38,ES_MULTILINE | WS_VSCROLL

+    PUSHBUTTON      "Reset log",IDC_RESET,244,209,50,14

+    DEFPUSHBUTTON   "Send",IDOK,299,209,50,14

+END

+

+IDD_GROUPCHAT_INPUT DIALOGEX 0, 0, 242, 42

+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

+EXSTYLE WS_EX_CONTROLPARENT

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    EDITTEXT        IDC_TXT_MULTILINE,6,6,230,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | NOT WS_VISIBLE | WS_VSCROLL

+    EDITTEXT        IDC_TXT_PASSWORD,6,6,230,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | ES_PASSWORD

+    COMBOBOX        IDC_TXT_COMBO,6,6,230,92,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "",IDC_TXT_RICHEDIT,RICHEDIT_CLASS,NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12

+    DEFPUSHBUTTON   "OK",IDOK,131,23,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,186,23,50,14

+END

+

 

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

 //

@@ -845,60 +876,60 @@ END
 

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

 // remains consistent on all systems.

-IDI_JABBER              ICON                    "icos/jabber.ico"

-IDI_ARROW_DOWN          ICON                    "icos/arrow_down.ico"

-IDI_ARROW_UP            ICON                    "icos/arrow_up.ico"

-IDI_DISCO_PROGRESS      ICON                    "icos/disco_in_progress.ico"

-IDI_NODE_RSS            ICON                    "icos/rss.ico"

-IDI_NODE_SERVER         ICON                    "icos/server.ico"

-IDI_NODE_STORE          ICON                    "icos/store.ico"

-IDI_NODE_WEATHER        ICON                    "icos/weather.ico"

-IDI_DISCO_OK            ICON                    "icos/disco_ok.ico"

-IDI_DISCO_FAIL          ICON                    "icos/disco_fail.ico"

-IDI_GROUP               ICON                    "icos/group.ico"

-IDI_KEYS                ICON                    "icos/key.ico"

-IDI_ADDCONTACT          ICON                    "icos/addcontact.ico"

-IDI_ADDROSTER           ICON                    "icos/add2roster.ico"

-IDI_AGENTS              ICON                    "icos/roster.ico"

-IDI_VCARD               ICON                    "icos/pages.ico"

-IDI_DELETE              ICON                    "icos/delete.ico"

-IDI_EDIT                ICON                    "icos/rename.ico"

-IDI_GRANT               ICON                    "icos/grant.ico"

-IDI_OPEN                ICON                    "icos/open.ico"

-IDI_REQUEST             ICON                    "icos/request.ico"

-IDI_USER2ROOM           ICON                    "icos/user2room.ico"

-IDI_SAVE                ICON                    "icos/save.ico"

-IDI_LOGIN               ICON                    "icos/login.ico"

-IDI_AUTHREVOKE          ICON                    "icos/auth_revoke.ico"

-IDI_REFRESH             ICON                    "icos/refresh.ico"

-IDI_COMMAND             ICON                    "icos/command.ico"

-IDI_BOOKMARKS           ICON                    "icos/bookmarks.ico"

-IDI_PRIVACY_LISTS       ICON                    "icos/privacy_lists.ico"

-IDI_SERVICE_DISCOVERY   ICON                    "icos/service_discovery.ico"

-IDI_VIEW_LIST           ICON                    "icos/view_as_list.ico"

-IDI_VIEW_TREE           ICON                    "icos/view_as_tree.ico"

-IDI_FILTER_APPLY        ICON                    "icos/filter.ico"

-IDI_BROWSE              ICON                    "icos/go.ico"

-IDI_NAV_HOME            ICON                    "icos/home.ico"

-IDI_NAV_REFRESH         ICON                    "icos/refresh_node.ico"

-IDI_FILTER_RESET        ICON                    "icos/reset_filter.ico"

-IDI_CONSOLE             ICON                    "icos/console.ico"

-IDI_PL_MSG_ALLOW        ICON                    "icos/message_allow.ico"

-IDI_PL_MSG_DENY         ICON                    "icos/message_deny.ico"

-IDI_PL_PRIN_ALLOW       ICON                    "icos/presence_in_allow.ico"

-IDI_PL_PRIN_DENY        ICON                    "icos/presence_in_deny.ico"

-IDI_PL_PROUT_ALLOW      ICON                    "icos/presence_out_allow.ico"

-IDI_PL_PROUT_DENY       ICON                    "icos/presence_out_deny.ico"

-IDI_PL_QUERY_ALLOW      ICON                    "icos/query_allow.ico"

-IDI_PL_QUERY_DENY       ICON                    "icos/query_deny.ico"

-IDI_PL_LIST_ACTIVE      ICON                    "icos/plist_active.ico"

-IDI_PL_LIST_ANY         ICON                    "icos/plist_any.ico"

-IDI_PL_LIST_DEFAULT     ICON                    "icos/plist_default.ico"

-IDI_TRANSPORT           ICON                    "icos/transport.ico"

-IDI_TRANSPORTL          ICON                    "icos/transport_local.ico"

-IDI_HTTP_AUTH           ICON                    "icos/openid.ico"

-IDI_NOTES               ICON                    "icos\\notes.ico"

-IDI_SEND_NOTE           ICON                    "icos\\send_note.ico"

+IDI_JABBER              ICON                    "jabber.ico"

+IDI_ARROW_DOWN          ICON                    "arrow_down.ico"

+IDI_ARROW_UP            ICON                    "arrow_up.ico"

+IDI_DISCO_PROGRESS      ICON                    "disco_in_progress.ico"

+IDI_NODE_RSS            ICON                    "rss.ico"

+IDI_NODE_SERVER         ICON                    "server.ico"

+IDI_NODE_STORE          ICON                    "store.ico"

+IDI_NODE_WEATHER        ICON                    "weather.ico"

+IDI_DISCO_OK            ICON                    "disco_ok.ico"

+IDI_DISCO_FAIL          ICON                    "disco_fail.ico"

+IDI_GROUP               ICON                    "group.ico"

+IDI_KEYS                ICON                    "key.ico"

+IDI_ADDCONTACT          ICON                    "addcontact.ico"

+IDI_ADDROSTER           ICON                    "add2roster.ico"

+IDI_AGENTS              ICON                    "roster.ico"

+IDI_VCARD               ICON                    "pages.ico"

+IDI_DELETE              ICON                    "delete.ico"

+IDI_EDIT                ICON                    "rename.ico"

+IDI_GRANT               ICON                    "grant.ico"

+IDI_OPEN                ICON                    "open.ico"

+IDI_REQUEST             ICON                    "request.ico"

+IDI_USER2ROOM           ICON                    "user2room.ico"

+IDI_SAVE                ICON                    "save.ico"

+IDI_LOGIN               ICON                    "login.ico"

+IDI_AUTHREVOKE          ICON                    "auth_revoke.ico"

+IDI_REFRESH             ICON                    "refresh.ico"

+IDI_COMMAND             ICON                    "command.ico"

+IDI_BOOKMARKS           ICON                    "bookmarks.ico"

+IDI_PRIVACY_LISTS       ICON                    "privacy_lists.ico"

+IDI_SERVICE_DISCOVERY   ICON                    "service_discovery.ico"

+IDI_VIEW_LIST           ICON                    "view_as_list.ico"

+IDI_VIEW_TREE           ICON                    "view_as_tree.ico"

+IDI_FILTER_APPLY        ICON                    "filter.ico"

+IDI_BROWSE              ICON                    "go.ico"

+IDI_NAV_HOME            ICON                    "home.ico"

+IDI_NAV_REFRESH         ICON                    "refresh_node.ico"

+IDI_FILTER_RESET        ICON                    "reset_filter.ico"

+IDI_CONSOLE             ICON                    "console.ico"

+IDI_PL_MSG_ALLOW        ICON                    "message_allow.ico"

+IDI_PL_MSG_DENY         ICON                    "message_deny.ico"

+IDI_PL_PRIN_ALLOW       ICON                    "presence_in_allow.ico"

+IDI_PL_PRIN_DENY        ICON                    "presence_in_deny.ico"

+IDI_PL_PROUT_ALLOW      ICON                    "presence_out_allow.ico"

+IDI_PL_PROUT_DENY       ICON                    "presence_out_deny.ico"

+IDI_PL_QUERY_ALLOW      ICON                    "query_allow.ico"

+IDI_PL_QUERY_DENY       ICON                    "query_deny.ico"

+IDI_PL_LIST_ACTIVE      ICON                    "plist_active.ico"

+IDI_PL_LIST_ANY         ICON                    "plist_any.ico"

+IDI_PL_LIST_DEFAULT     ICON                    "plist_default.ico"

+IDI_TRANSPORT           ICON                    "transport.ico"

+IDI_TRANSPORTL          ICON                    "transport_local.ico"

+IDI_HTTP_AUTH           ICON                    "openid.ico"

+IDI_NOTES               ICON                    "notes.ico"

+IDI_SEND_NOTE           ICON                    "send_note.ico"

 

 #ifdef APSTUDIO_INVOKED

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

@@ -908,7 +939,7 @@ IDI_SEND_NOTE           ICON                    "icos\\send_note.ico"
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/protocols/JabberG/icos/key.ico b/protocols/JabberG/res/key.ico
index 17f9bc23e8..17f9bc23e8 100644
--- a/protocols/JabberG/icos/key.ico
+++ b/protocols/JabberG/res/key.ico
diff --git a/protocols/JabberG/icos/login.ico b/protocols/JabberG/res/login.ico
index 5b72f5e87a..5b72f5e87a 100644
--- a/protocols/JabberG/icos/login.ico
+++ b/protocols/JabberG/res/login.ico
diff --git a/protocols/JabberG/icos/message_allow.ico b/protocols/JabberG/res/message_allow.ico
index b82dc84cb4..b82dc84cb4 100644
--- a/protocols/JabberG/icos/message_allow.ico
+++ b/protocols/JabberG/res/message_allow.ico
diff --git a/protocols/JabberG/icos/message_deny.ico b/protocols/JabberG/res/message_deny.ico
index 4f67487b7a..4f67487b7a 100644
--- a/protocols/JabberG/icos/message_deny.ico
+++ b/protocols/JabberG/res/message_deny.ico
diff --git a/protocols/JabberG/icos/notes.ico b/protocols/JabberG/res/notes.ico
index 4a2eb48dfa..4a2eb48dfa 100644
--- a/protocols/JabberG/icos/notes.ico
+++ b/protocols/JabberG/res/notes.ico
diff --git a/protocols/JabberG/icos/open.ico b/protocols/JabberG/res/open.ico
index bc56c4f149..bc56c4f149 100644
--- a/protocols/JabberG/icos/open.ico
+++ b/protocols/JabberG/res/open.ico
diff --git a/protocols/JabberG/icos/openid.ico b/protocols/JabberG/res/openid.ico
index d8e2f9f240..d8e2f9f240 100644
--- a/protocols/JabberG/icos/openid.ico
+++ b/protocols/JabberG/res/openid.ico
diff --git a/protocols/JabberG/icos/pages.ico b/protocols/JabberG/res/pages.ico
index 715b7a1bec..715b7a1bec 100644
--- a/protocols/JabberG/icos/pages.ico
+++ b/protocols/JabberG/res/pages.ico
diff --git a/protocols/JabberG/icos/plist_active.ico b/protocols/JabberG/res/plist_active.ico
index 3cffd4d21d..3cffd4d21d 100644
--- a/protocols/JabberG/icos/plist_active.ico
+++ b/protocols/JabberG/res/plist_active.ico
diff --git a/protocols/JabberG/icos/plist_any.ico b/protocols/JabberG/res/plist_any.ico
index 052e670921..052e670921 100644
--- a/protocols/JabberG/icos/plist_any.ico
+++ b/protocols/JabberG/res/plist_any.ico
diff --git a/protocols/JabberG/icos/plist_default.ico b/protocols/JabberG/res/plist_default.ico
index f282227f9a..f282227f9a 100644
--- a/protocols/JabberG/icos/plist_default.ico
+++ b/protocols/JabberG/res/plist_default.ico
diff --git a/protocols/JabberG/icos/presence_in_allow.ico b/protocols/JabberG/res/presence_in_allow.ico
index 400b8b6f13..400b8b6f13 100644
--- a/protocols/JabberG/icos/presence_in_allow.ico
+++ b/protocols/JabberG/res/presence_in_allow.ico
diff --git a/protocols/JabberG/icos/presence_in_deny.ico b/protocols/JabberG/res/presence_in_deny.ico
index 99bd3a0ec7..99bd3a0ec7 100644
--- a/protocols/JabberG/icos/presence_in_deny.ico
+++ b/protocols/JabberG/res/presence_in_deny.ico
diff --git a/protocols/JabberG/icos/presence_out_allow.ico b/protocols/JabberG/res/presence_out_allow.ico
index b7d644e8fb..b7d644e8fb 100644
--- a/protocols/JabberG/icos/presence_out_allow.ico
+++ b/protocols/JabberG/res/presence_out_allow.ico
diff --git a/protocols/JabberG/icos/presence_out_deny.ico b/protocols/JabberG/res/presence_out_deny.ico
index 8bfa078d5b..8bfa078d5b 100644
--- a/protocols/JabberG/icos/presence_out_deny.ico
+++ b/protocols/JabberG/res/presence_out_deny.ico
diff --git a/protocols/JabberG/icos/privacy_lists.ico b/protocols/JabberG/res/privacy_lists.ico
index 2a55157ff7..2a55157ff7 100644
--- a/protocols/JabberG/icos/privacy_lists.ico
+++ b/protocols/JabberG/res/privacy_lists.ico
diff --git a/protocols/JabberG/icos/query_allow.ico b/protocols/JabberG/res/query_allow.ico
index e6c3a4bfe6..e6c3a4bfe6 100644
--- a/protocols/JabberG/icos/query_allow.ico
+++ b/protocols/JabberG/res/query_allow.ico
diff --git a/protocols/JabberG/icos/query_deny.ico b/protocols/JabberG/res/query_deny.ico
index dd358a484e..dd358a484e 100644
--- a/protocols/JabberG/icos/query_deny.ico
+++ b/protocols/JabberG/res/query_deny.ico
diff --git a/protocols/JabberG/icos/refresh.ico b/protocols/JabberG/res/refresh.ico
index 81c6d95f4a..81c6d95f4a 100644
--- a/protocols/JabberG/icos/refresh.ico
+++ b/protocols/JabberG/res/refresh.ico
diff --git a/protocols/JabberG/icos/refresh_node.ico b/protocols/JabberG/res/refresh_node.ico
index 6c7efc744f..6c7efc744f 100644
--- a/protocols/JabberG/icos/refresh_node.ico
+++ b/protocols/JabberG/res/refresh_node.ico
diff --git a/protocols/JabberG/icos/rename.ico b/protocols/JabberG/res/rename.ico
index fa8abc8785..fa8abc8785 100644
--- a/protocols/JabberG/icos/rename.ico
+++ b/protocols/JabberG/res/rename.ico
diff --git a/protocols/JabberG/icos/request.ico b/protocols/JabberG/res/request.ico
index 94ee8e60c3..94ee8e60c3 100644
--- a/protocols/JabberG/icos/request.ico
+++ b/protocols/JabberG/res/request.ico
diff --git a/protocols/JabberG/icos/reset_filter.ico b/protocols/JabberG/res/reset_filter.ico
index e1e54dbeb6..e1e54dbeb6 100644
--- a/protocols/JabberG/icos/reset_filter.ico
+++ b/protocols/JabberG/res/reset_filter.ico
diff --git a/protocols/JabberG/icos/roster.ico b/protocols/JabberG/res/roster.ico
index 89e9430443..89e9430443 100644
--- a/protocols/JabberG/icos/roster.ico
+++ b/protocols/JabberG/res/roster.ico
diff --git a/protocols/JabberG/icos/rss.ico b/protocols/JabberG/res/rss.ico
index 9069672b7d..9069672b7d 100644
--- a/protocols/JabberG/icos/rss.ico
+++ b/protocols/JabberG/res/rss.ico
diff --git a/protocols/JabberG/icos/save.ico b/protocols/JabberG/res/save.ico
index fadf04c4da..fadf04c4da 100644
--- a/protocols/JabberG/icos/save.ico
+++ b/protocols/JabberG/res/save.ico
diff --git a/protocols/JabberG/icos/send_note.ico b/protocols/JabberG/res/send_note.ico
index c77fa5e35d..c77fa5e35d 100644
--- a/protocols/JabberG/icos/send_note.ico
+++ b/protocols/JabberG/res/send_note.ico
diff --git a/protocols/JabberG/icos/server.ico b/protocols/JabberG/res/server.ico
index 1e4af66351..1e4af66351 100644
--- a/protocols/JabberG/icos/server.ico
+++ b/protocols/JabberG/res/server.ico
diff --git a/protocols/JabberG/icos/service_discovery.ico b/protocols/JabberG/res/service_discovery.ico
index b361d5ab2a..b361d5ab2a 100644
--- a/protocols/JabberG/icos/service_discovery.ico
+++ b/protocols/JabberG/res/service_discovery.ico
diff --git a/protocols/JabberG/icos/store.ico b/protocols/JabberG/res/store.ico
index 86efc4935e..86efc4935e 100644
--- a/protocols/JabberG/icos/store.ico
+++ b/protocols/JabberG/res/store.ico
diff --git a/protocols/JabberG/icos/transport.ico b/protocols/JabberG/res/transport.ico
index 5082add068..5082add068 100644
--- a/protocols/JabberG/icos/transport.ico
+++ b/protocols/JabberG/res/transport.ico
diff --git a/protocols/JabberG/icos/transport_local.ico b/protocols/JabberG/res/transport_local.ico
index c1b79901a2..c1b79901a2 100644
--- a/protocols/JabberG/icos/transport_local.ico
+++ b/protocols/JabberG/res/transport_local.ico
diff --git a/protocols/JabberG/icos/user2room.ico b/protocols/JabberG/res/user2room.ico
index 94c37db75e..94c37db75e 100644
--- a/protocols/JabberG/icos/user2room.ico
+++ b/protocols/JabberG/res/user2room.ico
diff --git a/protocols/JabberG/res/version.rc b/protocols/JabberG/res/version.rc
new file mode 100644
index 0000000000..d50daca899
--- /dev/null
+++ b/protocols/JabberG/res/version.rc
@@ -0,0 +1,53 @@
+#ifdef APSTUDIO_INVOKED

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

+#endif //APSTUDIO_INVOKED

+

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

+#include "winres.h"

+

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page( 1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x40004L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "Comments", "\0"

+            VALUE "CompanyName", "Miranda\0"

+            VALUE "FileDescription", "Jabber Protocol Plugin for Miranda NG\0"

+            VALUE "FileVersion", __VERSION_STRING

+            VALUE "InternalName", "jabber\0"

+            VALUE "LegalCopyright", "Copyright ( c) 2002-04 Santithorn Bunchua, 2005 George Hazan \0"

+            VALUE "LegalTrademarks", "\0"

+            VALUE "OriginalFilename", "jabber.dll\0"

+            VALUE "PrivateBuild", "\0"

+            VALUE "ProductName", "Jabber Protocol Plugin for Miranda NG\0"

+            VALUE "ProductVersion", __VERSION_STRING

+            VALUE "SpecialBuild", "\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

diff --git a/protocols/JabberG/icos/view_as_list.ico b/protocols/JabberG/res/view_as_list.ico
index 6baf9d9d3d..6baf9d9d3d 100644
--- a/protocols/JabberG/icos/view_as_list.ico
+++ b/protocols/JabberG/res/view_as_list.ico
diff --git a/protocols/JabberG/icos/view_as_tree.ico b/protocols/JabberG/res/view_as_tree.ico
index 0a1c408f34..0a1c408f34 100644
--- a/protocols/JabberG/icos/view_as_tree.ico
+++ b/protocols/JabberG/res/view_as_tree.ico
diff --git a/protocols/JabberG/icos/weather.ico b/protocols/JabberG/res/weather.ico
index 6fa9c8f5a5..6fa9c8f5a5 100644
--- a/protocols/JabberG/icos/weather.ico
+++ b/protocols/JabberG/res/weather.ico
diff --git a/protocols/JabberG/MString.cpp b/protocols/JabberG/src/MString.cpp
index 773871d1a5..773871d1a5 100644
--- a/protocols/JabberG/MString.cpp
+++ b/protocols/JabberG/src/MString.cpp
diff --git a/protocols/JabberG/MString.h b/protocols/JabberG/src/MString.h
index 7cc16ff4a3..7cc16ff4a3 100644
--- a/protocols/JabberG/MString.h
+++ b/protocols/JabberG/src/MString.h
diff --git a/protocols/JabberG/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index a3dd31a3fa..a3dd31a3fa 100644
--- a/protocols/JabberG/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
diff --git a/protocols/JabberG/jabber.h b/protocols/JabberG/src/jabber.h
index 957b7d66bf..957b7d66bf 100644
--- a/protocols/JabberG/jabber.h
+++ b/protocols/JabberG/src/jabber.h
diff --git a/protocols/JabberG/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 09884e79df..09884e79df 100644
--- a/protocols/JabberG/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
diff --git a/protocols/JabberG/jabber_agent.cpp b/protocols/JabberG/src/jabber_agent.cpp
index b0ad17e8a0..b0ad17e8a0 100644
--- a/protocols/JabberG/jabber_agent.cpp
+++ b/protocols/JabberG/src/jabber_agent.cpp
diff --git a/protocols/JabberG/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index 158f83e669..158f83e669 100644
--- a/protocols/JabberG/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
diff --git a/protocols/JabberG/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp
index 9e86b51388..9e86b51388 100644
--- a/protocols/JabberG/jabber_byte.cpp
+++ b/protocols/JabberG/src/jabber_byte.cpp
diff --git a/protocols/JabberG/jabber_byte.h b/protocols/JabberG/src/jabber_byte.h
index 657d797fce..657d797fce 100644
--- a/protocols/JabberG/jabber_byte.h
+++ b/protocols/JabberG/src/jabber_byte.h
diff --git a/protocols/JabberG/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp
index 380cf03087..380cf03087 100644
--- a/protocols/JabberG/jabber_caps.cpp
+++ b/protocols/JabberG/src/jabber_caps.cpp
diff --git a/protocols/JabberG/jabber_caps.h b/protocols/JabberG/src/jabber_caps.h
index e0525f2a16..e0525f2a16 100644
--- a/protocols/JabberG/jabber_caps.h
+++ b/protocols/JabberG/src/jabber_caps.h
diff --git a/protocols/JabberG/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp
index 88d3038ab7..88d3038ab7 100644
--- a/protocols/JabberG/jabber_captcha.cpp
+++ b/protocols/JabberG/src/jabber_captcha.cpp
diff --git a/protocols/JabberG/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 8dacc24619..8dacc24619 100644
--- a/protocols/JabberG/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
diff --git a/protocols/JabberG/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp
index ca2c82b3e4..ca2c82b3e4 100644
--- a/protocols/JabberG/jabber_console.cpp
+++ b/protocols/JabberG/src/jabber_console.cpp
diff --git a/protocols/JabberG/jabber_db_utils.h b/protocols/JabberG/src/jabber_db_utils.h
index ae9a6c9781..ae9a6c9781 100644
--- a/protocols/JabberG/jabber_db_utils.h
+++ b/protocols/JabberG/src/jabber_db_utils.h
diff --git a/protocols/JabberG/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index eadfd2d5d1..eadfd2d5d1 100644
--- a/protocols/JabberG/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
diff --git a/protocols/JabberG/jabber_disco.h b/protocols/JabberG/src/jabber_disco.h
index 79df12781e..79df12781e 100644
--- a/protocols/JabberG/jabber_disco.h
+++ b/protocols/JabberG/src/jabber_disco.h
diff --git a/protocols/JabberG/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 3f416aa54b..3f416aa54b 100644
--- a/protocols/JabberG/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
diff --git a/protocols/JabberG/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp
index 5db215d024..5db215d024 100644
--- a/protocols/JabberG/jabber_file.cpp
+++ b/protocols/JabberG/src/jabber_file.cpp
diff --git a/protocols/JabberG/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp
index a90dcf62fa..a90dcf62fa 100644
--- a/protocols/JabberG/jabber_form.cpp
+++ b/protocols/JabberG/src/jabber_form.cpp
diff --git a/protocols/JabberG/jabber_form2.cpp b/protocols/JabberG/src/jabber_form2.cpp
index f1936c9e73..f1936c9e73 100644
--- a/protocols/JabberG/jabber_form2.cpp
+++ b/protocols/JabberG/src/jabber_form2.cpp
diff --git a/protocols/JabberG/jabber_form2.h b/protocols/JabberG/src/jabber_form2.h
index 051eb8571f..051eb8571f 100644
--- a/protocols/JabberG/jabber_form2.h
+++ b/protocols/JabberG/src/jabber_form2.h
diff --git a/protocols/JabberG/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index 4ded28d84d..4ded28d84d 100644
--- a/protocols/JabberG/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
diff --git a/protocols/JabberG/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index b442588fc0..b442588fc0 100644
--- a/protocols/JabberG/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
diff --git a/protocols/JabberG/jabber_ibb.cpp b/protocols/JabberG/src/jabber_ibb.cpp
index 51719a696b..51719a696b 100644
--- a/protocols/JabberG/jabber_ibb.cpp
+++ b/protocols/JabberG/src/jabber_ibb.cpp
diff --git a/protocols/JabberG/jabber_ibb.h b/protocols/JabberG/src/jabber_ibb.h
index 37ecfd1a2e..37ecfd1a2e 100644
--- a/protocols/JabberG/jabber_ibb.h
+++ b/protocols/JabberG/src/jabber_ibb.h
diff --git a/protocols/JabberG/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index f29a827313..f29a827313 100644
--- a/protocols/JabberG/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
diff --git a/protocols/JabberG/jabber_icolib.h b/protocols/JabberG/src/jabber_icolib.h
index 4b5f7d8e12..4b5f7d8e12 100644
--- a/protocols/JabberG/jabber_icolib.h
+++ b/protocols/JabberG/src/jabber_icolib.h
diff --git a/protocols/JabberG/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp
index 43084114c2..43084114c2 100644
--- a/protocols/JabberG/jabber_iq.cpp
+++ b/protocols/JabberG/src/jabber_iq.cpp
diff --git a/protocols/JabberG/jabber_iq.h b/protocols/JabberG/src/jabber_iq.h
index 6e145e7db0..6e145e7db0 100644
--- a/protocols/JabberG/jabber_iq.h
+++ b/protocols/JabberG/src/jabber_iq.h
diff --git a/protocols/JabberG/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index 7f3385ff6e..7f3385ff6e 100644
--- a/protocols/JabberG/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
diff --git a/protocols/JabberG/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 7679450d59..7679450d59 100644
--- a/protocols/JabberG/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
diff --git a/protocols/JabberG/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp
index 3621506d29..3621506d29 100644
--- a/protocols/JabberG/jabber_iqid_muc.cpp
+++ b/protocols/JabberG/src/jabber_iqid_muc.cpp
diff --git a/protocols/JabberG/jabber_libstr.cpp b/protocols/JabberG/src/jabber_libstr.cpp
index 4517d77272..4517d77272 100644
--- a/protocols/JabberG/jabber_libstr.cpp
+++ b/protocols/JabberG/src/jabber_libstr.cpp
diff --git a/protocols/JabberG/jabber_list.cpp b/protocols/JabberG/src/jabber_list.cpp
index 8a956ebc47..8a956ebc47 100644
--- a/protocols/JabberG/jabber_list.cpp
+++ b/protocols/JabberG/src/jabber_list.cpp
diff --git a/protocols/JabberG/jabber_list.h b/protocols/JabberG/src/jabber_list.h
index 503a479ece..503a479ece 100644
--- a/protocols/JabberG/jabber_list.h
+++ b/protocols/JabberG/src/jabber_list.h
diff --git a/protocols/JabberG/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 6bc4c1f8c8..6bc4c1f8c8 100644
--- a/protocols/JabberG/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
diff --git a/protocols/JabberG/jabber_message_handlers.cpp b/protocols/JabberG/src/jabber_message_handlers.cpp
index a3801f274f..a3801f274f 100644
--- a/protocols/JabberG/jabber_message_handlers.cpp
+++ b/protocols/JabberG/src/jabber_message_handlers.cpp
diff --git a/protocols/JabberG/jabber_message_manager.cpp b/protocols/JabberG/src/jabber_message_manager.cpp
index 67e9982eb3..67e9982eb3 100644
--- a/protocols/JabberG/jabber_message_manager.cpp
+++ b/protocols/JabberG/src/jabber_message_manager.cpp
diff --git a/protocols/JabberG/jabber_message_manager.h b/protocols/JabberG/src/jabber_message_manager.h
index dd52b50683..dd52b50683 100644
--- a/protocols/JabberG/jabber_message_manager.h
+++ b/protocols/JabberG/src/jabber_message_manager.h
diff --git a/protocols/JabberG/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index e13c0d450d..e13c0d450d 100644
--- a/protocols/JabberG/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
diff --git a/protocols/JabberG/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index d684541f0a..d684541f0a 100644
--- a/protocols/JabberG/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
diff --git a/protocols/JabberG/jabber_notes.h b/protocols/JabberG/src/jabber_notes.h
index de096943c2..de096943c2 100644
--- a/protocols/JabberG/jabber_notes.h
+++ b/protocols/JabberG/src/jabber_notes.h
diff --git a/protocols/JabberG/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 1f1270a8a1..1f1270a8a1 100644
--- a/protocols/JabberG/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
diff --git a/protocols/JabberG/jabber_opttree.cpp b/protocols/JabberG/src/jabber_opttree.cpp
index bd43b55a08..bd43b55a08 100644
--- a/protocols/JabberG/jabber_opttree.cpp
+++ b/protocols/JabberG/src/jabber_opttree.cpp
diff --git a/protocols/JabberG/jabber_opttree.h b/protocols/JabberG/src/jabber_opttree.h
index 3246ad74a3..3246ad74a3 100644
--- a/protocols/JabberG/jabber_opttree.h
+++ b/protocols/JabberG/src/jabber_opttree.h
diff --git a/protocols/JabberG/jabber_password.cpp b/protocols/JabberG/src/jabber_password.cpp
index 2ce5128b78..2ce5128b78 100644
--- a/protocols/JabberG/jabber_password.cpp
+++ b/protocols/JabberG/src/jabber_password.cpp
diff --git a/protocols/JabberG/jabber_presence_manager.cpp b/protocols/JabberG/src/jabber_presence_manager.cpp
index 8a8ece811d..8a8ece811d 100644
--- a/protocols/JabberG/jabber_presence_manager.cpp
+++ b/protocols/JabberG/src/jabber_presence_manager.cpp
diff --git a/protocols/JabberG/jabber_presence_manager.h b/protocols/JabberG/src/jabber_presence_manager.h
index be138d3b93..be138d3b93 100644
--- a/protocols/JabberG/jabber_presence_manager.h
+++ b/protocols/JabberG/src/jabber_presence_manager.h
diff --git a/protocols/JabberG/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 636cf50bf6..636cf50bf6 100644
--- a/protocols/JabberG/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
diff --git a/protocols/JabberG/jabber_privacy.h b/protocols/JabberG/src/jabber_privacy.h
index 4a2cfd8f2f..4a2cfd8f2f 100644
--- a/protocols/JabberG/jabber_privacy.h
+++ b/protocols/JabberG/src/jabber_privacy.h
diff --git a/protocols/JabberG/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 6444482ee6..6444482ee6 100644
--- a/protocols/JabberG/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
diff --git a/protocols/JabberG/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index eff59bb002..eff59bb002 100644
--- a/protocols/JabberG/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
diff --git a/protocols/JabberG/jabber_proxy.cpp b/protocols/JabberG/src/jabber_proxy.cpp
index 1702eb52de..1702eb52de 100644
--- a/protocols/JabberG/jabber_proxy.cpp
+++ b/protocols/JabberG/src/jabber_proxy.cpp
diff --git a/protocols/JabberG/jabber_proxy.h b/protocols/JabberG/src/jabber_proxy.h
index a42591f81e..a42591f81e 100644
--- a/protocols/JabberG/jabber_proxy.h
+++ b/protocols/JabberG/src/jabber_proxy.h
diff --git a/protocols/JabberG/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index 0021733356..0021733356 100644
--- a/protocols/JabberG/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
diff --git a/protocols/JabberG/jabber_rc.h b/protocols/JabberG/src/jabber_rc.h
index cb3bf1b9cc..cb3bf1b9cc 100644
--- a/protocols/JabberG/jabber_rc.h
+++ b/protocols/JabberG/src/jabber_rc.h
diff --git a/protocols/JabberG/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index e242294a16..e242294a16 100644
--- a/protocols/JabberG/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
diff --git a/protocols/JabberG/jabber_search.h b/protocols/JabberG/src/jabber_search.h
index 7450b652d1..7450b652d1 100644
--- a/protocols/JabberG/jabber_search.h
+++ b/protocols/JabberG/src/jabber_search.h
diff --git a/protocols/JabberG/jabber_secur.cpp b/protocols/JabberG/src/jabber_secur.cpp
index c48ded22d6..c48ded22d6 100644
--- a/protocols/JabberG/jabber_secur.cpp
+++ b/protocols/JabberG/src/jabber_secur.cpp
diff --git a/protocols/JabberG/jabber_secur.h b/protocols/JabberG/src/jabber_secur.h
index 0c3287b88d..0c3287b88d 100644
--- a/protocols/JabberG/jabber_secur.h
+++ b/protocols/JabberG/src/jabber_secur.h
diff --git a/protocols/JabberG/jabber_send_manager.cpp b/protocols/JabberG/src/jabber_send_manager.cpp
index b37b1d2f09..b37b1d2f09 100644
--- a/protocols/JabberG/jabber_send_manager.cpp
+++ b/protocols/JabberG/src/jabber_send_manager.cpp
diff --git a/protocols/JabberG/jabber_send_manager.h b/protocols/JabberG/src/jabber_send_manager.h
index fe4916686f..fe4916686f 100644
--- a/protocols/JabberG/jabber_send_manager.h
+++ b/protocols/JabberG/src/jabber_send_manager.h
diff --git a/protocols/JabberG/jabber_std.cpp b/protocols/JabberG/src/jabber_std.cpp
index 099c28b993..099c28b993 100644
--- a/protocols/JabberG/jabber_std.cpp
+++ b/protocols/JabberG/src/jabber_std.cpp
diff --git a/protocols/JabberG/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index 6344751ead..6344751ead 100644
--- a/protocols/JabberG/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
diff --git a/protocols/JabberG/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index d71fd2ab60..d71fd2ab60 100644
--- a/protocols/JabberG/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
diff --git a/protocols/JabberG/jabber_treelist.cpp b/protocols/JabberG/src/jabber_treelist.cpp
index 8e1e28cb45..8e1e28cb45 100644
--- a/protocols/JabberG/jabber_treelist.cpp
+++ b/protocols/JabberG/src/jabber_treelist.cpp
diff --git a/protocols/JabberG/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 9d8b476851..9d8b476851 100644
--- a/protocols/JabberG/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
diff --git a/protocols/JabberG/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index a7650c5cd0..a7650c5cd0 100644
--- a/protocols/JabberG/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
diff --git a/protocols/JabberG/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp
index 691f3516ed..691f3516ed 100644
--- a/protocols/JabberG/jabber_vcard.cpp
+++ b/protocols/JabberG/src/jabber_vcard.cpp
diff --git a/protocols/JabberG/jabber_ws.cpp b/protocols/JabberG/src/jabber_ws.cpp
index 494dcf3454..494dcf3454 100644
--- a/protocols/JabberG/jabber_ws.cpp
+++ b/protocols/JabberG/src/jabber_ws.cpp
diff --git a/protocols/JabberG/jabber_xml.cpp b/protocols/JabberG/src/jabber_xml.cpp
index 287a335243..287a335243 100644
--- a/protocols/JabberG/jabber_xml.cpp
+++ b/protocols/JabberG/src/jabber_xml.cpp
diff --git a/protocols/JabberG/jabber_xml.h b/protocols/JabberG/src/jabber_xml.h
index 0a1b41e511..0a1b41e511 100644
--- a/protocols/JabberG/jabber_xml.h
+++ b/protocols/JabberG/src/jabber_xml.h
diff --git a/protocols/JabberG/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index d15cae2bcd..d15cae2bcd 100644
--- a/protocols/JabberG/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
diff --git a/protocols/JabberG/jabber_xstatus.h b/protocols/JabberG/src/jabber_xstatus.h
index ae12ebae86..ae12ebae86 100644
--- a/protocols/JabberG/jabber_xstatus.h
+++ b/protocols/JabberG/src/jabber_xstatus.h
diff --git a/protocols/JabberG/jabber_zstream.cpp b/protocols/JabberG/src/jabber_zstream.cpp
index 11829bf401..11829bf401 100644
--- a/protocols/JabberG/jabber_zstream.cpp
+++ b/protocols/JabberG/src/jabber_zstream.cpp
diff --git a/protocols/JabberG/resource.h b/protocols/JabberG/src/resource.h
index 5cbc583aa5..5cbc583aa5 100644
--- a/protocols/JabberG/resource.h
+++ b/protocols/JabberG/src/resource.h
diff --git a/protocols/JabberG/ui_utils.cpp b/protocols/JabberG/src/ui_utils.cpp
index 39f63ecae7..39f63ecae7 100644
--- a/protocols/JabberG/ui_utils.cpp
+++ b/protocols/JabberG/src/ui_utils.cpp
diff --git a/protocols/JabberG/ui_utils.h b/protocols/JabberG/src/ui_utils.h
index 9af9e8ba36..9af9e8ba36 100644
--- a/protocols/JabberG/ui_utils.h
+++ b/protocols/JabberG/src/ui_utils.h
diff --git a/protocols/JabberG/version.h b/protocols/JabberG/src/version.h
index cf7a422dc2..cf7a422dc2 100644
--- a/protocols/JabberG/version.h
+++ b/protocols/JabberG/src/version.h
diff --git a/protocols/JabberG/version.rc b/protocols/JabberG/version.rc
deleted file mode 100644
index 675df2f720..0000000000
--- a/protocols/JabberG/version.rc
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifdef APSTUDIO_INVOKED

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

-#endif //APSTUDIO_INVOKED

-

-#include "version.h"

-#include "resource.h"

-#include "winres.h"

-#include "richedit.h"

-

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page( 1252)

-#endif //_WIN32

-

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

-//

-// Do not edit this dialogs in visual editor!!!

-//

-

-IDD_CONSOLE DIALOGEX 0, 0, 354, 240

-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "XML Console"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    CONTROL         "",IDC_CONSOLE,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x804,5,5,343,137

-    CONTROL         "Custom1",IDC_BTN_MSG,"MButtonClass",WS_TABSTOP,5,147,16,14

-    CONTROL         "Custom1",IDC_BTN_PRESENCE,"MButtonClass",WS_TABSTOP,21,147,16,14

-    CONTROL         "Custom1",IDC_BTN_IQ,"MButtonClass",WS_TABSTOP,37,147,16,14

-    CONTROL         "Custom1",IDC_BTN_FILTER,"MButtonClass",WS_TABSTOP,68,147,16,14

-    COMBOBOX        IDC_CB_FILTER,86,147,245,91,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "Custom1",IDC_BTN_FILTER_REFRESH,"MButtonClass",WS_TABSTOP,333,147,16,14

-    EDITTEXT        IDC_CONSOLEIN,5,166,343,38,ES_MULTILINE | WS_VSCROLL

-    PUSHBUTTON      "Reset log",IDC_RESET,244,209,50,14

-    DEFPUSHBUTTON   "Send",IDOK,299,209,50,14

-END

-

-IDD_GROUPCHAT_INPUT DIALOGEX 0, 0, 242, 42

-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    EDITTEXT        IDC_TXT_MULTILINE,6,6,230,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | NOT WS_VISIBLE | WS_VSCROLL

-    EDITTEXT        IDC_TXT_PASSWORD,6,6,230,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | ES_PASSWORD

-    COMBOBOX        IDC_TXT_COMBO,6,6,230,92,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "",IDC_TXT_RICHEDIT,RICHEDIT_CLASS,NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12

-    DEFPUSHBUTTON   "OK",IDOK,131,23,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,186,23,50,14

-END

-

-#ifndef _MAC

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

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION __FILEVERSION_STRING

- PRODUCTVERSION __FILEVERSION_STRING

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904b0"

-        BEGIN

-            VALUE "Comments", "\0"

-            VALUE "CompanyName", "Miranda\0"

-            VALUE "FileDescription", "Jabber Protocol Plugin for Miranda NG\0"

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", "jabber\0"

-            VALUE "LegalCopyright", "Copyright ( c) 2002-04 Santithorn Bunchua, 2005 George Hazan \0"

-            VALUE "LegalTrademarks", "\0"

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

-            VALUE "PrivateBuild", "\0"

-            VALUE "ProductName", "Jabber Protocol Plugin for Miranda NG\0"

-            VALUE "ProductVersion", __VERSION_STRING

-            VALUE "SpecialBuild", "\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-END

-

-#endif    // !_MAC