summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin10/lib/mir_app.libbin67546 -> 67552 bytes
-rw-r--r--bin10/lib/mir_app64.libbin65360 -> 65366 bytes
-rw-r--r--bin12/lib/mir_app.libbin67546 -> 67552 bytes
-rw-r--r--bin12/lib/mir_app64.libbin65360 -> 65366 bytes
-rw-r--r--include/m_extraicons.h2
-rw-r--r--plugins/ContactsPlus/src/main.cpp4
-rw-r--r--plugins/FingerprintNG/src/fingerprint.cpp2
-rw-r--r--plugins/New_GPG/src/init.cpp2
-rw-r--r--plugins/SecureIM/src/main.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_options.cpp2
-rw-r--r--protocols/Xfire/src/main.cpp4
-rw-r--r--src/mir_app/src/DefaultExtraIcons.cpp2
-rw-r--r--src/mir_app/src/extraicons.cpp2
-rw-r--r--src/mir_app/src/mir_app.def2
-rw-r--r--src/mir_app/src/mir_app64.def2
15 files changed, 13 insertions, 13 deletions
diff --git a/bin10/lib/mir_app.lib b/bin10/lib/mir_app.lib
index 5fab912922..056772044d 100644
--- a/bin10/lib/mir_app.lib
+++ b/bin10/lib/mir_app.lib
Binary files differ
diff --git a/bin10/lib/mir_app64.lib b/bin10/lib/mir_app64.lib
index fca962e750..7d1ae65300 100644
--- a/bin10/lib/mir_app64.lib
+++ b/bin10/lib/mir_app64.lib
Binary files differ
diff --git a/bin12/lib/mir_app.lib b/bin12/lib/mir_app.lib
index 5fab912922..056772044d 100644
--- a/bin12/lib/mir_app.lib
+++ b/bin12/lib/mir_app.lib
Binary files differ
diff --git a/bin12/lib/mir_app64.lib b/bin12/lib/mir_app64.lib
index fca962e750..7d1ae65300 100644
--- a/bin12/lib/mir_app64.lib
+++ b/bin12/lib/mir_app64.lib
Binary files differ
diff --git a/include/m_extraicons.h b/include/m_extraicons.h
index 3a4184a685..4dcf39f427 100644
--- a/include/m_extraicons.h
+++ b/include/m_extraicons.h
@@ -113,7 +113,7 @@ EXTERN_C MIR_APP_DLL(void) KillModuleExtraIcons(int hLangpack);
#pragma warning(disable:4505)
-EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallack(const char *name, const char *description, const char *descIcon,
+EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallback(const char *name, const char *description, const char *descIcon,
MIRANDAHOOK RebuildIcons, MIRANDAHOOK ApplyIcon, MIRANDAHOOKPARAM OnClick = NULL, LPARAM onClickParam = 0, int = hLangpack);
EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterIcolib(const char *name, const char *description, const char *descIcon = NULL,
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index fbe9646e7b..74a3ff2672 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -114,13 +114,13 @@ static bool CheckContactsServiceSupport(const char* szProto)
static int HookPreBuildContactMenu(WPARAM hContact, LPARAM)
{
char *szProto = GetContactProto(hContact);
- int bVisible = FALSE;
+ bool bVisible = false;
if (szProto && CheckContactsServiceSupport(szProto)) {
// known protocol, protocol supports contacts sending
// check the selected contact if it supports contacts receive
if (CallProtoService(szProto, PS_GETCAPS, PFLAG_MAXCONTACTSPERPACKET, hContact))
- bVisible = TRUE;
+ bVisible = true;
}
// update contact menu item's visibility
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp
index 7b59cc0749..bfdbd49075 100644
--- a/plugins/FingerprintNG/src/fingerprint.cpp
+++ b/plugins/FingerprintNG/src/fingerprint.cpp
@@ -971,6 +971,6 @@ void InitFingerModule()
CreateServiceFunction(MS_FP_GETCLIENTDESCRW, ServiceGetClientDescrW);
CreateServiceFunction(MS_FP_GETCLIENTICONW, ServiceGetClientIconW);
- hExtraIcon = ExtraIcon_RegisterCallack("Client", LPGEN("Fingerprint"), "client_Miranda_unknown",
+ hExtraIcon = ExtraIcon_RegisterCallback("Client", LPGEN("Fingerprint"), "client_Miranda_unknown",
OnExtraIconListRebuild, OnExtraImageApply, OnExtraIconClick);
}
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index 56b307e177..ad6ad927c4 100644
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -214,7 +214,7 @@ extern "C" int __declspec(dllexport) Load()
InitIconLib();
- g_hCLIcon = ExtraIcon_RegisterCallack(szGPGModuleName, Translate("GPG encryption status"), "secured", onExtraImageListRebuilding, onExtraImageApplying);
+ g_hCLIcon = ExtraIcon_RegisterCallback(szGPGModuleName, Translate("GPG encryption status"), "secured", onExtraImageListRebuilding, onExtraImageApplying);
return 0;
}
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index bfbfa8f566..8fdd79d65d 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -357,7 +357,7 @@ extern "C" __declspec(dllexport) int __cdecl Load(void)
CreateServiceFunction(MODULENAME"/MODE_GPG", Service_ModeGPG);
CreateServiceFunction(MODULENAME"/MODE_RSA", Service_ModeRSAAES);
- g_hCLIcon = ExtraIcon_RegisterCallack(MODULENAME, LPGEN("SecureIM status"), "sim_cm_est", onExtraImageListRebuilding, onExtraImageApplying);
+ g_hCLIcon = ExtraIcon_RegisterCallback(MODULENAME, LPGEN("SecureIM status"), "sim_cm_est", onExtraImageListRebuilding, onExtraImageApplying);
return 0;
}
diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp
index f48b652c74..7342a077ac 100644
--- a/protocols/SkypeWeb/src/skype_options.cpp
+++ b/protocols/SkypeWeb/src/skype_options.cpp
@@ -80,7 +80,7 @@ int CSkypeProto::OnOptionsInit(WPARAM wParam, LPARAM)
return 0;
}
-void CSkypeOptionsMain::OnUsehostnameCheck(CCtrlCheck* p)
+void CSkypeOptionsMain::OnUsehostnameCheck(CCtrlCheck*)
{
m_place.Enable(!m_usehostname.GetState());
} \ No newline at end of file
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index e77a57a8dd..75948260e2 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1223,8 +1223,8 @@ extern "C" __declspec(dllexport) int Load(void)
Icon_Register(hinstance, LPGEN("Protocols") "/" LPGEN("XFire"), &icon, 1);
- hExtraIcon1 = ExtraIcon_RegisterCallack("xfire_game", LPGEN("XFire game icon"), "", NULL, ExtraImageApply1);
- hExtraIcon2 = ExtraIcon_RegisterCallack("xfire_voice", LPGEN("XFire voice icon"), "", NULL, ExtraImageApply2);
+ hExtraIcon1 = ExtraIcon_RegisterCallback("xfire_game", LPGEN("XFire game icon"), "", NULL, ExtraImageApply1);
+ hExtraIcon2 = ExtraIcon_RegisterCallback("xfire_voice", LPGEN("XFire voice icon"), "", NULL, ExtraImageApply2);
return 0;
}
diff --git a/src/mir_app/src/DefaultExtraIcons.cpp b/src/mir_app/src/DefaultExtraIcons.cpp
index 163ad21bc4..eac9fbbe7b 100644
--- a/src/mir_app/src/DefaultExtraIcons.cpp
+++ b/src/mir_app/src/DefaultExtraIcons.cpp
@@ -304,7 +304,7 @@ void DefaultExtraIcons_Load()
hExtraChat = ExtraIcon_RegisterIcolib("chat_activity", LPGEN("Chat activity"), "ChatActivity");
hExtraVisibility = ExtraIcon_RegisterIcolib("visibility", "Visibility", Skin_GetIconName(SKINICON_OTHER_VISIBLE_ALL));
hExtraGender = ExtraIcon_RegisterIcolib("gender", "Gender", "gender_male");
- hExtraProto = ExtraIcon_RegisterCallack("protocol", "Account", Skin_GetIconName(SKINICON_OTHER_ACCMGR),
+ hExtraProto = ExtraIcon_RegisterCallback("protocol", "Account", Skin_GetIconName(SKINICON_OTHER_ACCMGR),
&ProtocolRebuildIcons, &ProtocolApplyIcon, &ProtocolOnClick);
for (int i = 0; i < _countof(infos); i++) {
diff --git a/src/mir_app/src/extraicons.cpp b/src/mir_app/src/extraicons.cpp
index 77392cf048..59fa3bfb3d 100644
--- a/src/mir_app/src/extraicons.cpp
+++ b/src/mir_app/src/extraicons.cpp
@@ -394,7 +394,7 @@ static void EI_PostCreate(BaseExtraIcon *extra, const char *name, int hLangpack)
}
}
-EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallack(const char *name, const char *description, const char *descIcon,
+EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallback(const char *name, const char *description, const char *descIcon,
MIRANDAHOOK RebuildIcons, MIRANDAHOOK ApplyIcon,
MIRANDAHOOKPARAM OnClick, LPARAM onClickParam, int hLangpack)
{
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 5d20787f03..c61b7bdcbc 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -238,7 +238,7 @@ Menu_DestroyNestedMenu @236
ExtraIcon_SetIcon @237
ExtraIcon_SetIconByName @238
ExtraIcon_Clear @239
-ExtraIcon_RegisterCallack @240
+ExtraIcon_RegisterCallback @240
ExtraIcon_RegisterIcolib @241
KillModuleIcons @242
KillModuleColours @243
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 1cc06d89b0..42779c7546 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -238,7 +238,7 @@ Menu_DestroyNestedMenu @236
ExtraIcon_SetIcon @237
ExtraIcon_SetIconByName @238
ExtraIcon_Clear @239
-ExtraIcon_RegisterCallack @240
+ExtraIcon_RegisterCallback @240
ExtraIcon_RegisterIcolib @241
KillModuleIcons @242
KillModuleColours @243
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 09:38:32 +0000