diff options
Diffstat (limited to 'plugins/AVS')
| -rw-r--r-- | plugins/AVS/src/main.cpp | 4 | ||||
| -rw-r--r-- | plugins/AVS/src/options.cpp | 6 | ||||
| -rw-r--r-- | plugins/AVS/src/services.cpp | 6 | ||||
| -rw-r--r-- | plugins/AVS/src/utils.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 93a2d008e8..d551874527 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -336,14 +336,14 @@ static int ModulesLoaded(WPARAM, LPARAM) int accCount;
PROTOACCOUNT **accs = NULL;
- ProtoEnumAccounts(&accCount, &accs);
+ Proto_EnumAccounts(&accCount, &accs);
if (fei != NULL) {
LoadDefaultInfo();
int protoCount;
PROTOCOLDESCRIPTOR **proto;
- CallService(MS_PROTO_ENUMPROTOS, (WPARAM)&protoCount, (LPARAM)&proto);
+ Proto_EnumProtocols(&protoCount, &proto);
for (int i = 0; i < protoCount; i++)
LoadProtoInfo(proto[i]);
for (int i = 0; i < accCount; i++)
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 9e1f3a45f3..0f7793b45f 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -75,7 +75,7 @@ static void RemoveProtoPic(const char *szProto) if (p.szProtoname == NULL) continue; - PROTOACCOUNT *pdescr = ProtoGetAccount(p.szProtoname); + PROTOACCOUNT *pdescr = Proto_GetAccount(p.szProtoname); if (pdescr == NULL && mir_strcmp(p.szProtoname, szProto)) continue; @@ -140,7 +140,7 @@ static void SetProtoPic(char *szProto) mir_strncpy(szProtoname, szProto, mir_strlen(szProto) - mir_strlen("accounts")); mir_strcpy(szProtoname, strrchr(szProtoname, ' ') + 1); for (int i = 0; i < g_ProtoPictures.getCount(); i++) { - PROTOACCOUNT* pdescr = (PROTOACCOUNT*)CallService(MS_PROTO_GETACCOUNT, 0, (LPARAM)g_ProtoPictures[i].szProtoname); + PROTOACCOUNT* pdescr = Proto_GetAccount(g_ProtoPictures[i].szProtoname); if (pdescr == NULL && mir_strcmp(g_ProtoPictures[i].szProtoname, szProto)) continue; @@ -1008,7 +1008,7 @@ static INT_PTR CALLBACK DlgProcAvatarProtoInfo(HWND hwndDlg, UINT msg, WPARAM wP PROTOACCOUNT **accs; int count, num = 0; - ProtoEnumAccounts(&count, &accs); + Proto_EnumAccounts(&count, &accs); for (int i = 0; i < count; i++) { if (!ProtoServiceExists(accs[i]->szModuleName, PS_GETMYAVATAR)) continue; diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp index 1f3fd7441b..5162f283f6 100644 --- a/plugins/AVS/src/services.cpp +++ b/plugins/AVS/src/services.cpp @@ -225,7 +225,7 @@ static int InternalRemoveMyAvatar(char *protocol) PROTOACCOUNT **accs;
int i, count;
- ProtoEnumAccounts(&count, &accs);
+ Proto_EnumAccounts(&count, &accs);
for (i = 0; i < count; i++) {
if (!ProtoServiceExists(accs[i]->szModuleName, PS_SETMYAVATAR))
continue;
@@ -528,7 +528,7 @@ static int InternalSetMyAvatar(char *protocol, TCHAR *szFinalName, SetMyAvatarHo else {
int count;
PROTOACCOUNT **accs;
- ProtoEnumAccounts(&count, &accs);
+ Proto_EnumAccounts(&count, &accs);
for (int i = 0; i < count; i++) {
if (!ProtoServiceExists(accs[i]->szModuleName, PS_SETMYAVATAR))
continue;
@@ -635,7 +635,7 @@ INT_PTR avSetMyAvatar(char* protocol, TCHAR* tszPath) int count;
PROTOACCOUNT **accs;
- ProtoEnumAccounts(&count, &accs);
+ Proto_EnumAccounts(&count, &accs);
for (int i = 0; i < count; i++) {
if (!ProtoServiceExists(accs[i]->szModuleName, PS_SETMYAVATAR))
continue;
diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp index a1863a9f42..030696b7fc 100644 --- a/plugins/AVS/src/utils.cpp +++ b/plugins/AVS/src/utils.cpp @@ -99,7 +99,7 @@ int CreateAvatarInCache(MCONTACT hContact, avatarCacheEntry *ace, char *szProto) MyPathToAbsolute(tszValue, tszFilename);
if (!strstr(szProto, "Global avatar for")) {
- PROTOACCOUNT* pdescr = (PROTOACCOUNT*)CallService(MS_PROTO_GETACCOUNT, 0, (LPARAM)szProto);
+ PROTOACCOUNT* pdescr = Proto_GetAccount(szProto);
if (pdescr == NULL)
return -1;
char key[MAX_PATH];
|