diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-02-21 13:03:09 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-02-21 13:03:09 +0000 |
| commit | 1c44f2df0725c7673b0522121461337270cd47c6 (patch) | |
| tree | 73979ab4ed3fcdf367ccce10ba1811def67d69b6 /plugins/!Deprecated/NewAwaySysMod | |
| parent | 1f59d862f624b14135eaf16899d3bc617fa3ff1e (diff) | |
service MS_VARS_FREEMEMORY replaced with the direct call of mir_free
git-svn-id: http://svn.miranda-ng.org/main/trunk@3669 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/!Deprecated/NewAwaySysMod')
| -rw-r--r-- | plugins/!Deprecated/NewAwaySysMod/AwaySys.cpp | 18 | ||||
| -rw-r--r-- | plugins/!Deprecated/NewAwaySysMod/MsgEventAdded.cpp | 3 | ||||
| -rw-r--r-- | plugins/!Deprecated/NewAwaySysMod/Notification.cpp | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/plugins/!Deprecated/NewAwaySysMod/AwaySys.cpp b/plugins/!Deprecated/NewAwaySysMod/AwaySys.cpp index d573009ede..9e8b0dd5b1 100644 --- a/plugins/!Deprecated/NewAwaySysMod/AwaySys.cpp +++ b/plugins/!Deprecated/NewAwaySysMod/AwaySys.cpp @@ -134,7 +134,7 @@ TCString GetDynamicStatMsg(HANDLE hContact, char *szProto, DWORD UIN, int iStatu if (szResult)
{
VarParseData.Message = szResult;
- CallService(MS_VARS_FREEMEMORY, (WPARAM)szResult, 0);
+ mir_free(szResult);
}
}
return VarParseData.Message = VarParseData.Message.Left(AWAY_MSGDATA_MAX);
@@ -150,7 +150,7 @@ int StatusMsgReq(WPARAM wParam, LPARAM lParam, CString &szProto) HANDLE hFoundContact = NULL; // if we'll find the contact only on some other protocol, but not on szProto, then we'll use that hContact.
HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
while (hContact)
- {
+ {
char *szCurProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
if (DBGetContactSettingDword(hContact, szCurProto, "UIN", 0) == lParam)
{
@@ -356,7 +356,7 @@ int StatusChanged(WPARAM wParam, LPARAM lParam) int CSStatusChange(WPARAM wParam, LPARAM lParam) // CommonStatus plugins (StartupStatus and AdvancedAutoAway)
{
// wParam = PROTOCOLSETTINGEX** protoSettings
- PROTOCOLSETTINGEX** ps = *(PROTOCOLSETTINGEX***)wParam;
+ PROTOCOLSETTINGEX** ps = *(PROTOCOLSETTINGEX***)wParam;
if (!ps)
{
return -1;
@@ -473,7 +473,7 @@ static INT_PTR SetContactStatMsg(WPARAM wParam, LPARAM lParam) {
if (g_SetAwayMsgPage.GetWnd()) // already setting something
{
- SetForegroundWindow(g_SetAwayMsgPage.GetWnd());
+ SetForegroundWindow(g_SetAwayMsgPage.GetWnd());
return 0;
}
SetAwayMsgData *dat = new SetAwayMsgData;
@@ -544,7 +544,7 @@ INT_PTR srvAutoreplyUseDefault(WPARAM wParam, LPARAM lParam) /* //NightFox: deleted used-to-be support
int Create_TopToolbar(WPARAM wParam, LPARAM lParam)
-{
+{
int SendOnEvent = CContactSettings(g_ProtoStates[(char*)NULL].Status).Autoreply;
if (ServiceExists(MS_TTB_ADDBUTTON))
{
@@ -967,9 +967,9 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam) }
//NightFox
- HookEvent(ME_MODERNOPT_INITIALIZE, ModernOptInitialise);
-
-
+ HookEvent(ME_MODERNOPT_INITIALIZE, ModernOptInitialise);
+
+
return 0;
}
@@ -985,7 +985,7 @@ extern "C" int __declspec(dllexport) Load(void) InitCommonControls();
InitOptions(); // must be called before we hook CallService
-
+
logservice_register(LOG_ID, LPGENT("New Away System"), _T("NewAwaySys?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log"), TranslateTS(_T("`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,id)) read your %") _T(VAR_STATDESC) _T("% message:\r\n%extratext%\r\n\r\n")));
if (DBGetContactSettingByte(NULL, MOD_NAME, DB_SETTINGSVER, 0) < 1)
diff --git a/plugins/!Deprecated/NewAwaySysMod/MsgEventAdded.cpp b/plugins/!Deprecated/NewAwaySysMod/MsgEventAdded.cpp index a8219e7bd7..8f280898c9 100644 --- a/plugins/!Deprecated/NewAwaySysMod/MsgEventAdded.cpp +++ b/plugins/!Deprecated/NewAwaySysMod/MsgEventAdded.cpp @@ -304,7 +304,7 @@ int MsgEventAdded(WPARAM wParam, LPARAM lParam) if (szResult != NULL)
{
Reply = szResult;
- CallService(MS_VARS_FREEMEMORY, (WPARAM)szResult, 0);
+ mir_free(szResult);
}
}
if (Reply.GetLen())
@@ -314,4 +314,3 @@ int MsgEventAdded(WPARAM wParam, LPARAM lParam) }
return 0;
}
-
diff --git a/plugins/!Deprecated/NewAwaySysMod/Notification.cpp b/plugins/!Deprecated/NewAwaySysMod/Notification.cpp index ca3f271f47..ce35017c8f 100644 --- a/plugins/!Deprecated/NewAwaySysMod/Notification.cpp +++ b/plugins/!Deprecated/NewAwaySysMod/Notification.cpp @@ -216,7 +216,7 @@ int ShowPopupNotification(COptPage &PopupNotifyData, HANDLE hContact, int iStatu if (szResult)
{
PopupMsg = szResult;
- CallService(MS_VARS_FREEMEMORY, (WPARAM)szResult, 0);
+ mir_free(szResult);
}
} else
{
|