summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_chat.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_chat.cpp
parent40478d50b60d8c2e0711b3b0691c80be6b2da290 (diff)
Jabber: code cleaning & simplification
Diffstat (limited to 'protocols/JabberG/src/jabber_chat.cpp')
-rw-r--r--protocols/JabberG/src/jabber_chat.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index cf8ee50da7..a2eeaf620f 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -162,7 +162,7 @@ int CJabberProto::GcInit(JABBER_LIST_ITEM *item)
for (int i = _countof(sttStatuses) - 1; i >= 0; i--)
Chat_AddGroup(m_szModuleName, item->jid, TranslateW(sttStatuses[i]));
- Chat_Control(m_szModuleName, item->jid, (item->bAutoJoin && m_options.AutoJoinHidden) ? WINDOW_HIDDEN : SESSION_INITDONE);
+ Chat_Control(m_szModuleName, item->jid, (item->bAutoJoin && m_bAutoJoinHidden) ? WINDOW_HIDDEN : SESSION_INITDONE);
Chat_Control(m_szModuleName, item->jid, SESSION_ONLINE);
return 0;
}
@@ -175,12 +175,12 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, pResourceStatus
switch (type) {
case INFO_BAN:
- if (m_options.GcLogBans)
+ if (m_bGcLogBans)
buf.Format(TranslateT("User %s is now banned."), user->m_tszResourceName);
break;
case INFO_STATUS:
- if (m_options.GcLogStatuses) {
+ if (m_bGcLogStatuses) {
wchar_t *ptszDescr = pcli->pfnGetStatusModeDescription(user->m_iStatus, 0);
if (user->m_tszStatusMessage)
buf.Format(TranslateT("User %s changed status to %s with message: %s"),
@@ -191,12 +191,12 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, pResourceStatus
break;
case INFO_CONFIG:
- if (m_options.GcLogConfig)
+ if (m_bGcLogConfig)
buf.Format(TranslateT("Room configuration was changed."));
break;
case INFO_AFFILIATION:
- if (m_options.GcLogAffiliations) {
+ if (m_bGcLogAffiliations) {
wchar_t *name = nullptr;
switch (user->m_affiliation) {
case AFFILIATION_NONE: name = TranslateT("None"); break;
@@ -211,7 +211,7 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, pResourceStatus
break;
case INFO_ROLE:
- if (m_options.GcLogRoles) {
+ if (m_bGcLogRoles) {
wchar_t *name = nullptr;
switch (user->m_role) {
case ROLE_NONE: name = TranslateT("None"); break;