diff options
Diffstat (limited to 'plugins/SeenPlugin')
| -rw-r--r-- | plugins/SeenPlugin/src/menu.cpp | 2 | ||||
| -rw-r--r-- | plugins/SeenPlugin/src/userinfo.cpp | 2 | ||||
| -rw-r--r-- | plugins/SeenPlugin/src/utils.cpp | 20 |
3 files changed, 11 insertions, 13 deletions
diff --git a/plugins/SeenPlugin/src/menu.cpp b/plugins/SeenPlugin/src/menu.cpp index e0c48146a8..010f960e5e 100644 --- a/plugins/SeenPlugin/src/menu.cpp +++ b/plugins/SeenPlugin/src/menu.cpp @@ -42,7 +42,7 @@ int BuildContactMenu(WPARAM wparam,LPARAM lparam) {
int id = -1, isetting;
HANDLE hContact = (HANDLE)wparam;
- char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+ char *szProto = GetContactProto(hContact);
CLISTMENUITEM cmi = { sizeof(cmi) };
if (!IsWatchedProtocol(szProto) || !db_get_b(NULL,S_MOD,"MenuItem",1))
diff --git a/plugins/SeenPlugin/src/userinfo.cpp b/plugins/SeenPlugin/src/userinfo.cpp index ab9ad36840..2bf3649a02 100644 --- a/plugins/SeenPlugin/src/userinfo.cpp +++ b/plugins/SeenPlugin/src/userinfo.cpp @@ -77,7 +77,7 @@ INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) int UserinfoInit(WPARAM wparam,LPARAM lparam)
{
- char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, lparam, 0);
+ char *proto = GetContactProto((HANDLE)lparam);
if ( IsWatchedProtocol(proto)) {
OPTIONSDIALOGPAGE uip = { sizeof(uip) };
uip.hInstance = hInstance;
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp index 5e2143eb8c..c307fe1411 100644 --- a/plugins/SeenPlugin/src/utils.cpp +++ b/plugins/SeenPlugin/src/utils.cpp @@ -168,7 +168,7 @@ TCHAR *ParseString(TCHAR *szstring, HANDLE hcontact, BYTE isfile) CONTACTINFO ci = { sizeof(CONTACTINFO) };
ci.hContact = hcontact;
- ci.szProto = hcontact ? (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,(WPARAM)hcontact,0) : courProtoName;
+ ci.szProto = hcontact ? GetContactProto(hcontact) : courProtoName;
TCHAR *d = sztemp;
for (TCHAR *p = szstring; *p; p++) {
@@ -612,7 +612,7 @@ int UpdateValues(WPARAM wparam,LPARAM lparam) // avoid repeating the offline status
if ((prevStatus|0x8000)<=ID_STATUS_OFFLINE)
return 0;
- proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, wparam, 0);
+ proto = GetContactProto((HANDLE)wparam);
db_set_b((HANDLE)wparam, S_MOD, "Offline", 1);
{
DWORD t;
@@ -626,18 +626,15 @@ int UpdateValues(WPARAM wparam,LPARAM lparam) if (!db_get_b(NULL,S_MOD,"IgnoreOffline",1))
{
- char * sProto;
if ( db_get_b(NULL,S_MOD,"FileOutput",0))
FileWrite((HANDLE)wparam);
- if (CallProtoService(sProto =
- (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, wparam, 0),
- PS_GETSTATUS,0,0
- )>ID_STATUS_OFFLINE) {
+ char *sProto = GetContactProto((HANDLE)wparam);
+ if (CallProtoService(sProto, PS_GETSTATUS, 0, 0) > ID_STATUS_OFFLINE) {
myPlaySound((HANDLE)wparam, ID_STATUS_OFFLINE, prevStatus);
- if ( db_get_b(NULL, S_MOD, "UsePopups", 0)) {
+ if ( db_get_b(NULL, S_MOD, "UsePopups", 0))
ShowPopup((HANDLE)wparam, sProto, ID_STATUS_OFFLINE);
- } }
+ }
if ( db_get_b(NULL, S_MOD, "KeepHistory", 0))
HistoryWrite((HANDLE)wparam);
@@ -658,7 +655,8 @@ int UpdateValues(WPARAM wparam,LPARAM lparam) if ( db_get_b(NULL, S_MOD, "FileOutput", 0)) FileWrite((HANDLE)wparam);
if (prevStatus != cws->value.wVal) myPlaySound((HANDLE)wparam, cws->value.wVal, prevStatus);
if ( db_get_b(NULL, S_MOD, "UsePopups", 0))
- if (prevStatus != cws->value.wVal) ShowPopup((HANDLE)wparam, (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, wparam, 0), cws->value.wVal|0x8000);
+ if (prevStatus != cws->value.wVal)
+ ShowPopup((HANDLE)wparam, GetContactProto((HANDLE)wparam), cws->value.wVal|0x8000);
if ( db_get_b(NULL, S_MOD, "KeepHistory", 0)) HistoryWrite((HANDLE)wparam);
if ( db_get_b((HANDLE)wparam, S_MOD, "OnlineAlert", 0)) ShowHistory((HANDLE)wparam, 1);
@@ -687,7 +685,7 @@ static DWORD __stdcall cleanThread(logthread_info* infoParam) HANDLE hcontact = db_find_first();
while(hcontact != NULL) {
- char *contactProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO,(WPARAM)hcontact,0);
+ char *contactProto = GetContactProto(hcontact);
if (contactProto) {
if ( !strncmp(infoParam->sProtoName, contactProto, MAXMODULELABELLENGTH)) {
WORD oldStatus = db_get_w(hcontact,S_MOD,"StatusTriger",ID_STATUS_OFFLINE) | 0x8000;
|