diff options
| -rw-r--r-- | protocols/SkypeWeb/src/skype_chatrooms.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 3 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.h | 23 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_trouter.cpp | 4 |
4 files changed, 17 insertions, 17 deletions
diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp index 6cf49cc4a9..3d9e6175a3 100644 --- a/protocols/SkypeWeb/src/skype_chatrooms.cpp +++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp @@ -262,8 +262,8 @@ INT_PTR CSkypeProto::OnLeaveChatRoom(WPARAM hContact, LPARAM) void CSkypeProto::OnChatEvent(const JSONNode &node)
{
- std::string clientMsgId = node["clientmessageid"].as_string();
- std::string skypeEditedId = node["skypeeditedid"].as_string();
+ //std::string clientMsgId = node["clientmessageid"].as_string();
+ //std::string skypeEditedId = node["skypeeditedid"].as_string();
std::string fromLink = node["from"].as_string();
ptrA from(ContactUrlToName(fromLink.c_str()));
diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 7933d114d5..51c8609515 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -78,7 +78,6 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response) if (isEdited && dbevent != NULL)
{
DBEVENTINFO dbei = { sizeof(dbei) };
- CMStringA msg;
dbei.cbBlob = db_event_getBlobSize(dbevent);
mir_ptr<BYTE> blob((PBYTE)mir_alloc(dbei.cbBlob));
@@ -94,7 +93,7 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response) _tcsftime_l(time, sizeof(time), L"%X %x", localtime(×tamp), locale);
_free_locale(locale);
- msg.AppendFormat("%s\n%s %s:\n%s", dbMsgText, Translate("Edited at"), _T2A(time), message);
+ CMStringA msg(FORMAT, "%s\n%s %s:\n%s", dbMsgText, Translate("Edited at"), _T2A(time), message);
db_event_delete(hContact, dbevent);
AddMessageToDb(hContact, dbEventTimestamp, flags, clientMsgId.c_str(), msg.GetBuffer(), emoteOffset);
}
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h index 9fa33bd75a..0a9ad9739f 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -25,15 +25,16 @@ typedef HRESULT(MarkupCallback)(IHTMLDocument3 *pHtmlDoc, BSTR &message); struct TRInfo
{
- std::string socketIo;
- std::string connId;
- std::string st;
- std::string se;
- std::string instance;
- std::string ccid;
- std::string sessId;
- std::string sig;
- std::string url;
+ std::string
+ socketIo,
+ connId,
+ st,
+ se,
+ instance,
+ ccid,
+ sessId,
+ sig,
+ url;
};
struct CSkypeProto : public PROTO < CSkypeProto >
@@ -99,7 +100,7 @@ public: ////////////////////////////////////////////
UINT_PTR m_timer;
static int CompareAccounts(const CSkypeProto *p1, const CSkypeProto *p2);
- void CSkypeProto::ProcessTimer();
+ void ProcessTimer();
static INT_PTR EventGetIcon(WPARAM wParam, LPARAM lParam);
static INT_PTR GetCallEventText(WPARAM, LPARAM lParam);
@@ -185,7 +186,7 @@ private: void OnGetTrouter(const NETLIBHTTPREQUEST *response, void *p);
void OnHealth(const NETLIBHTTPREQUEST *response);
void OnTrouterEvent(const JSONNode &body, const JSONNode &headers);
- void __cdecl CSkypeProto::TRouterThread(void*);
+ void __cdecl TRouterThread(void*);
// profile
void UpdateProfileFirstName(const JSONNode &root, MCONTACT hContact = NULL);
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index 6f8f9b77ad..66796c84c6 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -126,8 +126,8 @@ void CSkypeProto::OnHealth(const NETLIBHTTPREQUEST*) void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &)
{
- std::string displayname = body["displayName"].as_string();
- std::string cuid = body["callerId"].as_string();
+ //std::string displayname = body["displayName"].as_string();
+ //std::string cuid = body["callerId"].as_string();
std::string uid = body["conversationId"].as_string();
std::string gp = body["gp"].as_string();
int evt = body["evt"].as_int();
|