FacebookRM: folders restructurization

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

59 files changed, 91 insertions, 112 deletions

diff --git a/protocols/FacebookRM/_changelog.txt b/protocols/FacebookRM/docs/_changelog.txt
index 556d59a9e2..556d59a9e2 100644
--- a/protocols/FacebookRM/_changelog.txt
+++ b/protocols/FacebookRM/docs/_changelog.txt
diff --git a/protocols/FacebookRM/facebookrm-translation.txt b/protocols/FacebookRM/docs/facebookrm-translation.txt
index 2cd4ad13fa..2cd4ad13fa 100644
--- a/protocols/FacebookRM/facebookrm-translation.txt
+++ b/protocols/FacebookRM/docs/facebookrm-translation.txt
diff --git a/protocols/FacebookRM/facebook_10.vcxproj b/protocols/FacebookRM/facebook_10.vcxproj
index 391d66e090..cee488a485 100644
--- a/protocols/FacebookRM/facebook_10.vcxproj
+++ b/protocols/FacebookRM/facebook_10.vcxproj
@@ -174,58 +174,53 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

-    <ClCompile Include="main.cpp">

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

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

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

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

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

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

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="JSON_CAJUN\elements.h" />

-    <ClInclude Include="JSON_CAJUN\reader.h" />

-    <ClInclude Include="JSON_CAJUN\visitor.h" />

-    <ClInclude Include="JSON_CAJUN\writer.h" />

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

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

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

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

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

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

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

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

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

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

-    <ClInclude Include="list.hpp" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+    <ClInclude Include="src\list.hpp" />

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

-    <None Include="JSON_CAJUN\elements.inl" />

-    <None Include="JSON_CAJUN\reader.inl" />

-    <None Include="JSON_CAJUN\writer.inl" />

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

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

+    <None Include="src\JSON_CAJUN\elements.inl" />

+    <None Include="src\JSON_CAJUN\reader.inl" />

+    <None Include="src\JSON_CAJUN\writer.inl" />

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/FacebookRM/facebook_10.vcxproj.filters b/protocols/FacebookRM/facebook_10.vcxproj.filters
index 5ddb449d60..9804b4d105 100644
--- a/protocols/FacebookRM/facebook_10.vcxproj.filters
+++ b/protocols/FacebookRM/facebook_10.vcxproj.filters
@@ -18,142 +18,127 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="avatars.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="communication.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="connection.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="contacts.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dialogs.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="events.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="http.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="json.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="messages.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="process.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="proto.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="stubs.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="theme.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="chat.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="JSON_CAJUN\elements.h">

+    <ClInclude Include="src\JSON_CAJUN\elements.h">

       <Filter>Source Files\JSON_CAJUN</Filter>

     </ClInclude>

-    <ClInclude Include="JSON_CAJUN\reader.h">

+    <ClInclude Include="src\JSON_CAJUN\reader.h">

       <Filter>Source Files\JSON_CAJUN</Filter>

     </ClInclude>

-    <ClInclude Include="JSON_CAJUN\visitor.h">

+    <ClInclude Include="src\JSON_CAJUN\visitor.h">

       <Filter>Source Files\JSON_CAJUN</Filter>

     </ClInclude>

-    <ClInclude Include="JSON_CAJUN\writer.h">

+    <ClInclude Include="src\JSON_CAJUN\writer.h">

       <Filter>Source Files\JSON_CAJUN</Filter>

     </ClInclude>

-    <ClInclude Include="avatars.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="client.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="common.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="constants.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="db.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="definitions.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="dialogs.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="entities.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="http.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="json.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="list.hpp">

+    <ClInclude Include="src\list.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="proto.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Resource Files</Filter>

     </ClInclude>

-    <ClInclude Include="theme.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="JSON_CAJUN\elements.inl">

+    <None Include="src\JSON_CAJUN\elements.inl">

       <Filter>Source Files\JSON_CAJUN</Filter>

     </None>

-    <None Include="JSON_CAJUN\reader.inl">

+    <None Include="src\JSON_CAJUN\reader.inl">

       <Filter>Source Files\JSON_CAJUN</Filter>

     </None>

-    <None Include="JSON_CAJUN\writer.inl">

+    <None Include="src\JSON_CAJUN\writer.inl">

       <Filter>Source Files\JSON_CAJUN</Filter>

     </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="facebook.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/FacebookRM/proto_facebook/Proto_Facebook.vcxproj b/protocols/FacebookRM/proto_facebook/Proto_Facebook.vcxproj
