From 373e84ed50b36d871bab20b5b7ba8710a693ec7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Wed, 23 Apr 2014 10:00:43 +0000 Subject: Facebook: Revert typing notifications for multi chats for more users at once It didn't worked correctly. (reverted from commit 81ba747d2b0ecb750bc7fb5cf6e3a194024a67dc) git-svn-id: http://svn.miranda-ng.org/main/trunk@9055 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/entities.h | 1 - protocols/FacebookRM/src/json.cpp | 15 ++++----------- 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'protocols/FacebookRM') diff --git a/protocols/FacebookRM/src/entities.h b/protocols/FacebookRM/src/entities.h index 0e8fb29522..ba3573a106 100644 --- a/protocols/FacebookRM/src/entities.h +++ b/protocols/FacebookRM/src/entities.h @@ -91,7 +91,6 @@ struct facebook_chatroom std::map participants; std::string message_readers; - std::string message_typers; DWORD last_active; }; diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp index e5c8150ebe..874d0e6f16 100644 --- a/protocols/FacebookRM/src/json.cpp +++ b/protocols/FacebookRM/src/json.cpp @@ -619,21 +619,14 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa participant = chatroom->second.participants.find(from_id); if (participant != chatroom->second.participants.end()) { MCONTACT hChatContact = proto->ChatIDToHContact(tid); - - if (!chatroom->second.message_typers.empty()) - chatroom->second.message_typers += ", "; - chatroom->second.message_typers += participant->second.c_str(); - - ptrT typers(mir_utf8decodeT(chatroom->second.message_typers.c_str())); + ptrT name(mir_utf8decodeT(participant->second.c_str())); TCHAR tstr[200]; - if (json_as_int(st_) == 1) { - mir_sntprintf(tstr, SIZEOF(tstr), TranslateT("%s is typing a message..."), typers); - } else { - chatroom->second.message_typers = ""; + if (json_as_int(st_) == 1) + mir_sntprintf(tstr, SIZEOF(tstr), TranslateT("%s is typing a message..."), name); + else mir_sntprintf(tstr, SIZEOF(tstr), _T("")); - } // TODO: support proper MS_PROTO_CONTACTISTYPING service for chatrooms (when it will be implemented) CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hChatContact, (LPARAM)tstr); -- cgit v1.2.3