From 709dc2c6521ebced9cba68e0403342d81fa629dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 5 May 2020 11:47:14 +0300 Subject: =?UTF-8?q?fixes=20#2386=20(NewStory:=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B0=D1=87=D0=B0=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B2=20=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/NewStory/src/history_array.cpp | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp index 83c44da0e0..3b8512738e 100644 --- a/plugins/NewStory/src/history_array.cpp +++ b/plugins/NewStory/src/history_array.cpp @@ -52,36 +52,20 @@ void ItemData::load(bool bFullLoad) bLoaded = true; switch (dbe.eventType) { - case EVENTTYPE_STATUSCHANGE: - wtext = mir_utf8decodeW((char*)dbe.pBlob); - break; - case EVENTTYPE_MESSAGE: - wtext = mir_utf8decodeW((char *)dbe.pBlob); - if (!(dbe.flags & DBEF_SENT)) { if (!dbe.markedRead()) db_event_markRead(hContact, hEvent); g_clistApi.pfnRemoveEvent(hContact, hEvent); } - break; + __fallthrough; - case EVENTTYPE_JABBER_PRESENCE: - wtext = DbEvent_GetTextW(&dbe, CP_ACP); - break; - - case EVENTTYPE_AUTHREQUEST: - if ((dbe.cbBlob > 8) && *(dbe.pBlob + 8)) - wtext = CMStringW(FORMAT, L"%s requested authorization", Utf2T((char*)dbe.pBlob + 8).get()).Detach(); - else - wtext = CMStringW(FORMAT, L"%d requested authorization", *(DWORD *)(dbe.pBlob)).Detach(); + case EVENTTYPE_STATUSCHANGE: + wtext = mir_utf8decodeW((char *)dbe.pBlob); break; - case EVENTTYPE_ADDED: - if ((dbe.cbBlob > 8) && *(dbe.pBlob + 8)) - wtext = CMStringW(FORMAT, L"%s added you to the contact list", Utf2T((char *)dbe.pBlob + 8).get()).Detach(); - else - wtext = CMStringW(FORMAT, L"%d added you to the contact list", *(DWORD *)(dbe.pBlob)).Detach(); + default: + wtext = DbEvent_GetTextW(&dbe, CP_ACP); break; } } -- cgit v1.2.3