index 828e4b103b..ad1fa421f6 100644
--- a/protocols/FacebookRM/proto_facebook/Proto_Facebook.vcxproj
+++ b/protocols/FacebookRM/proto_facebook/Proto_Facebook.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/FacebookRM/proto_facebook/Proto_Facebook.vcxproj.filters b/protocols/FacebookRM/proto_facebook/Proto_Facebook.vcxproj.filters
index 7f974f3b64..5714490d48 100644
--- a/protocols/FacebookRM/proto_facebook/Proto_Facebook.vcxproj.filters
+++ b/protocols/FacebookRM/proto_facebook/Proto_Facebook.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_Facebook.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/FacebookRM/proto_facebook/icos/Away.ico b/protocols/FacebookRM/proto_facebook/res/Away.ico
index b9a6ec6a56..b9a6ec6a56 100644
--- a/protocols/FacebookRM/proto_facebook/icos/Away.ico
+++ b/protocols/FacebookRM/proto_facebook/res/Away.ico
diff --git a/protocols/FacebookRM/proto_facebook/icos/Invisible.ico b/protocols/FacebookRM/proto_facebook/res/Invisible.ico
index a7701bfcc5..a7701bfcc5 100644
--- a/protocols/FacebookRM/proto_facebook/icos/Invisible.ico
+++ b/protocols/FacebookRM/proto_facebook/res/Invisible.ico
diff --git a/protocols/FacebookRM/proto_facebook/icos/Offline.ico b/protocols/FacebookRM/proto_facebook/res/Offline.ico
index 6d85ce327f..6d85ce327f 100644
--- a/protocols/FacebookRM/proto_facebook/icos/Offline.ico
+++ b/protocols/FacebookRM/proto_facebook/res/Offline.ico
diff --git a/protocols/FacebookRM/proto_facebook/icos/Online.ico b/protocols/FacebookRM/proto_facebook/res/Online.ico
index 4edd04635f..4edd04635f 100644
--- a/protocols/FacebookRM/proto_facebook/icos/Online.ico
+++ b/protocols/FacebookRM/proto_facebook/res/Online.ico
diff --git a/protocols/FacebookRM/proto_facebook/icos/Phone.ico b/protocols/FacebookRM/proto_facebook/res/Phone.ico
index 2bbc47a74b..2bbc47a74b 100644
--- a/protocols/FacebookRM/proto_facebook/icos/Phone.ico
+++ b/protocols/FacebookRM/proto_facebook/res/Phone.ico
diff --git a/protocols/FacebookRM/proto_facebook/Proto_Facebook.rc b/protocols/FacebookRM/proto_facebook/res/Proto_Facebook.rc
index 0d444ed874..b3da1612cd 100644
--- a/protocols/FacebookRM/proto_facebook/Proto_Facebook.rc
+++ b/protocols/FacebookRM/proto_facebook/res/Proto_Facebook.rc
diff --git a/protocols/FacebookRM/proto_facebook/resource.h b/protocols/FacebookRM/proto_facebook/src/resource.h
index 30db08e292..30db08e292 100644
--- a/protocols/FacebookRM/proto_facebook/resource.h
+++ b/protocols/FacebookRM/proto_facebook/src/resource.h
diff --git a/protocols/FacebookRM/icons/auth_ask.ico b/protocols/FacebookRM/res/auth_ask.ico
index 1db6f7f23e..1db6f7f23e 100644
--- a/protocols/FacebookRM/icons/auth_ask.ico
+++ b/protocols/FacebookRM/res/auth_ask.ico
diff --git a/protocols/FacebookRM/icons/auth_grant.ico b/protocols/FacebookRM/res/auth_grant.ico
index 44d5b29a31..44d5b29a31 100644
--- a/protocols/FacebookRM/icons/auth_grant.ico
+++ b/protocols/FacebookRM/res/auth_grant.ico
diff --git a/protocols/FacebookRM/icons/auth_revoke.ico b/protocols/FacebookRM/res/auth_revoke.ico
index e483681727..e483681727 100644
--- a/protocols/FacebookRM/icons/auth_revoke.ico
+++ b/protocols/FacebookRM/res/auth_revoke.ico
diff --git a/protocols/FacebookRM/icons/facebook.ico b/protocols/FacebookRM/res/facebook.ico
index c57c0342fa..c57c0342fa 100644
--- a/protocols/FacebookRM/icons/facebook.ico
+++ b/protocols/FacebookRM/res/facebook.ico
diff --git a/protocols/FacebookRM/facebook.rc b/protocols/FacebookRM/res/facebook.rc
index e8be07eff0..7659ac4613 100644
--- a/protocols/FacebookRM/facebook.rc
+++ b/protocols/FacebookRM/res/facebook.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 "afxres.h"

