new helper applied instead of MS_DB_SETSETTINGRESIDENT

git-svn-id: http://svn.miranda-ng.org/main/trunk@5094 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 14 insertions, 23 deletions

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 51ce197008..5aa836733f 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -106,20 +106,20 @@ int CMraProto::OnModulesLoaded(WPARAM, LPARAM)
 		SetContactBasicInfoW(hContact, SCBIFSI_LOCK_CHANGES_EVENTS, (SCBIF_ID|SCBIF_GROUP_ID|SCBIF_SERVER_FLAG|SCBIF_STATUS), -1, -1, 0, 0, ID_STATUS_OFFLINE, NULL, 0, NULL, 0, NULL, 0);

 

 	// unsaved values

-	DB_MraCreateResidentSetting("Status");// NOTE: XStatus cannot be temporary

-	DB_MraCreateResidentSetting("LogonTS");

-	DB_MraCreateResidentSetting("ContactID");

-	DB_MraCreateResidentSetting("GroupID");

-	DB_MraCreateResidentSetting("ContactFlags");

-	DB_MraCreateResidentSetting("ContactSeverFlags");

-	DB_MraCreateResidentSetting("HooksLocked");

-	DB_MraCreateResidentSetting(DBSETTING_CAPABILITIES);

-	DB_MraCreateResidentSetting(DBSETTING_XSTATUSNAME);

-	DB_MraCreateResidentSetting(DBSETTING_XSTATUSMSG);

-	DB_MraCreateResidentSetting(DBSETTING_BLOGSTATUSTIME);

-	DB_MraCreateResidentSetting(DBSETTING_BLOGSTATUSID);

-	DB_MraCreateResidentSetting(DBSETTING_BLOGSTATUS);

-	DB_MraCreateResidentSetting(DBSETTING_BLOGSTATUSMUSIC);

+	db_set_resident(m_szModuleName, "Status");// NOTE: XStatus cannot be temporary

+	db_set_resident(m_szModuleName, "LogonTS");

+	db_set_resident(m_szModuleName, "ContactID");

+	db_set_resident(m_szModuleName, "GroupID");

+	db_set_resident(m_szModuleName, "ContactFlags");

+	db_set_resident(m_szModuleName, "ContactSeverFlags");

+	db_set_resident(m_szModuleName, "HooksLocked");

+	db_set_resident(m_szModuleName, DBSETTING_CAPABILITIES);

+	db_set_resident(m_szModuleName, DBSETTING_XSTATUSNAME);

+	db_set_resident(m_szModuleName, DBSETTING_XSTATUSMSG);

+	db_set_resident(m_szModuleName, DBSETTING_BLOGSTATUSTIME);

+	db_set_resident(m_szModuleName, DBSETTING_BLOGSTATUSID);

+	db_set_resident(m_szModuleName, DBSETTING_BLOGSTATUS);

+	db_set_resident(m_szModuleName, DBSETTING_BLOGSTATUSMUSIC);

 

 	// destroy all chat sessions

 	if (bChatExists)

diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index f1205fbbd4..2ba636de92 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -255,8 +255,6 @@ struct CMraProto : public PROTO_INTERFACE
 

 	void   MraAddrListStoreToContact(HANDLE hContact, MRA_ADDR_LIST *pmalAddrList);

 

-	void   DB_MraCreateResidentSetting(LPSTR lpszValueName);

-

 	DWORD  GetContactFlags(HANDLE hContact);

 	DWORD  SetContactFlags(HANDLE hContact, DWORD dwContactFlag);

 	DWORD  GetContactBasicInfoW(HANDLE hContact, DWORD *pdwID, DWORD *pdwGroupID, DWORD *pdwContactFlag, DWORD *pdwContactSeverFlags, DWORD *pdwStatus, LPSTR lpszEMail, size_t dwEMailSize, size_t *pdwEMailSize, LPWSTR lpwszNick, size_t dwNickSize, size_t *pdwNickSize, LPSTR lpszPhones, size_t dwPhonesSize, size_t *pdwPhonesSize);

diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 4ecd258377..d4a5f657ac 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -202,13 +202,6 @@ void MraAddrListFree(MRA_ADDR_LIST *pmalAddrList)
 	}

 }

 

-void CMraProto::DB_MraCreateResidentSetting(LPSTR lpszValueName)

-{

-	char szSetting[2*MAX_PATH];

-	mir_snprintf(szSetting, SIZEOF(szSetting), "%s/%s", m_szModuleName, lpszValueName);

-	CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (WPARAM)szSetting);

-}

-

 BOOL DB_GetStaticStringA(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, LPSTR lpszRetBuff, size_t dwRetBuffSize, size_t *pdwRetBuffSize)

 {

 	BOOL bRet = FALSE;