diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-16 22:17:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-16 22:17:16 +0000 |
| commit | 55a8ab47a15bfbfbd52d0d28368a72c0207a12a5 (patch) | |
| tree | 64f25a3488a439ca3aae9eb80d7735f9147013e9 /plugins/NewXstatusNotify/src/main.cpp | |
| parent | 769b537b5e1a99fc53aa7296fd2b21dc77a4071c (diff) | |
fixes warning & 64-bit issues
git-svn-id: http://svn.miranda-ng.org/main/trunk@14972 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/NewXstatusNotify/src/main.cpp')
| -rw-r--r-- | plugins/NewXstatusNotify/src/main.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index e04e6739e5..e4091cb972 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -423,13 +423,12 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus) }
if (bEnablePopup && db_get_b(hContact, MODULE, "EnablePopups", 1) && !opt.TempDisabled) {
- WORD myStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0);
+ WORD wStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0);
TCHAR str[MAX_SECONDLINE] = { 0 };
- if (opt.ShowStatus) {
+ if (opt.ShowStatus)
GetStatusText(hContact, newStatus, oldStatus, str);
- }
- if (opt.ReadAwayMsg && myStatus != ID_STATUS_INVISIBLE && StatusHasAwayMessage(szProto, newStatus))
+ if (opt.ReadAwayMsg && wStatus != ID_STATUS_INVISIBLE && StatusHasAwayMessage(szProto, newStatus))
db_set_ws(hContact, MODULE, "LastPopupText", str);
PLUGINDATA *pdp = (PLUGINDATA *)mir_calloc(sizeof(PLUGINDATA));
@@ -1036,12 +1035,11 @@ int ProtoAck(WPARAM, LPARAM lParam) if (ack->type == ACKTYPE_STATUS) {
WORD newStatus = (WORD)ack->lParam;
- WORD oldStatus = (WORD)ack->hProcess;
- char *szProto = (char *)ack->szModule;
-
+ WORD oldStatus = (DWORD_PTR)ack->hProcess;
if (oldStatus == newStatus)
return 0;
+ char *szProto = (char *)ack->szModule;
if (newStatus == ID_STATUS_OFFLINE) {
//The protocol switched to offline. Disable the popups for this protocol
db_set_b(NULL, MODULE, szProto, 0);
|