summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_menu.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-03-05 21:16:04 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-03-05 21:16:11 +0300
commit94c711953d71b21e4cc4c950dec921b253ae0d54 (patch)
tree1b627434871ae469cce098fc69a881291e249949 /protocols/JabberG/src/jabber_menu.cpp
parent40478d50b60d8c2e0711b3b0691c80be6b2da290 (diff)
Jabber: code cleaning & simplification
Diffstat (limited to 'protocols/JabberG/src/jabber_menu.cpp')
-rw-r--r--protocols/JabberG/src/jabber_menu.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index f5026821e6..02fc077c4f 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -455,7 +455,7 @@ INT_PTR __cdecl CJabberProto::OnMenuRosterAdd(WPARAM hContact, LPARAM)
ptrW nick(getWStringA(hContact, "Nick"));
AddContactToRoster(roomID, nick, group);
- if (m_options.AddRoster2Bookmarks == TRUE) {
+ if (m_bAddRoster2Bookmarks == TRUE) {
JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_BOOKMARK, roomID);
if (item == nullptr) {
item = new JABBER_LIST_ITEM();
@@ -899,7 +899,7 @@ int CJabberProto::OnProcessSrmmEvent(WPARAM, LPARAM lParam)
ptrW jid(getWStringA(event->hContact, "jid"));
if (jid != nullptr) {
JABBER_LIST_ITEM *pItem = ListGetItemPtr(LIST_ROSTER, jid);
- if (pItem && m_ThreadInfo && (m_ThreadInfo->jabberServerCaps & JABBER_CAPS_ARCHIVE_AUTO) && m_options.EnableMsgArchive)
+ if (pItem && m_ThreadInfo && (m_ThreadInfo->jabberServerCaps & JABBER_CAPS_ARCHIVE_AUTO) && m_bEnableMsgArchive)
RetrieveMessageArchive(event->hContact, pItem);
}
}
@@ -1063,7 +1063,7 @@ CJabberProto* JabberChooseInstance(bool bIsLink)
if (bIsLink)
for (auto &it : g_Instances)
- if (it->m_options.ProcessXMPPLinks)
+ if (it->m_bProcessXMPPLinks)
return it;
int nItems = 0, lastItemId = 0;