diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-09-13 17:11:58 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-09-13 17:11:58 +0000 |
| commit | f51995e13679a37851baef8e7f52f2d993cbc7c1 (patch) | |
| tree | 25ccd03cf2dc4b897cc0dc6fcbe4cc78ddb122c7 /plugins/Scriver/src | |
| parent | fe1e8456d2488095f409a4f2d38b7251abdedccf (diff) | |
mode old database junk to die
git-svn-id: http://svn.miranda-ng.org/main/trunk@17291 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/src')
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msglog.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index c8649ee804..8962d354fe 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1670,7 +1670,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dbei.pBlob = (PBYTE)mir_alloc(dbei.cbBlob);
db_event_get(dat->hDbEventLast, &dbei);
if (DbEventIsMessageOrCustom(&dbei)) {
- buffer = DbGetEventTextW(&dbei, CP_ACP);
+ buffer = DbEvent_GetTextW(&dbei, CP_ACP);
if (buffer != NULL) {
wchar_t *quotedBuffer = GetQuotedTextW(buffer);
SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)quotedBuffer);
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index 129ad0818a..be1a850a03 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -85,7 +85,7 @@ struct LogStreamData int DbEventIsCustomForMsgWindow(DBEVENTINFO *dbei)
{
- DBEVENTTYPEDESCR *et = (DBEVENTTYPEDESCR*)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);
+ DBEVENTTYPEDESCR *et = DbEvent_GetType(dbei->szModule, dbei->eventType);
return et && (et->flags & DETF_MSGWINDOW);
}
@@ -151,11 +151,11 @@ EventData* getEventFromDB(SrmmWindowData *dat, MCONTACT hContact, MEVENT hDbEven if (evt->eventType == EVENTTYPE_FILE) {
char *filename = ((char*)dbei.pBlob) + sizeof(DWORD);
char *descr = filename + mir_strlen(filename) + 1;
- evt->pszTextT = DbGetEventStringT(&dbei, filename);
+ evt->pszTextT = DbEvent_GetString(&dbei, filename);
if (*descr != 0)
- evt->pszText2T = DbGetEventStringT(&dbei, descr);
+ evt->pszText2T = DbEvent_GetString(&dbei, descr);
}
- else evt->pszTextT = DbGetEventTextW(&dbei, CP_UTF8);
+ else evt->pszTextT = DbEvent_GetTextW(&dbei, CP_UTF8);
if (!(dat->flags & SMF_RTL) && RTL_Detect(evt->pszTextT))
evt->dwFlags |= IEEDF_RTL;
|