diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-19 14:24:12 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-19 14:24:12 +0000 |
| commit | 83310365c69bd40365ee0ae0e16c99c28e24cd0b (patch) | |
| tree | 10ac18bfdc3fcf0fd62a5aba3ccb5dedffa2e410 /plugins/FileAsMessage/src | |
| parent | d68cd04d6f7b997692476b531bdc30f546a50efd (diff) | |
- all static protocol services replaced with functions;
- m_protomod.h removed as useless
git-svn-id: http://svn.miranda-ng.org/main/trunk@14260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/FileAsMessage/src')
| -rw-r--r-- | plugins/FileAsMessage/src/main.cpp | 14 | ||||
| -rw-r--r-- | plugins/FileAsMessage/src/main.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index fa6e4ddb6e..6892863329 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -116,17 +116,17 @@ INT_PTR OnSendFile(WPARAM wParam, LPARAM lParam) INT_PTR OnRecvMessage(WPARAM wParam, LPARAM lParam)
{
- CCSDATA *pccsd = (CCSDATA *)lParam;
- PROTORECVEVENT *ppre = (PROTORECVEVENT *)pccsd->lParam;
+ CCSDATA *ccs = (CCSDATA *)lParam;
+ PROTORECVEVENT *ppre = (PROTORECVEVENT *)ccs->lParam;
if (strncmp(ppre->szMessage, szServicePrefix, mir_strlen(szServicePrefix)))
- return CallService(MS_PROTO_CHAINRECV, wParam, lParam);
+ return Proto_ChainRecv(wParam, ccs);
- HWND hwnd = WindowList_Find(hFileList, pccsd->hContact);
+ HWND hwnd = WindowList_Find(hFileList, ccs->hContact);
if (!IsWindow(hwnd))
{
if (hwnd != 0) WindowList_Remove(hFileList, hwnd);
- FILEECHO *fe = new FILEECHO(pccsd->hContact);
+ FILEECHO *fe = new FILEECHO(ccs->hContact);
fe->inSend = FALSE;
hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_MAIN), NULL, DialogProc, (LPARAM)fe);
if (hwnd == NULL)
@@ -136,7 +136,7 @@ INT_PTR OnRecvMessage(WPARAM wParam, LPARAM lParam) }
}
char *msg = mir_strdup(ppre->szMessage + mir_strlen(szServicePrefix));
- PostMessage(hwnd, WM_FE_MESSAGE, (WPARAM)pccsd->hContact, (LPARAM)msg);
+ PostMessage(hwnd, WM_FE_MESSAGE, (WPARAM)ccs->hContact, (LPARAM)msg);
return 0;
}
@@ -203,7 +203,7 @@ extern "C" __declspec(dllexport) int Load(void) pd.cbSize = sizeof(pd);
pd.szName = SERVICE_NAME;
pd.type = PROTOTYPE_FILTER;
- CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
+ Proto_RegisterModule(&pd);
HookEvent(ME_OPT_INITIALISE, OnOptInitialise);
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
diff --git a/plugins/FileAsMessage/src/main.h b/plugins/FileAsMessage/src/main.h index ee3577a12d..1063fb8668 100644 --- a/plugins/FileAsMessage/src/main.h +++ b/plugins/FileAsMessage/src/main.h @@ -8,7 +8,7 @@ #include <newpluginapi.h>
#include <m_database.h>
-#include <m_protomod.h>
+#include <m_protosvc.h>
#include <m_langpack.h>
#include <m_clist.h>
#include <m_options.h>
|