summaryrefslogtreecommitdiff
path: root/protocols/FacebookRM/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-12 14:13:15 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-12 14:13:15 +0000
commit1abc0fb06f39f97db893e33cd7fcffb92536b1db (patch)
tree1c4345fedc32ea271b81df0b8b253a34946e0ab6 /protocols/FacebookRM/src
parente528a508b7e307bd35b142b269a0bbd1b6813e89 (diff)
Facebook to use user-defined account name in popups
git-svn-id: http://svn.miranda-ng.org/main/trunk@7614 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/FacebookRM/src')
-rw-r--r--protocols/FacebookRM/src/dialogs.cpp13
-rw-r--r--protocols/FacebookRM/src/process.cpp6
2 files changed, 7 insertions, 12 deletions
diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp
index e946928c4f..ec743ad5bc 100644
--- a/protocols/FacebookRM/src/dialogs.cpp
+++ b/protocols/FacebookRM/src/dialogs.cpp
@@ -538,14 +538,11 @@ INT_PTR CALLBACK FBEventsProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lpa
switch (LOWORD(wparam))
{
case IDC_PREVIEW:
- {
- TCHAR protoName[255];
- lstrcpy(protoName, proto->m_tszUserName);
- proto->NotifyEvent(protoName, TranslateT("Sample event"), NULL, FACEBOOK_EVENT_CLIENT);
- proto->NotifyEvent(protoName, TranslateT("Sample request"), NULL, FACEBOOK_EVENT_OTHER);
- proto->NotifyEvent(protoName, TranslateT("Sample newsfeed"), NULL, FACEBOOK_EVENT_NEWSFEED);
- proto->NotifyEvent(protoName, TranslateT("Sample notification"), NULL, FACEBOOK_EVENT_NOTIFICATION);
- } break;
+ proto->NotifyEvent(proto->m_tszUserName, TranslateT("Sample event"), NULL, FACEBOOK_EVENT_CLIENT);
+ proto->NotifyEvent(proto->m_tszUserName, TranslateT("Sample request"), NULL, FACEBOOK_EVENT_OTHER);
+ proto->NotifyEvent(proto->m_tszUserName, TranslateT("Sample newsfeed"), NULL, FACEBOOK_EVENT_NEWSFEED);
+ proto->NotifyEvent(proto->m_tszUserName, TranslateT("Sample notification"), NULL, FACEBOOK_EVENT_NOTIFICATION);
+ break;
}
if ((LOWORD(wparam)==IDC_PREVIEW || (HWND)lparam!=GetFocus()))
diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index e4731c0111..e7528bda30 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -516,9 +516,8 @@ void FacebookProto::ProcessMessages(void* data)
for(std::vector<facebook_notification*>::size_type i=0; i<notifications.size(); i++)
{
debugLogA(" Got notification: %s", notifications[i]->text.c_str());
- ptrT szTitle( mir_utf8decodeT(this->m_szModuleName));
ptrT szText( mir_utf8decodeT(notifications[i]->text.c_str()));
- NotifyEvent(szTitle, szText, ContactIDToHContact(notifications[i]->user_id), FACEBOOK_EVENT_NOTIFICATION, &notifications[i]->link, &notifications[i]->id);
+ NotifyEvent(m_tszUserName, szText, ContactIDToHContact(notifications[i]->user_id), FACEBOOK_EVENT_NOTIFICATION, &notifications[i]->link, &notifications[i]->id);
delete notifications[i];
}
notifications.clear();
@@ -568,9 +567,8 @@ void FacebookProto::ProcessNotifications(void*)
for(std::vector<facebook_notification*>::size_type i=0; i<notifications.size(); i++)
{
debugLogA(" Got notification: %s", notifications[i]->text.c_str());
- ptrT szTitle( mir_utf8decodeT(this->m_szModuleName));
ptrT szText( mir_utf8decodeT(notifications[i]->text.c_str()));
- NotifyEvent(szTitle, szText, ContactIDToHContact(notifications[i]->user_id), FACEBOOK_EVENT_NOTIFICATION, &notifications[i]->link, &notifications[i]->id);
+ NotifyEvent(m_tszUserName, szText, ContactIDToHContact(notifications[i]->user_id), FACEBOOK_EVENT_NOTIFICATION, &notifications[i]->link, &notifications[i]->id);
delete notifications[i];
}
notifications.clear();