summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-07-31 10:01:20 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-07-31 10:01:20 +0000
commit9265ee8085d9733199d0d2407ecd9b4666372b55 (patch)
tree99624d2aba3752c7faac30647589fdabd065e3b2
parenteb3c0d1be3114815f27c33947fd3591858661000 (diff)
compilation fix for debug mode
git-svn-id: http://svn.miranda-ng.org/main/trunk@14763 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/SkypeWeb/src/skype_contacts.cpp6
-rw-r--r--protocols/SkypeWeb/src/skype_proto.h5
-rw-r--r--protocols/SkypeWeb/src/skype_utils.cpp5
3 files changed, 6 insertions, 10 deletions
diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp
index 68b354d40c..ba71ebc14f 100644
--- a/protocols/SkypeWeb/src/skype_contacts.cpp
+++ b/protocols/SkypeWeb/src/skype_contacts.cpp
@@ -295,19 +295,17 @@ void CSkypeProto::LoadContactList(const NETLIBHTTPREQUEST *response)
{
LIST<char> users(1);
for (; i < skypenames.getCount() && users.getCount() < 25; i++)
- {
users.insert(skypenames[i]);
- }
PushRequest(new GetContactsInfoRequest(token, users), &CSkypeProto::LoadContactsInfo);
- for (int j = 0; i < users.getCount(); j++)
+ for (int j = 0; j < users.getCount(); j++)
mir_free(users[j]);
users.destroy();
}
while(i < skypenames.getCount());
- for (int i = 0; i < skypenames.getCount(); i++)
+ for (i = 0; i < skypenames.getCount(); i++)
mir_free(skypenames[i]);
skypenames.destroy();
}
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 6c97908cbb..6c3bcaa669 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -305,7 +305,10 @@ private:
void ProcessThreadUpdateRes(const JSONNode &node);
// utils
- inline bool IsOnline();
+ __forceinline bool IsOnline()
+ { return (m_iStatus > ID_STATUS_OFFLINE && m_hPollingThread);
+ }
+
bool IsMe(const char *skypeName);
MEVENT AddEventToDb(MCONTACT hContact, WORD type, DWORD timestamp, DWORD flags, DWORD cbBlob, PBYTE pBlob);
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp
index a5c6538dbe..e833592caf 100644
--- a/protocols/SkypeWeb/src/skype_utils.cpp
+++ b/protocols/SkypeWeb/src/skype_utils.cpp
@@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma warning(disable:4566)
-bool CSkypeProto::IsOnline()
-{
- return (m_iStatus > ID_STATUS_OFFLINE && m_hPollingThread);
-}
-
void CSkypeProto::SetSrmmReadStatus(MCONTACT hContact)
{
time_t time = getDword(hContact, "LastMsgReadTime", 0);