6 files changed, 2 insertions, 31 deletions
diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 7d0dfaa86f..3b9f97d235 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -47,7 +47,7 @@ http::response facebook_client::sendRequest(HttpRequest *request)
 
 	request->AddHeader("Accept-Language", "en,en-US;q=0.9");
 	request->AddHeader("Accept", "*/*");
-	request->AddHeader("User-Agent", g_strUserAgent.c_str());
+	request->AddHeader("User-Agent", Netlib_GetUserAgent());
 	request->AddHeader("Cookie", ptrA(load_cookies())); // FIXME: Rework load_cookies to not do strdup
 
 	if (request->requestType == REQUEST_POST)
diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp
index b309767406..bf80befe1c 100644
--- a/protocols/FacebookRM/src/main.cpp
+++ b/protocols/FacebookRM/src/main.cpp
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 CMPlugin g_plugin;
 
-std::string g_strUserAgent;
 DWORD g_mirandaVersion;
 bool g_bMessageState;
 HWND g_hwndHeartbeat;
@@ -75,12 +74,8 @@ int CMPlugin::Load()
 	InitIcons();
 	InitContactMenus();
 
-	// Init native User-Agent
-	g_strUserAgent = "Mozilla/5.0 (Windows NT 5.1; rv:52.0) Gecko/20100101 Firefox/52.0";
-
 	// Initialize random generator (used only as fallback in utils)
 	srand(::time(0));
-
 	return 0;
 }
 
diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h
index 3a96f387de..75241dfa99 100644
--- a/protocols/FacebookRM/src/stdafx.h
+++ b/protocols/FacebookRM/src/stdafx.h
@@ -79,7 +79,6 @@ class FacebookProto;
 #include "resource.h"
 #include "version.h"
 
-extern std::string g_strUserAgent;
 extern DWORD g_mirandaVersion;
 extern bool g_bMessageState;
 extern HWND g_hwndHeartbeat;
diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp
index d8100fbabe..4a78b38615 100644
--- a/protocols/Omegle/src/communication.cpp
+++ b/protocols/Omegle/src/communication.cpp
@@ -267,7 +267,7 @@ NETLIBHTTPHEADER* Omegle_client::get_request_headers(int request_type, int* head
 	}
 
 	headers[2].szName = "User-Agent";
-	headers[2].szValue = (char *)g_strUserAgent.c_str();
+	headers[2].szValue = Netlib_GetUserAgent();
 	headers[1].szName = "Accept";
 	headers[1].szValue = "*/*";
 	headers[0].szName = "Accept-Language";
diff --git a/protocols/Omegle/src/main.cpp b/protocols/Omegle/src/main.cpp
index 197a932188..1a520f222c 100644
--- a/protocols/Omegle/src/main.cpp
+++ b/protocols/Omegle/src/main.cpp
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 CMPlugin g_plugin;
 
-std::string g_strUserAgent;
 DWORD g_mirandaVersion;
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -61,26 +60,5 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
 int CMPlugin::Load()
 {
 	InitIcons();
-
-	// Init native User-Agent
-	{
-		std::stringstream agent;
-		agent << "Miranda NG/";
-		agent << ((g_mirandaVersion >> 24) & 0xFF);
-		agent << ".";
-		agent << ((g_mirandaVersion >> 16) & 0xFF);
-		agent << ".";
-		agent << ((g_mirandaVersion >> 8) & 0xFF);
-		agent << ".";
-		agent << ((g_mirandaVersion)& 0xFF);
-#ifdef _WIN64
-		agent << " Omegle Protocol x64/";
-#else
-		agent << " Omegle Protocol/";
-#endif
-		agent << __VERSION_STRING_DOTS;
-		g_strUserAgent = agent.str();
-	}
-
 	return 0;
 }
diff --git a/protocols/Omegle/src/stdafx.h b/protocols/Omegle/src/stdafx.h
index 4ce85fe8a5..a768ac0efa 100644
--- a/protocols/Omegle/src/stdafx.h
+++ b/protocols/Omegle/src/stdafx.h
@@ -74,7 +74,6 @@ class OmegleProto;
 #include "theme.h"
 #include "resource.h"
 
-extern std::string g_strUserAgent;
 extern DWORD g_mirandaVersion;
 
 class ScopedLock