summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2015-02-07 08:43:56 +0000
committerRobert Pösel <robyer@seznam.cz>2015-02-07 08:43:56 +0000
commit10a687c170007cc523d4cba3ed0ce5e1671d5af1 (patch)
tree7ea457051e8ff880d05f7e8b4ffa9e579002e773
parentb59a7efc33992c608a22af334cb6de3bb7dbc339 (diff)
Facebook: Realtime notify of new friendship requests; Version bump for new changes
git-svn-id: http://svn.miranda-ng.org/main/trunk@12039 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/FacebookRM/src/connection.cpp3
-rw-r--r--protocols/FacebookRM/src/json.cpp4
-rw-r--r--protocols/FacebookRM/src/version.h4
3 files changed, 6 insertions, 5 deletions
diff --git a/protocols/FacebookRM/src/connection.cpp b/protocols/FacebookRM/src/connection.cpp
index 2ccc754c76..4548d2965e 100644
--- a/protocols/FacebookRM/src/connection.cpp
+++ b/protocols/FacebookRM/src/connection.cpp
@@ -209,9 +209,6 @@ void FacebookProto::UpdateLoop(void *)
ProcessFeeds(NULL);
}
- if (i == 49)
- ProcessFriendRequests(NULL);
-
debugLogA("***** FacebookProto::UpdateLoop[%d] going to sleep...", tim);
if (WaitForSingleObjectEx(update_loop_lock_, GetPollRate() * 1000, true) != WAIT_TIMEOUT)
break;
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp
index f47a1a0528..cf715a9aba 100644
--- a/protocols/FacebookRM/src/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
@@ -642,6 +642,10 @@ int facebook_json_parser::parse_messages(std::string *data, std::vector< faceboo
proto->NotifyEvent(proto->m_tszUserName, ptrT(mir_utf8decodeT(text.c_str())), NULL, FACEBOOK_EVENT_FRIENDSHIP, &url, alert_id.empty() ? NULL : &alert_id);
}
}
+ else if (t == "jewel_requests_add") {
+ // New friendship request, load them all with real names (because there is only user_id in "from" field)
+ proto->ForkThread(&FacebookProto::ProcessFriendRequests, NULL);
+ }
else if (t == "typ") {
// chat typing notification
diff --git a/protocols/FacebookRM/src/version.h b/protocols/FacebookRM/src/version.h
index 1540bbbb75..794b425e87 100644
--- a/protocols/FacebookRM/src/version.h
+++ b/protocols/FacebookRM/src/version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 2
-#define __RELEASE_NUM 9
-#define __BUILD_NUM 10
+#define __RELEASE_NUM 10
+#define __BUILD_NUM 0
#include <stdver.h>