project cleanup

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

8 files changed, 80 insertions, 127 deletions

diff --git a/protocols/FacebookRM/facebook_10.vcxproj b/protocols/FacebookRM/facebook_10.vcxproj
index fd87696e97..ca1be400f0 100644
--- a/protocols/FacebookRM/facebook_10.vcxproj
+++ b/protocols/FacebookRM/facebook_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FACEBOOK_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -83,7 +83,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -98,7 +98,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;FACEBOOK_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>false</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -106,7 +106,7 @@
       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -122,7 +122,7 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FACEBOOK_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -131,7 +131,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -150,7 +150,7 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;FACEBOOK_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -159,7 +159,7 @@
       <FloatingPointModel>Strict</FloatingPointModel>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -181,7 +181,6 @@
     <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\stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

@@ -217,15 +216,6 @@
     <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

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

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

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

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

-    <None Include="res\feeds.ico" />

-    <None Include="res\friends.ico" />

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

-    <None Include="res\notification.ico" />

-    <None Include="res\poke.ico" />

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

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

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

@@ -234,6 +224,17 @@
     <ResourceCompile Include="res\facebook.rc" />

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

   </ItemGroup>

+  <ItemGroup>

+    <Image Include="res\auth_ask.ico" />

+    <Image Include="res\auth_grant.ico" />

+    <Image Include="res\auth_revoke.ico" />

+    <Image Include="res\facebook.ico" />

+    <Image Include="res\feeds.ico" />

+    <Image Include="res\friends.ico" />

+    <Image Include="res\mind.ico" />

+    <Image Include="res\notification.ico" />

+    <Image Include="res\poke.ico" />

+  </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/protocols/FacebookRM/facebook_10.vcxproj.filters b/protocols/FacebookRM/facebook_10.vcxproj.filters
index ec6ff2eff2..7fb81574b1 100644
--- a/protocols/FacebookRM/facebook_10.vcxproj.filters
+++ b/protocols/FacebookRM/facebook_10.vcxproj.filters
@@ -16,6 +16,9 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

     </Filter>

+    <Filter Include="Resource Files\Icons">

+      <UniqueIdentifier>{4cbdc49c-f233-4d62-9c62-0cc8d034e377}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

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

@@ -36,9 +39,6 @@
     <ClCompile Include="src\events.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -122,15 +122,15 @@
     <ClInclude Include="src\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Resource Files</Filter>

-    </ClInclude>

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

       <Filter>Header Files</Filter>

     </ClInclude>

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

       <Filter>Header Files</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

@@ -142,33 +142,6 @@
     <None Include="src\JSON_CAJUN\writer.inl">

       <Filter>Source Files\JSON_CAJUN</Filter>

     </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\poke.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\notification.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\feeds.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\friends.ico">

-      <Filter>Resource Files</Filter>

-    </None>

   </ItemGroup>

   <ItemGroup>

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

@@ -178,4 +151,33 @@
       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

+  <ItemGroup>

+    <Image Include="res\auth_ask.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\auth_grant.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\auth_revoke.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\facebook.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\feeds.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\friends.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\mind.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\notification.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+    <Image Include="res\poke.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </Image>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/FacebookRM/facebook_11.vcxproj b/protocols/FacebookRM/facebook_11.vcxproj
index da8ef7aa4e..0431236957 100644
--- a/protocols/FacebookRM/facebook_11.vcxproj
+++ b/protocols/FacebookRM/facebook_11.vcxproj
@@ -77,7 +77,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FACEBOOK_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -87,7 +87,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -103,7 +103,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;FACEBOOK_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>false</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -111,7 +111,7 @@
       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -127,7 +127,7 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FACEBOOK_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -136,7 +136,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -154,7 +154,7 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;FACEBOOK_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -163,7 +163,7 @@
       <FloatingPointModel>Strict</FloatingPointModel>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

@@ -184,7 +184,6 @@
     <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\stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

diff --git a/protocols/FacebookRM/facebook_11.vcxproj.filters b/protocols/FacebookRM/facebook_11.vcxproj.filters
index 855f59be05..7fb81574b1 100644
--- a/protocols/FacebookRM/facebook_11.vcxproj.filters
+++ b/protocols/FacebookRM/facebook_11.vcxproj.filters
@@ -16,6 +16,9 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

     </Filter>

+    <Filter Include="Resource Files\Icons">

+      <UniqueIdentifier>{4cbdc49c-f233-4d62-9c62-0cc8d034e377}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

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

@@ -36,9 +39,6 @@
     <ClCompile Include="src\events.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -153,31 +153,31 @@
   </ItemGroup>

   <ItemGroup>

     <Image Include="res\auth_ask.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

     <Image Include="res\auth_grant.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

     <Image Include="res\auth_revoke.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

     <Image Include="res\facebook.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

     <Image Include="res\feeds.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

     <Image Include="res\friends.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

     <Image Include="res\mind.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

     <Image Include="res\notification.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

     <Image Include="res\poke.ico">

