fixes #2386 (NewStory: передача файлов в истории)

1 files 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;
 	}
 }