diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2013-01-19 17:48:42 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2013-01-19 17:48:42 +0000 |
| commit | f4c13c73bf781e48707a3ffc2aad182bb055a4e2 (patch) | |
| tree | 30494d64247f73b9776b9b9027787ea964343050 /plugins/SMS/src/SMS_svc.cpp | |
| parent | b1632650fe8901cc2270e285172da3897526230c (diff) | |
cleaner version of previous commits
git-svn-id: http://svn.miranda-ng.org/main/trunk@3175 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SMS/src/SMS_svc.cpp')
| -rw-r--r-- | plugins/SMS/src/SMS_svc.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp index 0264d43139..ed26834349 100644 --- a/plugins/SMS/src/SMS_svc.cpp +++ b/plugins/SMS/src/SMS_svc.cpp @@ -38,18 +38,18 @@ int LoadModules(void) mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_SMS);
mi.ptszName=SMS_SEND_STR;
mi.pszService=szServiceFunction;
- mi.flags=(CMIF_UNICODE);
+ mi.flags=CMIF_TCHAR;
Menu_AddMainMenuItem(&mi);
mi.position=-2000070000;
mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_SMS);
mi.ptszName=SMS_SEND_CM_STR;
mi.pszService=szServiceFunction;
- mi.flags=(CMIF_UNICODE);
+ mi.flags=CMIF_TCHAR;
ssSMSSettings.hContactMenuItems[0]=Menu_AddContactMenuItem(&mi);
- SkinAddNewSoundEx("RecvSMSMsg",PROTOCOL_NAMEA,Translate("Incoming SMS Message"));
- SkinAddNewSoundEx("RecvSMSConfirmation",PROTOCOL_NAMEA,Translate("Incoming SMS Confirmation"));
+ SkinAddNewSoundEx("RecvSMSMsg",PROTOCOL_NAMEA,LPGEN("Incoming SMS Message"));
+ SkinAddNewSoundEx("RecvSMSConfirmation",PROTOCOL_NAMEA,LPGEN("Incoming SMS Confirmation"));
RefreshAccountList(NULL,NULL);
@@ -172,18 +172,19 @@ int ReadAckSMS(WPARAM wParam,LPARAM lParam) DBEVENTINFO dbei={0};
dbei.cbSize=sizeof(dbei);
- if ((dbei.cbBlob=CallService(MS_DB_EVENT_GETBLOBSIZE,(WPARAM)((CLISTEVENT*)lParam)->hDbEvent,0))!=-1)
+ CLISTEVENT *cle = ((CLISTEVENT*)lParam);
+ if ((dbei.cbBlob=CallService(MS_DB_EVENT_GETBLOBSIZE,(WPARAM)cle->hDbEvent,0))!=-1)
{
dbei.pBlob=(PBYTE)MEMALLOC(dbei.cbBlob);
if (dbei.pBlob)
{
- if (CallService(MS_DB_EVENT_GET,(WPARAM)((CLISTEVENT*)lParam)->hDbEvent,(LPARAM)&dbei)==0)
+ if (CallService(MS_DB_EVENT_GET,(WPARAM)cle->hDbEvent,(LPARAM)&dbei)==0)
if (dbei.eventType==ICQEVENTTYPE_SMS || dbei.eventType==ICQEVENTTYPE_SMSCONFIRMATION)
if (dbei.cbBlob>MIN_SMS_DBEVENT_LEN)
{
- if (RecvSMSWindowAdd(((CLISTEVENT*)lParam)->hContact,ICQEVENTTYPE_SMSCONFIRMATION,NULL,0,(LPSTR)dbei.pBlob,dbei.cbBlob))
+ if (RecvSMSWindowAdd(cle->hContact,ICQEVENTTYPE_SMSCONFIRMATION,NULL,0,(LPSTR)dbei.pBlob,dbei.cbBlob))
{
- CallService(MS_DB_EVENT_DELETE,(WPARAM)((CLISTEVENT*)lParam)->hContact,(LPARAM)((CLISTEVENT*)lParam)->hDbEvent);
+ CallService(MS_DB_EVENT_DELETE,(WPARAM)cle->hContact,(LPARAM)cle->hDbEvent);
iRet=0;
}
}
|