diff options
| author | George Hazan <ghazan@miranda.im> | 2019-01-18 23:14:19 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-01-18 23:14:19 +0300 |
| commit | c2e2c85262148dcf71450dfd3c7b33ef41eb84ec (patch) | |
| tree | fe21b2d7677f955168dee25b4fea722dcd06c924 /plugins/Scriver/src | |
| parent | e3bea6d9c261c87d7f67ecc06392c0d0cd4fe2dc (diff) | |
code cleaning
- ACKTYPE_URL removed;
- PF1_URL removed;
- IEED_EVENT_URL removed;
- another URL-related code cleaning
Diffstat (limited to 'plugins/Scriver/src')
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msglog.cpp | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 08802f84c7..2abee8259e 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1316,7 +1316,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) while (hDbEvent != 0) {
DBEVENTINFO dbei = {};
db_event_get(hDbEvent, &dbei);
- if (!(dbei.flags & DBEF_SENT) && (DbEventIsMessageOrCustom(&dbei) || dbei.eventType == EVENTTYPE_URL))
+ if (!(dbei.flags & DBEF_SENT) && DbEventIsMessageOrCustom(&dbei))
g_clistApi.pfnRemoveEvent(m_hContact, hDbEvent);
hDbEvent = db_event_next(m_hContact, hDbEvent);
}
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) {
|