diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2017-02-12 21:43:13 +0100 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2017-02-12 21:43:13 +0100 |
| commit | 36c32a13878d3bd94e88bd9c764f1eadb05ea1ed (patch) | |
| tree | 3407b05620aa32471e95499c2635d5f6de2ce776 /protocols/FacebookRM/src/events.cpp | |
| parent | 646630b565d4fa2d95fd73143198b2d46deb937d (diff) | |
| parent | 2651148625bef56f1fe32c638259d20abb001d68 (diff) | |
Merge branch 'master' of https://github.com/miranda-ng/miranda-ng
Diffstat (limited to 'protocols/FacebookRM/src/events.cpp')
| -rw-r--r-- | protocols/FacebookRM/src/events.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/FacebookRM/src/events.cpp b/protocols/FacebookRM/src/events.cpp index 4dce07fe7b..f46ad30d58 100644 --- a/protocols/FacebookRM/src/events.cpp +++ b/protocols/FacebookRM/src/events.cpp @@ -22,9 +22,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "stdafx.h" -HWND FacebookProto::NotifyEvent(wchar_t* title, wchar_t* info, MCONTACT contact, EventType type, std::string *url, std::string *notification_id, const char *icon) +HWND FacebookProto::NotifyEvent(wchar_t* title, wchar_t* text, MCONTACT contact, EventType type, std::string *url, std::string *notification_id, const char *icon) { - if (title == NULL || info == NULL) + if (title == NULL || text == NULL) return NULL; char name[256]; @@ -77,7 +77,7 @@ HWND FacebookProto::NotifyEvent(wchar_t* title, wchar_t* info, MCONTACT contact, POPUPDATACLASS pd = { sizeof(pd) }; pd.pwszTitle = title; - pd.pwszText = info; + pd.pwszText = text; pd.pszClassName = name; pd.hContact = contact; if (icon != NULL) { @@ -97,12 +97,12 @@ HWND FacebookProto::NotifyEvent(wchar_t* title, wchar_t* info, MCONTACT contact, } } else { - if (!Clist_TrayNotifyW(m_szModuleName, title, info, type == EVENT_CLIENT ? NIIF_WARNING : NIIF_INFO, 10000)) + if (!Clist_TrayNotifyW(m_szModuleName, title, text, type == EVENT_CLIENT ? NIIF_WARNING : NIIF_INFO, 10000)) return NULL; } if (type == EVENT_CLIENT) - MessageBox(NULL, info, title, MB_OK | MB_ICONERROR); + MessageBox(NULL, text, title, MB_OK | MB_ICONERROR); return NULL; } |