From e84b97a0622a26fe474ccd840dcadb320520601c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 3 Feb 2014 20:11:26 +0000 Subject: - new helpers for reading db strings into static buffers; - MS_DB_CONTACT_GETSETTINGSTATIC died; - DBCONTACTGETSETTING is detouched from all services; - these service calls are rewritten using parameters git-svn-id: http://svn.miranda-ng.org/main/trunk@8035 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_srv.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/MSN/src/msn_srv.cpp') diff --git a/protocols/MSN/src/msn_srv.cpp b/protocols/MSN/src/msn_srv.cpp index c77d2e8997..bf86fc1706 100644 --- a/protocols/MSN/src/msn_srv.cpp +++ b/protocols/MSN/src/msn_srv.cpp @@ -74,7 +74,7 @@ void CMsnProto::MSN_DeleteServerGroup(LPCSTR szId) if (msc == NULL) break; char szGroupID[100]; - if (!getStaticString(msc->hContact, "GroupID", szGroupID, sizeof(szGroupID))) + if (!db_get_static(msc->hContact, m_szModuleName, "GroupID", szGroupID, sizeof(szGroupID))) { if (strcmp(szGroupID, szId) == 0) delSetting(msc->hContact, "GroupID"); @@ -139,10 +139,10 @@ void CMsnProto::MSN_MoveContactToGroup(HANDLE hContact, const char* grpName) LPCSTR szId = NULL; char szContactID[100], szGroupID[100]; - if (getStaticString(hContact, "ID", szContactID, sizeof(szContactID))) + if (db_get_static(hContact, m_szModuleName, "ID", szContactID, sizeof(szContactID))) return; - if (getStaticString(hContact, "GroupID", szGroupID, sizeof(szGroupID))) + if (db_get_static(hContact, m_szModuleName, "GroupID", szGroupID, sizeof(szGroupID))) szGroupID[0] = 0; bool bInsert = false, bDelete = szGroupID[0] != 0; @@ -194,7 +194,7 @@ void CMsnProto::MSN_RemoveEmptyGroups(void) if (msc == NULL) break; char szGroupID[100]; - if (!getStaticString(msc->hContact, "GroupID", szGroupID, sizeof(szGroupID))) + if (!db_get_static(msc->hContact, m_szModuleName, "GroupID", szGroupID, sizeof(szGroupID))) { const char *pId = szGroupID; int i = grpList.getIndex((ServerGroupItem*)&pId); @@ -237,7 +237,7 @@ void CMsnProto::MSN_UploadServerGroups(char* group) { char szGroupID[100]; if (group == NULL || (strcmp(group, dbv.pszVal) == 0 && - getStaticString(msc->hContact, "GroupID", szGroupID, sizeof(szGroupID)) != 0)) + db_get_static(msc->hContact, m_szModuleName, "GroupID", szGroupID, sizeof(szGroupID)) != 0)) { MSN_MoveContactToGroup(msc->hContact, dbv.pszVal); } -- cgit v1.2.3