-#include "constants.h"

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

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

 #undef APSTUDIO_READONLY_SYMBOLS

 

@@ -27,13 +27,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

 BEGIN

     "#include ""afxres.h""\r\n"

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

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

 END

 

 3 TEXTINCLUDE 

@@ -51,11 +51,11 @@ END
 

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

 // remains consistent on all systems.

-IDI_FACEBOOK            ICON                    "icons/facebook.ico"

-IDI_MIND                ICON                    "icons/mind.ico"

-IDI_AUTH_GRANT          ICON                    "icons/auth_grant.ico"

-IDI_AUTH_ASK            ICON                    "icons/auth_ask.ico"

-IDI_AUTH_REVOKE         ICON                    "icons/auth_revoke.ico"

+IDI_FACEBOOK            ICON                    "facebook.ico"

+IDI_MIND                ICON                    "mind.ico"

+IDI_AUTH_GRANT          ICON                    "auth_grant.ico"

+IDI_AUTH_ASK            ICON                    "auth_ask.ico"

+IDI_AUTH_REVOKE         ICON                    "auth_revoke.ico"

 

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

 //

diff --git a/protocols/FacebookRM/icons/mind.ico b/protocols/FacebookRM/res/mind.ico
index f158842429..f158842429 100644
--- a/protocols/FacebookRM/icons/mind.ico
+++ b/protocols/FacebookRM/res/mind.ico
diff --git a/protocols/FacebookRM/JSON_CAJUN/Readme.txt b/protocols/FacebookRM/src/JSON_CAJUN/Readme.txt
index 8b9505cebf..8b9505cebf 100644
--- a/protocols/FacebookRM/JSON_CAJUN/Readme.txt
+++ b/protocols/FacebookRM/src/JSON_CAJUN/Readme.txt
diff --git a/protocols/FacebookRM/JSON_CAJUN/ReleaseNotes.txt b/protocols/FacebookRM/src/JSON_CAJUN/ReleaseNotes.txt
index 8e43b6f928..8e43b6f928 100644
--- a/protocols/FacebookRM/JSON_CAJUN/ReleaseNotes.txt
+++ b/protocols/FacebookRM/src/JSON_CAJUN/ReleaseNotes.txt
diff --git a/protocols/FacebookRM/JSON_CAJUN/elements.h b/protocols/FacebookRM/src/JSON_CAJUN/elements.h
index f255dcd9a5..f255dcd9a5 100644
--- a/protocols/FacebookRM/JSON_CAJUN/elements.h
+++ b/protocols/FacebookRM/src/JSON_CAJUN/elements.h
diff --git a/protocols/FacebookRM/JSON_CAJUN/elements.inl b/protocols/FacebookRM/src/JSON_CAJUN/elements.inl
index 7febabc3a2..7febabc3a2 100644
--- a/protocols/FacebookRM/JSON_CAJUN/elements.inl
+++ b/protocols/FacebookRM/src/JSON_CAJUN/elements.inl
diff --git a/protocols/FacebookRM/JSON_CAJUN/reader.h b/protocols/FacebookRM/src/JSON_CAJUN/reader.h
index 2f576c752e..2f576c752e 100644
--- a/protocols/FacebookRM/JSON_CAJUN/reader.h
+++ b/protocols/FacebookRM/src/JSON_CAJUN/reader.h
diff --git a/protocols/FacebookRM/JSON_CAJUN/reader.inl b/protocols/FacebookRM/src/JSON_CAJUN/reader.inl
index 26339497a0..26339497a0 100644
--- a/protocols/FacebookRM/JSON_CAJUN/reader.inl
+++ b/protocols/FacebookRM/src/JSON_CAJUN/reader.inl
diff --git a/protocols/FacebookRM/JSON_CAJUN/visitor.h b/protocols/FacebookRM/src/JSON_CAJUN/visitor.h
index 8a28d7a64a..8a28d7a64a 100644
--- a/protocols/FacebookRM/JSON_CAJUN/visitor.h
+++ b/protocols/FacebookRM/src/JSON_CAJUN/visitor.h
diff --git a/protocols/FacebookRM/JSON_CAJUN/writer.h b/protocols/FacebookRM/src/JSON_CAJUN/writer.h
index c364bcb289..c364bcb289 100644
--- a/protocols/FacebookRM/JSON_CAJUN/writer.h
+++ b/protocols/FacebookRM/src/JSON_CAJUN/writer.h
diff --git a/protocols/FacebookRM/JSON_CAJUN/writer.inl b/protocols/FacebookRM/src/JSON_CAJUN/writer.inl
index eeb3db94b9..eeb3db94b9 100644
--- a/protocols/FacebookRM/JSON_CAJUN/writer.inl
+++ b/protocols/FacebookRM/src/JSON_CAJUN/writer.inl
diff --git a/protocols/FacebookRM/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp
index 2239843ef6..2239843ef6 100644
--- a/protocols/FacebookRM/avatars.cpp
+++ b/protocols/FacebookRM/src/avatars.cpp
diff --git a/protocols/FacebookRM/avatars.h b/protocols/FacebookRM/src/avatars.h
index 18f8e1c100..18f8e1c100 100644
--- a/protocols/FacebookRM/avatars.h
+++ b/protocols/FacebookRM/src/avatars.h
diff --git a/protocols/FacebookRM/chat.cpp b/protocols/FacebookRM/src/chat.cpp
index db50207076..db50207076 100644
--- a/protocols/FacebookRM/chat.cpp
+++ b/protocols/FacebookRM/src/chat.cpp
diff --git a/protocols/FacebookRM/client.h b/protocols/FacebookRM/src/client.h
index d11cf0ab55..d11cf0ab55 100644
--- a/protocols/FacebookRM/client.h
+++ b/protocols/FacebookRM/src/client.h
diff --git a/protocols/FacebookRM/common.h b/protocols/FacebookRM/src/common.h
index 193cf9d849..3df0e046d0 100644
--- a/protocols/FacebookRM/common.h
+++ b/protocols/FacebookRM/src/common.h
@@ -50,7 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <commctrl.h>

 

 #include <newpluginapi.h>

