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