From f0db859e71b13c696c7af6993ce58c59b00ba387 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sun, 3 Aug 2014 16:46:13 +0000 Subject: Even simpler version of [10047] git-svn-id: http://svn.miranda-ng.org/main/trunk@10048 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewXstatusNotify/src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index dd8213ce45..17df2c2222 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -712,10 +712,9 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact) } TCHAR *str; - char protoname[MAX_PATH]; - PROTOACCOUNT *pa = ProtoGetAccount(szProto); if (smi.compare == COMPARE_DEL) { - mir_snprintf(protoname, SIZEOF(protoname), "%s_TPopupSMsgRemoved", pa->szModuleName); + char protoname[MAX_PATH]; + mir_snprintf(protoname, SIZEOF(protoname), "%s_TPopupSMsgRemoved", szProto); DBVARIANT dbVar = { 0 }; if (db_get_ts(NULL, MODULE, protoname, &dbVar)) { str = GetStr(&smi, DEFAULT_POPUP_SMSGREMOVED); @@ -726,7 +725,8 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact) } } else { - mir_snprintf(protoname, SIZEOF(protoname), "%s_TPopupSMsgChanged", pa->szModuleName); + char protoname[MAX_PATH]; + mir_snprintf(protoname, SIZEOF(protoname), "%s_TPopupSMsgChanged", szProto); DBVARIANT dbVar = { 0 }; if (db_get_ts(NULL, MODULE, protoname, &dbVar)) { str = GetStr(&smi, DEFAULT_POPUP_SMSGCHANGED); @@ -1037,7 +1037,7 @@ void InitStatusList() lstrcpyn(StatusListEx[index].lpzSkinSoundDesc, LPGENT("Extra status message removed"), MAX_SKINSOUNDDESC); } -VOID CALLBACK ConnectionTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +void CALLBACK ConnectionTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { if (uMsg == WM_TIMER) { KillTimer(hwnd, idEvent); -- cgit v1.2.3