From 5df6d44b96e14bd9a351971b76e1f25ce1305940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Wed, 15 May 2013 19:08:18 +0000 Subject: Fixes for Facebook and TabSRMM setting statusbar text. git-svn-id: http://svn.miranda-ng.org/main/trunk@4663 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/msgs.cpp | 7 +++++++ protocols/FacebookRM/src/json.cpp | 4 ++-- protocols/FacebookRM/src/messages.cpp | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index 6d7de7f81f..65a1adea23 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -144,6 +144,13 @@ static INT_PTR SetStatusText(WPARAM wParam, LPARAM lParam) TWindowData *dat = (TWindowData*)GetWindowLongPtr(hwnd, GWLP_USERDATA); if (dat == NULL || (pContainer = dat->pContainer) == NULL) return 1; + + if (lParam == NULL) { + DM_UpdateLastMessage(dat); + return 0; + } + + _tcsncpy(dat->szStatusBar, (TCHAR *)lParam, SIZEOF(dat->szStatusBar)); } else { SESSION_INFO *si = SM_FindSessionByHCONTACT((HANDLE)wParam); diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp index 4da26c5d93..34660bc1d6 100644 --- a/protocols/FacebookRM/src/json.cpp +++ b/protocols/FacebookRM/src/json.cpp @@ -344,9 +344,9 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa // TODO: add check for chat contacts HANDLE hContact = proto->ContactIDToHContact(user_id); if (hContact) { - TCHAR ttime[100], tstr[200]; + TCHAR ttime[64], tstr[100]; _tcsftime(ttime, SIZEOF(ttime), _T("%X"), utils::conversion::fbtime_to_timeinfo(time.Value())); - mir_sntprintf(tstr, SIZEOF(tstr), TranslateT("Message read at %s"), ttime); + mir_sntprintf(tstr, SIZEOF(tstr), TranslateT("Message read: %s"), ttime); CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hContact, (LPARAM)tstr); } diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp index 369d392733..0ef3bdb325 100644 --- a/protocols/FacebookRM/src/messages.cpp +++ b/protocols/FacebookRM/src/messages.cpp @@ -65,6 +65,7 @@ void FacebookProto::SendMsgWorker(void *p) } if (result) { ProtoBroadcastAck(m_szModuleName,data->hContact,ACKTYPE_MESSAGE,ACKRESULT_SUCCESS, data->msgid,0); + CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)data->hContact, NULL); MessagingWorker(new send_messaging(dbv.pszVal, FACEBOOK_SEND_MESSAGE)); } else { char *err = mir_utf8decodeA(error_text.c_str()); -- cgit v1.2.3