diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-21 16:50:10 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-21 16:50:10 +0000 |
| commit | 9147414780abfb4e406bf062561a4b62c76e3c86 (patch) | |
| tree | 93f8280ad910396067022db4eecabeb88e24ced9 /protocols/SkypeWeb/src/skype_poll_processing.cpp | |
| parent | 48266e479d1fcf5153b29c612866845990fccad8 (diff) | |
SkypeWeb: Contact computername in MirVer. Fix duplicate bitness in MirVer.
git-svn-id: http://svn.miranda-ng.org/main/trunk@13735 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeWeb/src/skype_poll_processing.cpp')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_poll_processing.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/protocols/SkypeWeb/src/skype_poll_processing.cpp b/protocols/SkypeWeb/src/skype_poll_processing.cpp index faf073f6e1..09357b7f67 100644 --- a/protocols/SkypeWeb/src/skype_poll_processing.cpp +++ b/protocols/SkypeWeb/src/skype_poll_processing.cpp @@ -30,7 +30,10 @@ void CSkypeProto::ProcessEndpointPresenceRes(JSONNODE *node) return;
//"publicInfo":{"capabilities":"","typ":"11","skypeNameVersion":"0/7.1.0.105//","nodeInfo":"","version":"24"}
+ //"privateInfo": {"epname": "Skype"}
JSONNODE *publicInfo = json_get(node, "publicInfo");
+ JSONNODE *privateInfo = json_get(node, "privateInfo");
+ CMStringA MirVer = "";
if (publicInfo != NULL)
{
ptrA skypeNameVersion(mir_t2a(ptrT(json_as_string(json_get(publicInfo, "skypeNameVersion")))));
@@ -39,7 +42,6 @@ void CSkypeProto::ProcessEndpointPresenceRes(JSONNODE *node) if (typ != NULL)
{
int iTyp = atoi(typ);
- CMStringA MirVer = "";
switch (iTyp)
{
case 17:
@@ -84,11 +86,19 @@ void CSkypeProto::ProcessEndpointPresenceRes(JSONNODE *node) if (iTyp == 125)
MirVer.AppendFormat(" %s", version);
else
- MirVer.AppendFormat(" %s", ParseUrl(skypeNameVersion, "/"));
-
- db_set_s(hContact, m_szModuleName, "MirVer", MirVer);
+ MirVer.AppendFormat(" %s", ParseUrl(skypeNameVersion, "/"));
}
}
+ if (privateInfo != NULL)
+ {
+ ptrA epname(mir_t2a(ptrT(json_as_string(json_get(privateInfo, "epname")))));
+ if (epname != NULL)
+ {
+ MirVer.AppendFormat(" [%s]", epname);
+ }
+ }
+
+ db_set_s(hContact, m_szModuleName, "MirVer", MirVer);
}
void CSkypeProto::ProcessUserPresenceRes(JSONNODE *node)
@@ -142,7 +152,7 @@ void CSkypeProto::ProcessNewMessageRes(JSONNODE *node) void CSkypeProto::ProcessConversationUpdateRes(JSONNODE *node)
{
- JSONNODE *lastMessage = json_get(node, "lastMessage");
+ /*JSONNODE *lastMessage = json_get(node, "lastMessage");
JSONNODE *properties = json_get(node, "properties");
ptrA convLink(mir_t2a(json_as_string(json_get(lastMessage, "conversationLink"))));
@@ -172,7 +182,7 @@ void CSkypeProto::ProcessConversationUpdateRes(JSONNODE *node) //SetSrmmReadStatus(hContact);
}
}
- }
+ }*/
}
void CSkypeProto::ProcessThreadUpdateRes(JSONNODE *node)
|