summaryrefslogtreecommitdiff
path: root/plugins/AVS/src/poll.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2016-06-06 15:56:58 +0000
committerGeorge Hazan <george.hazan@gmail.com>2016-06-06 15:56:58 +0000
commit279001d256a5bc6075284c76d65bf64c420acc7c (patch)
treeab000b58e2ae24700f691947e15e2a19f3185aab /plugins/AVS/src/poll.cpp
parent3d03ebefdd8f81e84275d858be1aa56aae1e12f1 (diff)
minor code cleaning (stub removed)
git-svn-id: http://svn.miranda-ng.org/main/trunk@16928 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AVS/src/poll.cpp')
-rw-r--r--plugins/AVS/src/poll.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp
index 16fdf87465..38d09b75e6 100644
--- a/plugins/AVS/src/poll.cpp
+++ b/plugins/AVS/src/poll.cpp
@@ -25,8 +25,6 @@ A queue to request items. One request is done at a time, REQUEST_WAIT_TIME milis
ACKRESULT_STATUS. This thread only requests the avatar (and maybe add it to the cache queue)
*/
-#define REQUEST_WAIT_TIME 3000
-
// Time to wait before re-requesting an avatar that failed
#define REQUEST_FAIL_WAIT_TIME (3 * 60 * 60 * 1000)
@@ -99,7 +97,7 @@ static BOOL PollContactCanHaveAvatar(MCONTACT hContact, const char *szProto)
// Return true if this contact has to be checked
static BOOL PollCheckContact(MCONTACT hContact)
{
- return !db_get_b(hContact, "ContactPhoto", "Locked", 0) && FindAvatarInCache(hContact, FALSE, TRUE) != NULL;
+ return !db_get_b(hContact, "ContactPhoto", "Locked", 0) && FindAvatarInCache(hContact, false, true) != NULL;
}
static void QueueRemove(MCONTACT hContact)
@@ -113,7 +111,8 @@ static void QueueRemove(MCONTACT hContact)
}
}
-static void QueueAdd(MCONTACT hContact, int waitTime)
+// Add an contact to a queue
+void QueueAdd(MCONTACT hContact, int waitTime)
{
if (fei == NULL || g_shutDown)
return;
@@ -131,12 +130,6 @@ static void QueueAdd(MCONTACT hContact, int waitTime)
queue.insert(item);
}
-// Add an contact to a queue
-void QueueAdd(MCONTACT hContact)
-{
- QueueAdd(hContact, REQUEST_WAIT_TIME);
-}
-
void ProcessAvatarInfo(MCONTACT hContact, int type, PROTO_AVATAR_INFORMATION *pai, const char *szProto)
{
QueueRemove(hContact);