summaryrefslogtreecommitdiff
path: root/plugins/FileAsMessage
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/FileAsMessage')
-rw-r--r--plugins/FileAsMessage/src/dialog.cpp4
-rw-r--r--plugins/FileAsMessage/src/main.cpp21
2 files changed, 6 insertions, 19 deletions
diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp
index f038b87a33..125952db8b 100644
--- a/plugins/FileAsMessage/src/dialog.cpp
+++ b/plugins/FileAsMessage/src/dialog.cpp
@@ -193,7 +193,7 @@ static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
case WM_COMMAND:
{
PUDeletePopUp(hWnd);
- CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)0);
+ CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, 0);
if(IsWindow(hDlg))
{
@@ -665,7 +665,7 @@ void FILEECHO::onRecvTimer()
if(DBGetContactSettingByte(NULL,"SRFile","AutoClose",0))
{
PostMessage(hDlg, WM_CLOSE, 0,0);
- CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)0);
+ CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, 0);
}
SkinPlaySound("FileDone");
destroyTransfer();
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 681cd4f02a..41505dabf8 100644
--- a/plugins/FileAsMessage/src/main.cpp
+++ b/plugins/FileAsMessage/src/main.cpp
@@ -62,21 +62,8 @@ int iIconId[5] = {3,2,4,1,0};
//
int OnSkinIconsChanged(WPARAM wParam,LPARAM lParam)
{
- int indx;
-/*
- if(lParam == NULL)
- return 0;
- for(indx = 0; indx < ARRAY_SIZE(hIcons); indx++)
- {
- if(strcmp((char*)lParam, szIconId[indx]) == 0)
- {
- hIcons[indx] = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szIconId[indx]);
- break;
- }
- }
-*/
- for(indx = 0; indx < SIZEOF(hIcons); indx++)
- hIcons[indx] = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szIconId[indx]);
+ for(int indx = 0; indx < SIZEOF(hIcons); indx++)
+ hIcons[indx] = Skin_GetIcon(szIconId[indx]);
WindowList_Broadcast(hFileList, WM_FE_SKINCHANGE, 0,0);
@@ -234,7 +221,7 @@ int OnModulesLoaded(WPARAM wparam,LPARAM lparam)
Skin_AddIcon(&sid);
}
for(indx = 0; indx < SIZEOF(hIcons); indx++)
- hIcons[indx] = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szIconId[indx]);
+ hIcons[indx] = Skin_GetIcon(szIconId[indx]);
hHookSkinIconsChanged = HookEvent(ME_SKIN2_ICONSCHANGED, OnSkinIconsChanged);
@@ -261,7 +248,7 @@ extern "C" __declspec(dllexport) int Load(void)
// for(int indx = 0; indx < ARRAY_SIZE(hIcons); indx++)
// hIcons[indx] = (HICON)LoadImage(hInst,MAKEINTRESOURCE(idIcons[indx]),IMAGE_ICON,GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),0);
-
+
hFileList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
//CreateServiceFunction( SERVICE_NAME PS_GETCAPS, FEGetCaps );