diff options
| author | Robert Pösel <robyer@seznam.cz> | 2016-09-01 21:44:28 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2016-09-01 21:44:28 +0000 |
| commit | 6c13e88bbfd39fe43ac732dde41672aead181819 (patch) | |
| tree | 6b65af85c0ae715997bcffa490116464c6cdb212 /protocols/FacebookRM/src/events.cpp | |
| parent | 31dbfa8932404d69b11dbaa9c4f16e141546b672 (diff) | |
Facebook: Remove use of useless macros
git-svn-id: http://svn.miranda-ng.org/main/trunk@17239 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/FacebookRM/src/events.cpp')
| -rw-r--r-- | protocols/FacebookRM/src/events.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/protocols/FacebookRM/src/events.cpp b/protocols/FacebookRM/src/events.cpp index 660b2424f5..be0306148f 100644 --- a/protocols/FacebookRM/src/events.cpp +++ b/protocols/FacebookRM/src/events.cpp @@ -108,23 +108,21 @@ HWND FacebookProto::NotifyEvent(wchar_t* title, wchar_t* info, MCONTACT contact, { MIRANDASYSTRAYNOTIFY err; int niif_flags = flags; - REMOVE_FLAG(niif_flags, FACEBOOK_EVENT_CLIENT | - FACEBOOK_EVENT_NEWSFEED | - FACEBOOK_EVENT_NOTIFICATION | - FACEBOOK_EVENT_OTHER | - FACEBOOK_EVENT_FRIENDSHIP); + + niif_flags = niif_flags & ~(FACEBOOK_EVENT_CLIENT | FACEBOOK_EVENT_NEWSFEED | FACEBOOK_EVENT_NOTIFICATION | FACEBOOK_EVENT_OTHER | FACEBOOK_EVENT_FRIENDSHIP); + err.szProto = m_szModuleName; err.cbSize = sizeof(err); - err.dwInfoFlags = NIIF_INTERN_TCHAR | niif_flags; + err.dwInfoFlags = NIIF_INTERN_UNICODE | niif_flags; err.tszInfoTitle = title; err.tszInfo = info; err.uTimeout = 10000; - if (CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)& err) == 0) + if (CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&err) == 0) return NULL; } } - if (FLAG_CONTAINS(flags, FACEBOOK_EVENT_CLIENT)) + if ((flags & FACEBOOK_EVENT_CLIENT) == FACEBOOK_EVENT_CLIENT) MessageBox(NULL, info, title, MB_OK | MB_ICONERROR); return NULL; |