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/JabberG/src/jabber_chat.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/JabberG/src/jabber_chat.cpp') diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 4182cccb23..36a4dbcf40 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -145,7 +145,7 @@ int CJabberProto::GcInit(JABBER_LIST_ITEM* item) DBVARIANT dbv; if (JABBER_LIST_ITEM* bookmark = ListGetItemPtr(LIST_BOOKMARK, item->jid)) if (bookmark->name) { - if ( !DBGetContactSettingTString(hContact, "CList", "MyHandle", &dbv)) + if ( !db_get_ts(hContact, "CList", "MyHandle", &dbv)) db_free(&dbv); else db_set_ts(hContact, "CList", "MyHandle", bookmark->name); @@ -380,7 +380,7 @@ void CJabberProto::GcQuit(JABBER_LIST_ITEM* item, int code, HXML reason) CallServiceSync(MS_GC_EVENT, WINDOW_CLEARLOG, (LPARAM)&gce); DBVARIANT dbvMessage; - if ( !DBGetContactSettingTString(NULL, m_szModuleName, "GcMsgQuit", &dbvMessage)) { + if ( !db_get_ts(NULL, m_szModuleName, "GcMsgQuit", &dbvMessage)) { szMessage = NEWTSTR_ALLOCA(dbvMessage.ptszVal); db_free(&dbvMessage); } @@ -1079,7 +1079,7 @@ static void sttNickListHook(CJabberProto* ppro, JABBER_LIST_ITEM* item, GCHOOK* { if (ppro->m_bJabberOnline) { DBVARIANT dbv = {0}; - TCHAR *szMessage = DBGetContactSettingTString(NULL, ppro->m_szModuleName, "GcMsgSlap", &dbv) ? + TCHAR *szMessage = db_get_ts(NULL, ppro->m_szModuleName, "GcMsgSlap", &dbv) ? NEWTSTR_ALLOCA(TranslateTS(JABBER_GC_MSG_SLAP)) : dbv.ptszVal; TCHAR buf[256]; -- cgit v1.2.3