-      <Filter>Resource Files</Filter>

+      <Filter>Resource Files\Icons</Filter>

     </Image>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h
index 2abb3a3cc0..f78c4cb437 100644
--- a/protocols/FacebookRM/src/common.h
+++ b/protocols/FacebookRM/src/common.h
@@ -22,43 +22,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #pragma once

 

-//#pragma warning(push)

-//#pragma warning(disable:4312)

 #pragma warning(disable:4996)

 

-#define MIRANDA_VER    0x0A00

 #define _WIN32_WINNT   0x0500

 #define _WIN32_WINDOWS 0x0500

 

-#include <string>

 #include <sstream>

 #include <fstream>

-#include <list>

 #include <map>

 #include <vector>

 #include <set>

-#include <algorithm>

 

-#include <stdarg.h>

+#include <windows.h>

 #include <time.h>

-#include <assert.h>

-#include <io.h>

 

-#include <windows.h>

 #include <win2k.h>

-#include <commctrl.h>

-

 #include <newpluginapi.h>

-#include <m_system.h>

-#include <m_system_cpp.h>

 #include <m_avatars.h>

-#include <m_button.h>

 #include <m_chat.h>

-#include <m_clist.h>

 #include <m_clistint.h>

-#include <m_clui.h>

 #include <m_database.h>

-#include <m_history.h>

 #include <m_idle.h>

 #include <m_ignore.h>

 #include <m_langpack.h>

@@ -66,22 +49,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_netlib.h>

 #include <m_options.h>

 #include <m_popup.h>

-#include <m_protocols.h>

 #include <m_protosvc.h>

 #include <m_protoint.h>

 #include <m_protomod.h>

 #include <m_skin.h>

-#include <statusmodes.h>

-#include <m_userinfo.h>

 #include <m_icolib.h>

-#include <m_utils.h>

 #include <m_hotkeys.h>

+

 #include <m_folders.h>

 #include <m_smileyadd.h>

 #include <m_toptoolbar.h>

 

-#include "version.h"

-

 class FacebookProto;

 

 #include "definitions.h"

@@ -98,6 +76,7 @@ class FacebookProto;
 #include "dialogs.h"

 #include "theme.h"

 #include "resource.h"

+#include "version.h"

 

 extern HINSTANCE g_hInstance;

 extern std::string g_strUserAgent;

diff --git a/protocols/FacebookRM/src/http.cpp b/protocols/FacebookRM/src/http.cpp
deleted file mode 100644
index 49462fb7eb..0000000000
--- a/protocols/FacebookRM/src/http.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*

-

-Facebook plugin for Miranda Instant Messenger

-_____________________________________________

-

-Copyright © 2009-11 Michal Zelinka, 2011-13 Robert Pösel

-

-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, see <http://www.gnu.org/licenses/>.

-

-*/

-

-#include "common.h"

diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp
index 564bc195ae..f22ce7b0d0 100644
--- a/protocols/FacebookRM/src/main.cpp
+++ b/protocols/FacebookRM/src/main.cpp
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "common.h"

-#include "version.h" 

 

 // TODO: Make following as "globals" structure?

 

@@ -43,7 +42,7 @@ PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {8432B009-FF32-4727-AAE6-A9035038FD58}

-	{ 0x8432b009, 0xff32, 0x4727, { 0xaa, 0xe6, 0xa9, 0x3, 0x50, 0x38, 0xfd, 0x58 } }

+	{0x8432b009, 0xff32, 0x4727, {0xaa, 0xe6, 0xa9, 0x3, 0x50, 0x38, 0xfd, 0x58}}

 };

 

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

diff --git a/protocols/FacebookRM/src/version.h b/protocols/FacebookRM/src/version.h
index c35c72fd48..223710daa2 100644
--- a/protocols/FacebookRM/src/version.h
+++ b/protocols/FacebookRM/src/version.h
@@ -4,14 +4,10 @@
 #define __BUILD_NUM					0

 

 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

-#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

-

-#define __STRINGIFY_IMPL(x)			#x

-#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

-#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

+#define __TOSTRING(x)			#x

+#define __VERSION_STRING		__TOSTRING(__FILEVERSION_STRING)

 

 #define __PLUGIN_NAME				"Facebook RM"

-#define __INTERNAL_NAME				"Facebook RM"

 #define __FILENAME					"Facebook.dll"

 #define __DESCRIPTION 				"Facebook protocol support for Miranda NG."

 #define __AUTHOR					"Michal Zelinka, Robert P\xf6" "sel"