1 files changed, 80 insertions, 138 deletions
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">