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/proto.cpp | |
| parent | 646630b565d4fa2d95fd73143198b2d46deb937d (diff) | |
| parent | 2651148625bef56f1fe32c638259d20abb001d68 (diff) | |
Merge branch 'master' of https://github.com/miranda-ng/miranda-ng
Diffstat (limited to 'protocols/FacebookRM/src/proto.cpp')
| -rw-r--r-- | protocols/FacebookRM/src/proto.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 375ef125c9..30ca138e91 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -653,8 +653,7 @@ INT_PTR FacebookProto::CheckNewsfeeds(WPARAM, LPARAM) if (ctrlPressed) { facy.last_feeds_update_ = 0; } - NotifyEvent(m_tszUserName, TranslateT("Loading wall posts..."), NULL, EVENT_OTHER); - ForkThread(&FacebookProto::ProcessFeeds, NULL); + ForkThread(&FacebookProto::ProcessFeeds, MANUALLY_TRIGGERED); } return 0; } @@ -662,8 +661,7 @@ INT_PTR FacebookProto::CheckNewsfeeds(WPARAM, LPARAM) INT_PTR FacebookProto::CheckFriendRequests(WPARAM, LPARAM) { if (!isOffline()) { - NotifyEvent(m_tszUserName, TranslateT("Loading friendship requests..."), NULL, EVENT_OTHER); - ForkThread(&FacebookProto::ProcessFriendRequests, NULL); + ForkThread(&FacebookProto::ProcessFriendRequests, MANUALLY_TRIGGERED); } return 0; } @@ -671,8 +669,7 @@ INT_PTR FacebookProto::CheckFriendRequests(WPARAM, LPARAM) INT_PTR FacebookProto::CheckNotifications(WPARAM, LPARAM) { if (!isOffline()) { - NotifyEvent(m_tszUserName, TranslateT("Loading notifications..."), NULL, EVENT_OTHER); - ForkThread(&FacebookProto::ProcessNotifications, NULL); + ForkThread(&FacebookProto::ProcessNotifications, MANUALLY_TRIGGERED); } return 0; } @@ -680,8 +677,7 @@ INT_PTR FacebookProto::CheckNotifications(WPARAM, LPARAM) INT_PTR FacebookProto::CheckMemories(WPARAM, LPARAM) { if (!isOffline()) { - NotifyEvent(m_tszUserName, TranslateT("Loading memories..."), NULL, EVENT_OTHER); - ForkThread(&FacebookProto::ProcessMemories, NULL); + ForkThread(&FacebookProto::ProcessMemories, MANUALLY_TRIGGERED); } return 0; } @@ -742,7 +738,7 @@ INT_PTR FacebookProto::VisitConversation(WPARAM wParam, LPARAM) if (id == NULL) return 1; - std::string url = FACEBOOK_URL_CONVERSATION + std::string(isChat ? "conversation-" : "") + std::string(id); + std::string url = FACEBOOK_URL_CONVERSATION + std::string(id); OpenUrl(url); return 0; |