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 --- protocols/MSN/src/msn_proto.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'protocols/MSN/src/msn_proto.cpp') diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 8df8e48531..04a079bfd3 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -114,10 +114,10 @@ CMsnProto::CMsnProto(const char* aProtoName, const TCHAR* aUserName) : if (MyOptions.SlowSend) { - if (DBGetContactSettingDword(NULL, "SRMsg", "MessageTimeout", 10000) < 60000) - DBWriteContactSettingDword(NULL, "SRMsg", "MessageTimeout", 60000); - if (DBGetContactSettingDword(NULL, "SRMM", "MessageTimeout", 10000) < 60000) - DBWriteContactSettingDword(NULL, "SRMM", "MessageTimeout", 60000); + if (db_get_dw(NULL, "SRMsg", "MessageTimeout", 10000) < 60000) + db_set_dw(NULL, "SRMsg", "MessageTimeout", 60000); + if (db_get_dw(NULL, "SRMM", "MessageTimeout", 10000) < 60000) + db_set_dw(NULL, "SRMM", "MessageTimeout", 60000); } mailsoundname = (char*)mir_alloc(64); @@ -244,12 +244,12 @@ HANDLE CMsnProto::AddToListByEmail(const char *email, const char *nick, DWORD fl if (flags & PALF_TEMPORARY) { - if (DBGetContactSettingByte(hContact, "CList", "NotOnList", 0) == 1) - DBWriteContactSettingByte(hContact, "CList", "Hidden", 1); + if (db_get_b(hContact, "CList", "NotOnList", 0) == 1) + db_set_b(hContact, "CList", "Hidden", 1); } else { - DBDeleteContactSetting(hContact, "CList", "Hidden"); + db_unset(hContact, "CList", "Hidden"); if (msnLoggedIn) { // int netId = Lists_GetNetId(email); @@ -260,7 +260,7 @@ HANDLE CMsnProto::AddToListByEmail(const char *email, const char *nick, DWORD fl MSN_AddUser(hContact, email, netId, LIST_PL + LIST_REMOVE); MSN_AddUser(hContact, email, netId, LIST_BL + LIST_REMOVE); MSN_AddUser(hContact, email, netId, LIST_AL); - DBDeleteContactSetting(hContact, "CList", "Hidden"); + db_unset(hContact, "CList", "Hidden"); } MSN_SetContactDb(hContact, email); @@ -681,7 +681,7 @@ void __cdecl CMsnProto::MsnGetAwayMsgThread(void* arg) AwayMsgInfo *inf = (AwayMsgInfo*)arg; DBVARIANT dbv; - if (!DBGetContactSettingTString(inf->hContact, "CList", "StatusMsg", &dbv)) { + if (!db_get_ts(inf->hContact, "CList", "StatusMsg", &dbv)) { SendBroadcast(inf->hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)inf->id, (LPARAM)dbv.ptszVal); MSN_FreeVariant(&dbv); } @@ -771,7 +771,7 @@ int __cdecl CMsnProto::RecvMsg(HANDLE hContact, PROTORECVEVENT* pre) getStaticString(hContact, "e-mail", tEmail, sizeof(tEmail)); if (Lists_IsInList(LIST_FL, tEmail)) - DBDeleteContactSetting(hContact, "CList", "Hidden"); + db_unset(hContact, "CList", "Hidden"); return Proto_RecvMessage(hContact, pre); } -- cgit v1.2.3