diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-04-11 10:33:28 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-04-11 10:33:28 +0000 |
| commit | 4451fe1381e185036a7037b3a0cda50de5b9d9b3 (patch) | |
| tree | 9af3d81036c7bd0220fb2f2316d0f3ef4560a968 | |
| parent | 7c84415a6f53cd0744a651ff92c60092435e01ad (diff) | |
SkypeWeb: Warning fix.
git-svn-id: http://svn.miranda-ng.org/main/trunk@12762 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/SkypeWeb/src/requests/messages.h | 5 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/protocols/SkypeWeb/src/requests/messages.h b/protocols/SkypeWeb/src/requests/messages.h index fe9361a29f..663a075a7b 100644 --- a/protocols/SkypeWeb/src/requests/messages.h +++ b/protocols/SkypeWeb/src/requests/messages.h @@ -57,7 +57,7 @@ public: class SendTypingRequest : public HttpRequest
{
public:
- SendTypingRequest(const char *regToken, const char *username, bool bstate, const char *server = SKYPE_ENDPOINTS_HOST) :
+ SendTypingRequest(const char *regToken, const char *username, int iState, const char *server = SKYPE_ENDPOINTS_HOST) :
HttpRequest(REQUEST_POST, FORMAT, "%s/v1/users/ME/conversations/8:%s/messages", server, ptrA(mir_urlEncode(username)))
{
Headers
@@ -65,8 +65,7 @@ public: << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken)
<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");
CMStringA state;
- if (bstate) state = "Control/Typing";
- else state = "Control/ClearTyping";
+ state = (iState == PROTOTYPE_SELFTYPING_ON) ? "Control/Typing" : "Control/ClearTyping";
CMStringA data;
data.AppendFormat("{\"clienmessageid\":%lld, \"content\":\"\", \"messagetype\":\"%s\", \"contenttype\":\"text\"}", time(NULL), state);
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 5d51612e80..4fa7b6adfc 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -228,8 +228,8 @@ int CSkypeProto::SetStatus(int iNewStatus) // set status
ptrA regToken(getStringA("registrationToken"));
ptrA endpoint(getStringA("endpointId"));
- PushRequest(new SendCapabilitiesRequest(regToken, endpoint));
PushRequest(new SetStatusRequest(regToken, MirandaToSkypeStatus(m_iDesiredStatus)), &CSkypeProto::OnStatusChanged);
+ PushRequest(new SendCapabilitiesRequest(regToken, endpoint));
}
}
|