diff options
| -rw-r--r-- | protocols/SkypeWeb/src/skype_dialogs.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_login.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_messages.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_polling.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.h | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_trouter.cpp | 2 |
8 files changed, 10 insertions, 8 deletions
diff --git a/protocols/SkypeWeb/src/skype_dialogs.cpp b/protocols/SkypeWeb/src/skype_dialogs.cpp index 7a96c07736..1172c44fd4 100644 --- a/protocols/SkypeWeb/src/skype_dialogs.cpp +++ b/protocols/SkypeWeb/src/skype_dialogs.cpp @@ -34,7 +34,7 @@ void CSkypeProto::CloseDialogs() //CSkypeInvideDlg
CSkypeInviteDlg::CSkypeInviteDlg(CSkypeProto *proto) :
- CSkypeDlgBase(proto, IDD_GC_INVITE, false), m_ok(this, IDOK), m_cancel(this, IDCANCEL), m_combo(this, IDC_CONTACT)
+CSkypeDlgBase(proto, IDD_GC_INVITE, false), m_ok(this, IDOK), m_cancel(this, IDCANCEL), m_combo(this, IDC_CONTACT), m_hContact(NULL)
{
m_ok.OnClick = Callback(this, &CSkypeInviteDlg::btnOk_OnOk);
}
diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 2dc48c65b9..5028030d92 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -162,5 +162,5 @@ void CSkypeProto::OnSyncHistory(const NETLIBHTTPREQUEST *response) }
}
- HistorySynced = true;
+ m_bHistorySynced = true;
}
\ No newline at end of file diff --git a/protocols/SkypeWeb/src/skype_login.cpp b/protocols/SkypeWeb/src/skype_login.cpp index 467396baae..a109bee23e 100644 --- a/protocols/SkypeWeb/src/skype_login.cpp +++ b/protocols/SkypeWeb/src/skype_login.cpp @@ -34,7 +34,7 @@ void CSkypeProto::Login() ProtoBroadcastAck(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGIN_ERROR_UNKNOWN);
return;
}
- HistorySynced = m_bThreadsTerminated = false;
+ m_bHistorySynced = m_bThreadsTerminated = false;
if ((tokenExpires - 1800) > time(NULL))
OnLoginSuccess();
else
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index 3015dcad15..91e61d0c43 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -171,7 +171,7 @@ void CSkypeProto::OnPrivateMessageEvent(const JSONNode &node) MCONTACT hContact = AddContact(szConversationName, true);
- if (HistorySynced)
+ if (m_bHistorySynced)
db_set_dw(hContact, m_szModuleName, "LastMsgTime", (DWORD)timestamp);
if (strMessageType == "Control/Typing")
diff --git a/protocols/SkypeWeb/src/skype_polling.cpp b/protocols/SkypeWeb/src/skype_polling.cpp index 59c167b9cc..ee4d5f45c3 100644 --- a/protocols/SkypeWeb/src/skype_polling.cpp +++ b/protocols/SkypeWeb/src/skype_polling.cpp @@ -75,7 +75,7 @@ void CSkypeProto::PollingThread(void*) }
}
m_pollingConnection = response->nlc;
- }
+ } // fallthrough
if (m_iStatus != ID_STATUS_OFFLINE)
{
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 28ac35247d..4763970d8a 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -23,7 +23,9 @@ CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName) : m_InviteDialogs(1),
m_GCCreateDialogs(1),
m_OutMessages(3, PtrKeySortT),
- m_bThreadsTerminated(0)
+ m_bThreadsTerminated(0),
+ m_TrouterConnection(0),
+ m_pollingConnection(0)
{
InitNetwork();
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h index cb53e1690f..91f4c3351a 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -94,7 +94,7 @@ private: RequestQueue *requestQueue;
- bool HistorySynced;
+ bool m_bHistorySynced;
std::map<HANDLE, time_t> m_mpOutMessages;
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index 68ec568c24..46e9688183 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -172,7 +172,7 @@ void CSkypeProto::TRouterThread(void*) m_hTrouterHealthEvent.Wait();
}
m_TrouterConnection = response->nlc;
- }
+ } // fallthrough
}
m_hTrouterThread = NULL;
m_TrouterConnection = NULL;
|