-#include <m_version.h>

 #include <m_system.h>

 #include <m_system_cpp.h>

 #include <m_avatars.h>

diff --git a/protocols/FacebookRM/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 7aa116d653..7aa116d653 100644
--- a/protocols/FacebookRM/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
diff --git a/protocols/FacebookRM/connection.cpp b/protocols/FacebookRM/src/connection.cpp
index d041e0344f..d041e0344f 100644
--- a/protocols/FacebookRM/connection.cpp
+++ b/protocols/FacebookRM/src/connection.cpp
diff --git a/protocols/FacebookRM/constants.h b/protocols/FacebookRM/src/constants.h
index 30f65b9df3..30f65b9df3 100644
--- a/protocols/FacebookRM/constants.h
+++ b/protocols/FacebookRM/src/constants.h
diff --git a/protocols/FacebookRM/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index 9e6c6abfa0..9e6c6abfa0 100644
--- a/protocols/FacebookRM/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
diff --git a/protocols/FacebookRM/db.h b/protocols/FacebookRM/src/db.h
index 74233f54f2..74233f54f2 100644
--- a/protocols/FacebookRM/db.h
+++ b/protocols/FacebookRM/src/db.h
diff --git a/protocols/FacebookRM/definitions.h b/protocols/FacebookRM/src/definitions.h
index 94efdb128b..94efdb128b 100644
--- a/protocols/FacebookRM/definitions.h
+++ b/protocols/FacebookRM/src/definitions.h
diff --git a/protocols/FacebookRM/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp
index 935005ab2c..935005ab2c 100644
--- a/protocols/FacebookRM/dialogs.cpp
+++ b/protocols/FacebookRM/src/dialogs.cpp
diff --git a/protocols/FacebookRM/dialogs.h b/protocols/FacebookRM/src/dialogs.h
index 1917027546..1917027546 100644
--- a/protocols/FacebookRM/dialogs.h
+++ b/protocols/FacebookRM/src/dialogs.h
diff --git a/protocols/FacebookRM/entities.h b/protocols/FacebookRM/src/entities.h
index c551e1ac53..c551e1ac53 100644
--- a/protocols/FacebookRM/entities.h
+++ b/protocols/FacebookRM/src/entities.h
diff --git a/protocols/FacebookRM/events.cpp b/protocols/FacebookRM/src/events.cpp
index 5d01df88df..5d01df88df 100644
--- a/protocols/FacebookRM/events.cpp
+++ b/protocols/FacebookRM/src/events.cpp
diff --git a/protocols/FacebookRM/http.cpp b/protocols/FacebookRM/src/http.cpp
index 853e6b8c2f..853e6b8c2f 100644
--- a/protocols/FacebookRM/http.cpp
+++ b/protocols/FacebookRM/src/http.cpp
diff --git a/protocols/FacebookRM/http.h b/protocols/FacebookRM/src/http.h
index 1dd4174549..1dd4174549 100644
--- a/protocols/FacebookRM/http.h
+++ b/protocols/FacebookRM/src/http.h
diff --git a/protocols/FacebookRM/json.cpp b/protocols/FacebookRM/src/json.cpp
index e79c6966cd..e79c6966cd 100644
--- a/protocols/FacebookRM/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
diff --git a/protocols/FacebookRM/json.h b/protocols/FacebookRM/src/json.h
index c83e1ef4f6..c83e1ef4f6 100644
--- a/protocols/FacebookRM/json.h
+++ b/protocols/FacebookRM/src/json.h
diff --git a/protocols/FacebookRM/list.hpp b/protocols/FacebookRM/src/list.hpp
index 7a26aec1ec..7a26aec1ec 100644
--- a/protocols/FacebookRM/list.hpp
+++ b/protocols/FacebookRM/src/list.hpp
diff --git a/protocols/FacebookRM/main.cpp b/protocols/FacebookRM/src/main.cpp
index 5928b85499..5928b85499 100644
--- a/protocols/FacebookRM/main.cpp
+++ b/protocols/FacebookRM/src/main.cpp
diff --git a/protocols/FacebookRM/messages.cpp b/protocols/FacebookRM/src/messages.cpp
index 8b27b4721f..8b27b4721f 100644
--- a/protocols/FacebookRM/messages.cpp
+++ b/protocols/FacebookRM/src/messages.cpp
diff --git a/protocols/FacebookRM/process.cpp b/protocols/FacebookRM/src/process.cpp
index 0acff0f36f..0acff0f36f 100644
--- a/protocols/FacebookRM/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
diff --git a/protocols/FacebookRM/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index c2d7a39151..c2d7a39151 100644
--- a/protocols/FacebookRM/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
diff --git a/protocols/FacebookRM/proto.h b/protocols/FacebookRM/src/proto.h
index cdeeaf03f6..cdeeaf03f6 100644
--- a/protocols/FacebookRM/proto.h
+++ b/protocols/FacebookRM/src/proto.h
diff --git a/protocols/FacebookRM/resource.h b/protocols/FacebookRM/src/resource.h
index 887119bd4b..887119bd4b 100644
--- a/protocols/FacebookRM/resource.h
+++ b/protocols/FacebookRM/src/resource.h
diff --git a/protocols/FacebookRM/stubs.cpp b/protocols/FacebookRM/src/stubs.cpp
index 25d3f45252..25d3f45252 100644
--- a/protocols/FacebookRM/stubs.cpp
+++ b/protocols/FacebookRM/src/stubs.cpp
diff --git a/protocols/FacebookRM/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index 1fdbeace0b..1fdbeace0b 100644
--- a/protocols/FacebookRM/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
diff --git a/protocols/FacebookRM/theme.h b/protocols/FacebookRM/src/theme.h
index 4071fc0669..4071fc0669 100644
--- a/protocols/FacebookRM/theme.h
+++ b/protocols/FacebookRM/src/theme.h
diff --git a/protocols/FacebookRM/utils.cpp b/protocols/FacebookRM/src/utils.cpp
index 8e33b26e01..8e33b26e01 100644
--- a/protocols/FacebookRM/utils.cpp
+++ b/protocols/FacebookRM/src/utils.cpp
diff --git a/protocols/FacebookRM/utils.h b/protocols/FacebookRM/src/utils.h
index 75712d6a2d..75712d6a2d 100644
--- a/protocols/FacebookRM/utils.h
+++ b/protocols/FacebookRM/src/utils.h