From c2e2c85262148dcf71450dfd3c7b33ef41eb84ec Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 18 Jan 2019 23:14:19 +0300 Subject: code cleaning - ACKTYPE_URL removed; - PF1_URL removed; - IEED_EVENT_URL removed; - another URL-related code cleaning --- plugins/Scriver/src/msglog.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'plugins/Scriver/src/msglog.cpp') diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index d7c5198347..b1f8d79df5 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -104,7 +104,6 @@ int DbEventIsShown(DBEVENTINFO &dbei) return 0; case EVENTTYPE_FILE: - case EVENTTYPE_URL: return 1; } @@ -126,7 +125,7 @@ EventData* getEventFromDB(CSrmmWindow *dat, MCONTACT hContact, MEVENT hDbEvent) EventData *evt = (EventData*)mir_calloc(sizeof(EventData)); evt->custom = DbEventIsCustomForMsgWindow(&dbei); - if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_URL || evt->custom)) { + if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || evt->custom)) { db_event_markRead(hContact, hDbEvent); g_clistApi.pfnRemoveEvent(hContact, hDbEvent); } @@ -605,7 +604,6 @@ static char* CreateRTFFromEvent(CSrmmWindow *dat, EventData *evt, GlobalMessageD switch (evt->eventType) { case EVENTTYPE_JABBER_CHATSTATES: case EVENTTYPE_JABBER_PRESENCE: - case EVENTTYPE_URL: case EVENTTYPE_FILE: style = MSGFONTID_NOTICE; buf.AppendFormat("%s ", SetToStyle(style)); @@ -616,13 +614,6 @@ static char* CreateRTFFromEvent(CSrmmWindow *dat, EventData *evt, GlobalMessageD AppendUnicodeToBuffer(buf, TranslateT("File received")); AppendUnicodeToBuffer(buf, L":"); } - else if (evt->eventType == EVENTTYPE_URL) { - if (evt->dwFlags & IEEDF_SENT) - AppendUnicodeToBuffer(buf, TranslateT("URL sent")); - else - AppendUnicodeToBuffer(buf, TranslateT("URL received")); - AppendUnicodeToBuffer(buf, L":"); - } AppendUnicodeToBuffer(buf, L" "); if (evt->pszTextW != nullptr) { -- cgit v1.2.3