From dd8eb413a02d175573a30bedc01b06e5dad9af9d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 2 May 2015 17:57:25 +0000 Subject: m_version.h removed git-svn-id: http://svn.miranda-ng.org/main/trunk@13383 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/main.cpp | 3 +++ protocols/SkypeWeb/src/requests/capabilities.h | 2 +- protocols/SkypeWeb/src/requests/contacts.h | 4 ++-- protocols/SkypeWeb/src/stdafx.h | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'protocols/SkypeWeb/src') diff --git a/protocols/SkypeWeb/src/main.cpp b/protocols/SkypeWeb/src/main.cpp index 99f2f760cc..f82fb49fc3 100644 --- a/protocols/SkypeWeb/src/main.cpp +++ b/protocols/SkypeWeb/src/main.cpp @@ -22,6 +22,7 @@ XML_API xi; TIME_API tmi = { 0 }; HINSTANCE g_hInstance; CLIST_INTERFACE *pcli; +char g_szMirVer[100]; PLUGININFOEX pluginInfo = { @@ -59,6 +60,8 @@ extern "C" int __declspec(dllexport) Load(void) mir_getXI(&xi); mir_getCLI(); + CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(g_szMirVer), LPARAM(g_szMirVer)); + PROTOCOLDESCRIPTOR pd = { sizeof(pd) }; pd.szName = "SKYPE"; pd.type = PROTOTYPE_PROTOCOL; diff --git a/protocols/SkypeWeb/src/requests/capabilities.h b/protocols/SkypeWeb/src/requests/capabilities.h index 573cec1673..1fe909a962 100644 --- a/protocols/SkypeWeb/src/requests/capabilities.h +++ b/protocols/SkypeWeb/src/requests/capabilities.h @@ -34,7 +34,7 @@ public: #ifdef _WIN64 bitness = 64; #endif - data.AppendFormat("{\"id\":\"messagingService\",\"type\":\"EndpointPresenceDoc\",\"selfLink\":\"uri\",\"privateInfo\":{\"epname\":\"Miranda\"},\"publicInfo\":{\"capabilities\":\"Audio|Video\",\"typ\":125,\"skypeNameVersion\":\"Miranda NG Skype\",\"nodeInfo\":\"xx\",\"version\":\"%s x%d\"}}", MIRANDA_VERSION_STRING, bitness); + data.AppendFormat("{\"id\":\"messagingService\",\"type\":\"EndpointPresenceDoc\",\"selfLink\":\"uri\",\"privateInfo\":{\"epname\":\"Miranda\"},\"publicInfo\":{\"capabilities\":\"Audio|Video\",\"typ\":125,\"skypeNameVersion\":\"Miranda NG Skype\",\"nodeInfo\":\"xx\",\"version\":\"%s x%d\"}}", g_szMirVer, bitness); Body << VALUE(data); diff --git a/protocols/SkypeWeb/src/requests/contacts.h b/protocols/SkypeWeb/src/requests/contacts.h index 83e51fefc0..1d01ae9cc5 100644 --- a/protocols/SkypeWeb/src/requests/contacts.h +++ b/protocols/SkypeWeb/src/requests/contacts.h @@ -136,7 +136,7 @@ public: Body << CHAR_VALUE("reporterIp", "123.123.123.123") //TODO: user ip address - << CHAR_VALUE("uiVersion", MIRANDA_VERSION_STRING); + << CHAR_VALUE("uiVersion", g_szMirVer); } }; @@ -153,7 +153,7 @@ public: Body << CHAR_VALUE("reporterIp", "123.123.123.123") //TODO: user ip address - << CHAR_VALUE("uiVersion", MIRANDA_VERSION_STRING); + << CHAR_VALUE("uiVersion", g_szMirVer); } }; diff --git a/protocols/SkypeWeb/src/stdafx.h b/protocols/SkypeWeb/src/stdafx.h index fbe0b7ff5e..63b16f163e 100644 --- a/protocols/SkypeWeb/src/stdafx.h +++ b/protocols/SkypeWeb/src/stdafx.h @@ -52,7 +52,6 @@ along with this program. If not, see . #include #include #include -#include #include #include #include @@ -61,6 +60,9 @@ along with this program. If not, see . struct CSkypeProto; +extern HINSTANCE g_hInstance; +extern char g_szMirVer[]; + #define SKYPE_ENDPOINTS_HOST "client-s.gateway.messenger.live.com" #include "version.h" @@ -87,8 +89,6 @@ struct CSkypeProto; #include "request_queue.h" #include "skype_proto.h" -extern HINSTANCE g_hInstance; - #define MODULE "Skype" #define SKYPE_MAX_CONNECT_RETRIES 10 -- cgit v1.2.3