diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-10 17:57:04 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-10 17:57:04 +0000 |
| commit | 49a61ca4089823618d54965d24ce32f13e3b753f (patch) | |
| tree | 393f2374674f7bd389d59209b6e08607b6cb1876 /protocols/SkypeWeb | |
| parent | fb2153343180082ffb144eb2585e20bcf25351eb (diff) | |
SkypeWeb: AuthRequest greeting fix. Cleanup.
git-svn-id: http://svn.miranda-ng.org/main/trunk@13512 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeWeb')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_contacts.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_search.cpp | 63 |
3 files changed, 3 insertions, 66 deletions
diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp index f7c2e9271b..6829078a66 100644 --- a/protocols/SkypeWeb/src/skype_contacts.cpp +++ b/protocols/SkypeWeb/src/skype_contacts.cpp @@ -137,8 +137,8 @@ void CSkypeProto::LoadContactsAuth(const NETLIBHTTPREQUEST *response) ptrT eventTimeStr(json_as_string(node));
time_t eventTime = IsoToUnixTime(eventTimeStr);
- if (reason == "null")
- reason.Empty();
+ //if (reason == "null")
+ // reason.Empty();
MCONTACT hContact = AddContact(skypename);
if (hContact)
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 0761a652ce..3c58c27066 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -168,7 +168,7 @@ int CSkypeProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *szMessage) ptrA token(getStringA("TokenSecret"));
ptrA skypename(getStringA(hContact, SKYPE_SETTINGS_ID));
- PushRequest(new AddContactRequest(token, skypename, ptrA(mir_t2a(szMessage))));
+ PushRequest(new AddContactRequest(token, skypename, ptrA(mir_utf8encodeT(szMessage))));
return 0;
}
diff --git a/protocols/SkypeWeb/src/skype_search.cpp b/protocols/SkypeWeb/src/skype_search.cpp index 4f5d48ab95..c3e5c35655 100644 --- a/protocols/SkypeWeb/src/skype_search.cpp +++ b/protocols/SkypeWeb/src/skype_search.cpp @@ -74,67 +74,4 @@ void CSkypeProto::OnSearch(const NETLIBHTTPREQUEST *response) }
json_free(items);
ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)1, 0);
-
- /*JSONROOT pRoot;
- JSONNODE *pResponse = CheckJsonResponse(pReq, reply, pRoot);
- if (pResponse == NULL) {
- if (pParam) {
- mir_free(pParam->pszFirstName);
- mir_free(pParam->pszLastName);
- mir_free(pParam->pszNick);
- delete pParam;
- }
- ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)1, 0);
- return;
- }
-
- int iCount = json_as_int(json_get(pResponse, "count"));
- JSONNODE *pItems = json_get(pResponse, "items");
- if (!pItems) {
- pItems = pResponse;
- iCount = 1;
- }
-
- for (int i = 0; i<iCount; i++) {
- JSONNODE *pRecord = json_at(pItems, i);
- if (pRecord == NULL)
- break;
-
- PROTOSEARCHRESULT psr = { sizeof(psr) };
- psr.flags = PSR_TCHAR;
-
- ptrT pId(json_as_string(json_get(pRecord, "id")));
- ptrT pFirstName(json_as_string(json_get(pRecord, "first_name")));
- ptrT pLastName(json_as_string(json_get(pRecord, "last_name")));
- ptrT pNick(json_as_string(json_get(pRecord, "nickname")));
- ptrT pDomain(json_as_string(json_get(pRecord, "domain")));
-
- psr.id = mir_wstrdup(pId);
- psr.firstName = mir_wstrdup(pFirstName);
- psr.lastName = mir_wstrdup(pLastName);
- psr.nick = mir_wstrdup(pNick);
- if (!psr.nick || !psr.nick[0])
- psr.nick = mir_wstrdup(pDomain);
-
- bool filter = true;
- if (pParam) {
- if (psr.firstName&&pParam->pszFirstName)
- filter = tlstrstr(psr.firstName, pParam->pszFirstName) && filter;
- if (psr.lastName&&pParam->pszLastName)
- filter = tlstrstr(psr.lastName, pParam->pszLastName) && filter;
- if (psr.nick&&pParam->pszNick)
- filter = tlstrstr(psr.nick, pParam->pszNick) && filter;
- }
-
- if (filter)
- ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)1, (LPARAM)&psr);
- }
-
- ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)1, 0);
- if (pParam) {
- mir_free(pParam->pszFirstName);
- mir_free(pParam->pszLastName);
- mir_free(pParam->pszNick);
- delete pParam;
- }*/
}
\ No newline at end of file |