2 files changed, 5 insertions, 10 deletions
diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp
index a47ce5e7a9..7fa9fc17de 100644
--- a/src/modules/extraicons/DefaultExtraIcons.cpp
+++ b/src/modules/extraicons/DefaultExtraIcons.cpp
@@ -159,9 +159,8 @@ static void SetExtraIcons(MCONTACT hContact)
 	}
 }
 
-static int SettingChanged(WPARAM wParam, LPARAM lParam)
+static int SettingChanged(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	if (hContact == NULL)
 		return 0;
 
@@ -203,13 +202,12 @@ static int SettingChanged(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-static int DefaultOnClick(WPARAM wParam, LPARAM lParam, LPARAM param)
+static int DefaultOnClick(WPARAM hContact, LPARAM lParam, LPARAM param)
 {
 	Info *p = (Info*)param;
 	if (p == NULL)
 		return 0;
 
-	MCONTACT hContact = wParam;
 	if (hContact == NULL)
 		return 0;
 
@@ -277,9 +275,8 @@ static ProtoInfo* FindProto(const char *proto)
 	return p;
 }
 
-static int ProtocolApplyIcon(WPARAM wParam, LPARAM lParam)
+static int ProtocolApplyIcon(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	char *proto = GetContactProto(hContact);
 	if (IsEmpty(proto))
 		return 0;
diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp
index 7fae900021..037c97e142 100644
--- a/src/modules/extraicons/extraicons.cpp
+++ b/src/modules/extraicons/extraicons.cpp
@@ -246,9 +246,8 @@ int ClistExtraListRebuild(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int ClistExtraImageApply(WPARAM wParam, LPARAM lParam)
+int ClistExtraImageApply(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	if (hContact == NULL)
 		return 0;
 
@@ -260,9 +259,8 @@ int ClistExtraImageApply(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int ClistExtraClick(WPARAM wParam, LPARAM lParam)
+int ClistExtraClick(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	if (hContact == NULL)
 		return 0;