From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - rest of menus cleared; - old database macroses wiped out from all plugins (left in m_database.h for compatibility) git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/utils.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/TabSRMM/src/utils.cpp') diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index 7248588213..d572cafc2a 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -409,7 +409,7 @@ const TCHAR* Utils::FormatTitleBar(const TWindowData *dat, const TCHAR *szFormat if (!M->GetTString(dat->hContact, (char *)dat->szProto, "XStatusName", &dbv)) { _tcsncpy(szTemp, dbv.ptszVal, 500); szTemp[500] = 0; - DBFreeVariant(&dbv); + db_free(&dbv); title.insert(tempmark + 2, szTemp); curpos = tempmark + lstrlen(szTemp); } @@ -431,7 +431,7 @@ const TCHAR* Utils::FormatTitleBar(const TWindowData *dat, const TCHAR *szFormat if (!M->GetTString(dat->hContact, (char *)dat->szProto, "XStatusName", &dbv)) { _tcsncpy(szTemp, dbv.ptszVal, 500); szTemp[500] = 0; - DBFreeVariant(&dbv); + db_free(&dbv); title.insert(tempmark + 2, szTemp); } else szFinalStatus = xStatusDescr[xStatus - 1]; @@ -721,16 +721,16 @@ int Utils::ReadContainerSettingsFromDB(const HANDLE hContact, TContainerSettings CopyMemory(cs, &PluginConfig.globalContainerSettings, sizeof(TContainerSettings)); - if (0 == DBGetContactSetting(hContact, SRMSGMOD_T, szKey ? szKey : CNT_KEYNAME, &dbv)) { + if (0 == db_get(hContact, SRMSGMOD_T, szKey ? szKey : CNT_KEYNAME, &dbv)) { if (dbv.type == DBVT_BLOB && dbv.cpbVal > 0 && dbv.cpbVal <= sizeof(TContainerSettings)) { ::CopyMemory((void*)cs, (void*)dbv.pbVal, dbv.cpbVal); - ::DBFreeVariant(&dbv); + ::db_free(&dbv); if (hContact == 0 && szKey == 0) cs->fPrivate = false; return 0; } cs->fPrivate = false; - DBFreeVariant(&dbv); + db_free(&dbv); return 1; } else { -- cgit v1.2.3