summaryrefslogtreecommitdiff
path: root/protocols/Yahoo/avatar.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-04 16:05:04 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-04 16:05:04 +0000
commita4a275e150788c7b3da197a26899a2afad393768 (patch)
tree3ea7388e3ba2a1fffe20de14a4b70c40c1e3a291 /protocols/Yahoo/avatar.cpp
parentab2438d317799cc265c6f392f877947c61ecd585 (diff)
sync
git-svn-id: http://svn.miranda-ng.org/main/trunk@298 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/avatar.cpp')
-rw-r--r--protocols/Yahoo/avatar.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/protocols/Yahoo/avatar.cpp b/protocols/Yahoo/avatar.cpp
index 9b093ccb3d..3c8a9471e7 100644
--- a/protocols/Yahoo/avatar.cpp
+++ b/protocols/Yahoo/avatar.cpp
@@ -178,7 +178,7 @@ void __cdecl CYahooProto::recv_avatarthread(void *pavt)
hContact = getbuddyH(avt->who);
- if (!hContact){
+ if (!hContact) {
LOG(("ERROR: Can't find buddy: %s", avt->who));
error = 1;
} else if (!error) {
@@ -295,7 +295,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p
/* need to read CheckSum */
cksum = GetDword("AvatarHash", 0);
if (cksum) {
- if (!DBGetContactSettingString(NULL, m_szModuleName, "AvatarURL", &dbv)) {
+ if (!GetString("AvatarURL", &dbv)) {
LOG(("[ext_yahoo_got_picture] Sending url: %s checksum: %d to '%s'!", dbv.pszVal, cksum, who));
//void yahoo_send_picture_info(int id, const char *me, const char *who, const char *pic_url, int cksum)
yahoo_send_picture_info(m_id, who, 2, dbv.pszVal, cksum);
@@ -307,7 +307,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p
/*
* Try to re-upload the avatar
*/
- if (GetByte("AvatarUL", 0) != 1){
+ if (GetByte("AvatarUL", 0) != 1) {
// NO avatar URL??
if (!DBGetContactSettingTString(NULL, m_szModuleName, "AvatarFile", &dbv)) {
struct _stat statbuf;
@@ -406,7 +406,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p
LOG(("[ext_yahoo_got_picture] My Checksum: %d", mcksum));
- if (!DBGetContactSettingString(NULL, m_szModuleName, "AvatarURL", &dbv)) {
+ if (!GetString("AvatarURL", &dbv)) {
if (lstrcmpiA(pic_url, dbv.pszVal) == 0) {
DBVARIANT dbv2;
/*time_t ts;
@@ -562,7 +562,7 @@ void CYahooProto::ext_got_picture_upload(const char *me, const char *url,unsigne
SetString(NULL, "AvatarURL", url);
//YAHOO_SetDword("AvatarExpires", ts);
- if (!DBGetContactSettingString(NULL, m_szModuleName, "AvatarInv", &dbv) ) {
+ if (!GetString("AvatarInv", &dbv) ) {
LOG(("[ext_yahoo_got_picture_upload] Buddy: %s told us this is bad??", dbv.pszVal));
LOG(("[ext_yahoo_got_picture] Sending url: %s checksum: %d to '%s'!", url, cksum, dbv.pszVal));
@@ -676,7 +676,7 @@ INT_PTR __cdecl CYahooProto::GetAvatarInfo(WPARAM wParam,LPARAM lParam)
DBVARIANT dbv;
int avtType;
- if (!DBGetContactSettingString(AI->hContact, m_szModuleName, YAHOO_LOGINID, &dbv)) {
+ if (!GetString(AI->hContact, YAHOO_LOGINID, &dbv)) {
DebugLog("[YAHOO_GETAVATARINFO] For: %s", dbv.pszVal);
DBFreeVariant(&dbv);
}else {
@@ -718,7 +718,7 @@ INT_PTR __cdecl CYahooProto::GetAvatarInfo(WPARAM wParam,LPARAM lParam)
} else if ( m_bLoggedIn ) {
DBVARIANT dbv;
- if (!DBGetContactSettingString(AI->hContact, m_szModuleName, YAHOO_LOGINID, &dbv)) {
+ if (!GetString(AI->hContact, YAHOO_LOGINID, &dbv)) {
DebugLog("[YAHOO_GETAVATARINFO] Requesting avatar!");
request_avatar(dbv.pszVal);
@@ -811,7 +811,7 @@ INT_PTR __cdecl CYahooProto::GetMyAvatar(WPARAM wParam, LPARAM lParam)
if (GetDword("AvatarHash", 0)) {
if (!DBGetContactSettingTString(NULL, m_szModuleName, "AvatarFile", &dbv)) {
- if (_taccess(dbv.ptszVal, 0) == 0){
+ if (_taccess(dbv.ptszVal, 0) == 0) {
lstrcpyn(buffer, dbv.ptszVal, size-1);
buffer[size-1] = '\0';