summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-23 20:29:14 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-23 20:29:14 +0000
commitb9eed106e74a7725f57b8175bc580a1520e1fe24 (patch)
tree916b5aab16e50ad2a968d0b5145fc9c3447a57f1 /protocols
parent77ece3939612fb0133d20815883e4ed50a10230e (diff)
patch for avatars reading optimization (by wsx22)
git-svn-id: http://svn.miranda-ng.org/main/trunk@7843 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/AimOscar/src/services.cpp3
-rw-r--r--protocols/FacebookRM/src/avatars.cpp3
-rw-r--r--protocols/Gadu-Gadu/src/services.cpp3
-rw-r--r--protocols/IcqOscarJ/src/icqosc_svcs.cpp3
-rw-r--r--protocols/Skype/src/skype_avatars.cpp3
-rw-r--r--protocols/Tlen/src/tlen_svc.cpp6
-rw-r--r--protocols/VKontakte/src/vk_avatars.cpp3
7 files changed, 15 insertions, 9 deletions
diff --git a/protocols/AimOscar/src/services.cpp b/protocols/AimOscar/src/services.cpp
index eeac20232e..05ab61d12e 100644
--- a/protocols/AimOscar/src/services.cpp
+++ b/protocols/AimOscar/src/services.cpp
@@ -424,7 +424,8 @@ INT_PTR CAimProto::GetAvatarCaps(WPARAM wParam, LPARAM lParam)
case AF_ENABLED:
case AF_DONTNEEDDELAYS:
- case AF_FETCHALWAYS:
+ case AF_FETCHIFPROTONOTVISIBLE:
+ case AF_FETCHIFCONTACTOFFLINE:
res = 1;
break;
}
diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp
index ab9011b8b4..196497a291 100644
--- a/protocols/FacebookRM/src/avatars.cpp
+++ b/protocols/FacebookRM/src/avatars.cpp
@@ -165,7 +165,8 @@ INT_PTR FacebookProto::GetAvatarCaps(WPARAM wParam, LPARAM lParam)
case AF_ENABLED:
case AF_DONTNEEDDELAYS:
- case AF_FETCHALWAYS:
+ case AF_FETCHIFPROTONOTVISIBLE:
+ case AF_FETCHIFCONTACTOFFLINE:
res = 1;
break;
}
diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp
index 3a1ae69ecd..f666244462 100644
--- a/protocols/Gadu-Gadu/src/services.cpp
+++ b/protocols/Gadu-Gadu/src/services.cpp
@@ -162,7 +162,8 @@ INT_PTR GGPROTO::getavatarcaps(WPARAM wParam, LPARAM lParam)
return 1;
case AF_MAXFILESIZE:
return 307200;
- case AF_FETCHALWAYS:
+ case AF_FETCHIFPROTONOTVISIBLE:
+ case AF_FETCHIFCONTACTOFFLINE:
return 1;
}
return 0;
diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
index 9c71183f02..485e41a908 100644
--- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
@@ -361,7 +361,8 @@ INT_PTR CIcqProto::GetAvatarCaps(WPARAM wParam, LPARAM lParam)
return 1 * 60 * 60 * 1000; // one hour
// avatars can be fetched all the time (server only operation)
- if (wParam == AF_FETCHALWAYS)
+ if (wParam == AF_FETCHIFPROTONOTVISIBLE)
+ if (wParam == AF_FETCHIFCONTACTOFFLINE)
return 1;
return 0;
diff --git a/protocols/Skype/src/skype_avatars.cpp b/protocols/Skype/src/skype_avatars.cpp
index 9ca9b0dddd..a42bd24dc3 100644
--- a/protocols/Skype/src/skype_avatars.cpp
+++ b/protocols/Skype/src/skype_avatars.cpp
@@ -98,7 +98,8 @@ INT_PTR __cdecl CSkypeProto::GetAvatarCaps(WPARAM wParam, LPARAM lParam)
// do not request avatar again if server gave an error
return 1;// * 60 * 60 * 1000; // one hour
- case AF_FETCHALWAYS:
+ case AF_FETCHIFPROTONOTVISIBLE:
+ case AF_FETCHIFCONTACTOFFLINE:
// avatars can be fetched all the time (server only operation)
return 1;
}
diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 7ee18ce37c..4fcd953033 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -688,7 +688,7 @@ INT_PTR TlenProtocol::GetAvatarInfo(WPARAM wParam, LPARAM lParam)
if ((avatarHash == NULL || avatarHash[0] == '\0') && !downloadingAvatar)
return GAIR_NOAVATAR;
-
+
if (avatarHash != NULL && !downloadingAvatar) {
TlenGetAvatarFileName(this, item, AI->filename, sizeof(AI->filename));
AI->format = ( AI->hContact == NULL ) ? threadData->avatarFormat : item->avatarFormat;
@@ -1156,8 +1156,8 @@ INT_PTR TlenProtocol::GetAvatarCaps(WPARAM wParam, LPARAM lParam)
return 1;
case AF_MAXFILESIZE:
return 10 * 1024;
- case AF_DELAYAFTERFAIL:
- return 0;
+ case AF_FETCHIFCONTACTOFFLINE:
+ return 1;
}
return 0;
}
diff --git a/protocols/VKontakte/src/vk_avatars.cpp b/protocols/VKontakte/src/vk_avatars.cpp
index dfd4939692..3784b08b8c 100644
--- a/protocols/VKontakte/src/vk_avatars.cpp
+++ b/protocols/VKontakte/src/vk_avatars.cpp
@@ -51,7 +51,8 @@ INT_PTR CVkProto::SvcGetAvatarCaps(WPARAM wParam, LPARAM lParam)
case AF_FORMATSUPPORTED:
case AF_ENABLED:
case AF_DONTNEEDDELAYS:
- case AF_FETCHALWAYS:
+ case AF_FETCHIFPROTONOTVISIBLE:
+ case AF_FETCHIFCONTACTOFFLINE:
return 1;
}