summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/metacontacts/meta_edit.cpp12
-rw-r--r--src/modules/metacontacts/meta_menu.cpp12
-rw-r--r--src/modules/metacontacts/meta_services.cpp46
-rw-r--r--src/modules/metacontacts/meta_utils.cpp12
4 files changed, 40 insertions, 42 deletions
diff --git a/src/modules/metacontacts/meta_edit.cpp b/src/modules/metacontacts/meta_edit.cpp
index e4eabf0347..7aaa351545 100644
--- a/src/modules/metacontacts/meta_edit.cpp
+++ b/src/modules/metacontacts/meta_edit.cpp
@@ -164,12 +164,12 @@ static void ApplyChanges()
// fix avatar
most_online = Meta_GetMostOnlineSupporting(g_data.cc, PFLAGNUM_4, PF4_AVATARS);
if (most_online) {
- PROTO_AVATAR_INFORMATION AI = { sizeof(AI) };
- AI.hContact = g_data.hMeta;
- AI.format = PA_FORMAT_UNKNOWN;
- _tcsncpy_s(AI.filename, _T("X"), _TRUNCATE);
- if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS)
- db_set_ts(g_data.hMeta, "ContactPhoto", "File", AI.filename);
+ PROTO_AVATAR_INFORMATION ai = { 0 };
+ ai.hContact = g_data.hMeta;
+ ai.format = PA_FORMAT_UNKNOWN;
+ _tcsncpy_s(ai.filename, _T("X"), _TRUNCATE);
+ if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&ai) == GAIR_SUCCESS)
+ db_set_ts(g_data.hMeta, "ContactPhoto", "File", ai.filename);
}
}
diff --git a/src/modules/metacontacts/meta_menu.cpp b/src/modules/metacontacts/meta_menu.cpp
index 495768c9fd..9f17f423f5 100644
--- a/src/modules/metacontacts/meta_menu.cpp
+++ b/src/modules/metacontacts/meta_menu.cpp
@@ -160,13 +160,13 @@ void Meta_RemoveContactNumber(DBCachedContact *ccMeta, int number, bool bUpdateI
// fix avatar
MCONTACT hContact = Meta_GetMostOnlineSupporting(ccMeta, PFLAGNUM_4, PF4_AVATARS);
if (hContact) {
- PROTO_AVATAR_INFORMATION AI = { sizeof(AI) };
- AI.hContact = ccMeta->contactID;
- AI.format = PA_FORMAT_UNKNOWN;
- _tcsncpy_s(AI.filename, _T("X"), _TRUNCATE);
+ PROTO_AVATAR_INFORMATION ai = { 0 };
+ ai.hContact = ccMeta->contactID;
+ ai.format = PA_FORMAT_UNKNOWN;
+ _tcsncpy_s(ai.filename, _T("X"), _TRUNCATE);
- if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS)
- db_set_ts(ccMeta->contactID, "ContactPhoto", "File", AI.filename);
+ if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&ai) == GAIR_SUCCESS)
+ db_set_ts(ccMeta->contactID, "ContactPhoto", "File", ai.filename);
}
}
}
diff --git a/src/modules/metacontacts/meta_services.cpp b/src/modules/metacontacts/meta_services.cpp
index 3b48c62c69..7a7ef09b80 100644
--- a/src/modules/metacontacts/meta_services.cpp
+++ b/src/modules/metacontacts/meta_services.cpp
@@ -292,10 +292,8 @@ int Meta_HandleACK(WPARAM, LPARAM lParam)
// change avatar if the most online supporting avatars changes, or if we don't have one
MCONTACT hMostOnline = Meta_GetMostOnlineSupporting(cc, PFLAGNUM_4, PF4_AVATARS);
- //if (AI.hContact == 0 || AI.hContact != hMostOnline) {
- if (ack->hContact == 0 || ack->hContact != hMostOnline) {
+ if (ack->hContact == 0 || ack->hContact != hMostOnline)
return 0;
- }
if (!db_get(ack->hContact, "ContactPhoto", "File", &dbv)) {
db_set_ts(cc->contactID, "ContactPhoto", "File", dbv.ptszVal);
@@ -303,12 +301,12 @@ int Meta_HandleACK(WPARAM, LPARAM lParam)
}
if (ack->hProcess) {
- PROTO_AVATAR_INFORMATION AI;
- memcpy(&AI, (PROTO_AVATAR_INFORMATION *)ack->hProcess, sizeof(PROTO_AVATAR_INFORMATION));
- if (AI.hContact)
- AI.hContact = cc->contactID;
+ PROTO_AVATAR_INFORMATION ai;
+ memcpy(&ai, (PROTO_AVATAR_INFORMATION*)ack->hProcess, sizeof(ai));
+ if (ai.hContact)
+ ai.hContact = cc->contactID;
- return ProtoBroadcastAck(META_PROTO, cc->contactID, ack->type, ack->result, (HANDLE)&AI, ack->lParam);
+ return ProtoBroadcastAck(META_PROTO, cc->contactID, ack->type, ack->result, (HANDLE)&ai, ack->lParam);
}
return ProtoBroadcastAck(META_PROTO, cc->contactID, ack->type, ack->result, 0, ack->lParam);
@@ -442,12 +440,12 @@ int Meta_SettingChanged(WPARAM hContact, LPARAM lParam)
// most online contact with avatar support might have changed - update avatar
hMostOnline = Meta_GetMostOnlineSupporting(ccMeta, PFLAGNUM_4, PF4_AVATARS);
if (hMostOnline) {
- PROTO_AVATAR_INFORMATION AI = { sizeof(AI) };
- AI.hContact = ccMeta->contactID;
- AI.format = PA_FORMAT_UNKNOWN;
- _tcsncpy_s(AI.filename, _T("X"), _TRUNCATE);
- if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS)
- db_set_ts(ccMeta->contactID, "ContactPhoto", "File", AI.filename);
+ PROTO_AVATAR_INFORMATION ai = { 0 };
+ ai.hContact = ccMeta->contactID;
+ ai.format = PA_FORMAT_UNKNOWN;
+ _tcsncpy_s(ai.filename, _T("X"), _TRUNCATE);
+ if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&ai) == GAIR_SUCCESS)
+ db_set_ts(ccMeta->contactID, "ContactPhoto", "File", ai.filename);
}
}
@@ -748,8 +746,8 @@ INT_PTR Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam)
INT_PTR Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam)
{
- PROTO_AVATAR_INFORMATION *AI = (PROTO_AVATAR_INFORMATION*)lParam;
- DBCachedContact *cc = CheckMeta(AI->hContact);
+ PROTO_AVATAR_INFORMATION *pai = (PROTO_AVATAR_INFORMATION*)lParam;
+ DBCachedContact *cc = CheckMeta(pai->hContact);
if (cc == NULL)
return GAIR_NOAVATAR;
@@ -764,9 +762,9 @@ INT_PTR Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam)
if (!proto)
return GAIR_NOAVATAR;
- AI->hContact = hSub;
+ pai->hContact = hSub;
INT_PTR result = CallProtoService(proto, PS_GETAVATARINFO, wParam, lParam);
- AI->hContact = cc->contactID;
+ pai->hContact = cc->contactID;
if (result != CALLSERVICE_NOTFOUND)
return result;
@@ -791,12 +789,12 @@ INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam)
if (!proto)
return 0;
- PROTO_AVATAR_INFORMATION AI;
- AI.hContact = ccs->hContact;
- AI.format = PA_FORMAT_UNKNOWN;
- _tcsncpy_s(AI.filename, _T("X"), _TRUNCATE);
- if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS)
- db_set_ts(ccs->hContact, "ContactPhoto", "File", AI.filename);
+ PROTO_AVATAR_INFORMATION ai;
+ ai.hContact = ccs->hContact;
+ ai.format = PA_FORMAT_UNKNOWN;
+ _tcsncpy_s(ai.filename, _T("X"), _TRUNCATE);
+ if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&ai) == GAIR_SUCCESS)
+ db_set_ts(ccs->hContact, "ContactPhoto", "File", ai.filename);
hMostOnline = Meta_GetMostOnline(cc);
Meta_CopyContactNick(cc, hMostOnline);
diff --git a/src/modules/metacontacts/meta_utils.cpp b/src/modules/metacontacts/meta_utils.cpp
index 18a4c42078..9bf3aff72e 100644
--- a/src/modules/metacontacts/meta_utils.cpp
+++ b/src/modules/metacontacts/meta_utils.cpp
@@ -191,13 +191,13 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
// if the new contact is the most online contact with avatar support, get avatar info
most_online = Meta_GetMostOnlineSupporting(ccDest, PFLAGNUM_4, PF4_AVATARS);
if (most_online == hSub) {
- PROTO_AVATAR_INFORMATION AI;
- AI.hContact = hMeta;
- AI.format = PA_FORMAT_UNKNOWN;
- _tcsncpy_s(AI.filename, _T("X"), _TRUNCATE);
+ PROTO_AVATAR_INFORMATION ai;
+ ai.hContact = hMeta;
+ ai.format = PA_FORMAT_UNKNOWN;
+ _tcsncpy_s(ai.filename, _T("X"), _TRUNCATE);
- if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS)
- db_set_ts(hMeta, "ContactPhoto", "File", AI.filename);
+ if (CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&ai) == GAIR_SUCCESS)
+ db_set_ts(hMeta, "ContactPhoto", "File", ai.filename);
}
// merge sub's events to the meta-history
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 02:32:58 +0000