summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_proto.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
-rwxr-xr-xprotocols/JabberG/src/jabber_proto.cpp106
1 files changed, 53 insertions, 53 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index b0315b72ca..c3fc9162df 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -73,63 +73,63 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
m_uEnabledFeatCapsDynamic(0),
m_StrmMgmt(this),
- m_bBsDirect(this, "BsDirect", TRUE),
- m_bAllowVersionRequests(this, "m_bAllowVersionRequests", TRUE),
- m_bAcceptHttpAuth(this, "m_bAcceptHttpAuth", TRUE),
- m_bAddRoster2Bookmarks(this, "m_bAddRoster2Bookmarks", TRUE),
- m_bAutoAcceptAuthorization(this, "AutoAcceptAuthorization", FALSE),
- m_bAutoAcceptMUC(this, "AutoAcceptMUC", FALSE),
- m_bAutoAdd(this, "AutoAdd", TRUE),
- m_bAutoJoinBookmarks(this, "AutoJoinBookmarks", TRUE),
+ m_bBsDirect(this, "BsDirect", true),
+ m_bAllowVersionRequests(this, "m_bAllowVersionRequests", true),
+ m_bAcceptHttpAuth(this, "m_bAcceptHttpAuth", true),
+ m_bAddRoster2Bookmarks(this, "m_bAddRoster2Bookmarks", true),
+ m_bAutoAcceptAuthorization(this, "AutoAcceptAuthorization", false),
+ m_bAutoAcceptMUC(this, "AutoAcceptMUC", false),
+ m_bAutoAdd(this, "AutoAdd", true),
+ m_bAutoJoinBookmarks(this, "AutoJoinBookmarks", true),
m_bAutoJoinConferences(this, "AutoJoinConferences", 0),
- m_bAutoJoinHidden(this, "AutoJoinHidden", TRUE),
+ m_bAutoJoinHidden(this, "AutoJoinHidden", true),
m_bAvatarType(this, "AvatarType", PA_FORMAT_UNKNOWN),
- m_bBsDirectManual(this, "BsDirectManual", FALSE),
- m_bBsOnlyIBB(this, "BsOnlyIBB", FALSE),
- m_bBsProxyManual(this, "BsProxyManual", FALSE),
- m_bDisable3920auth(this, "Disable3920auth", FALSE),
- m_bDisableFrame(this, "DisableFrame", TRUE),
- m_bEnableAvatars(this, "EnableAvatars", TRUE),
- m_bEnableRemoteControl(this, "EnableRemoteControl", FALSE),
- m_bEnableMsgArchive(this, "EnableMsgArchive", FALSE),
- m_bEnableUserActivity(this, "EnableUserActivity", TRUE),
- m_bEnableUserMood(this, "EnableUserMood", TRUE),
- m_bEnableUserTune(this, "EnableUserTune", FALSE),
- m_bEnableZlib(this, "EnableZlib", TRUE),
- m_bExtendedSearch(this, "ExtendedSearch", TRUE),
- m_bFixIncorrectTimestamps(this, "FixIncorrectTimestamps", TRUE),
- m_bGcLogAffiliations(this, "GcLogAffiliations", FALSE),
- m_bGcLogBans(this, "GcLogBans", TRUE),
- m_bGcLogConfig(this, "GcLogConfig", FALSE),
- m_bGcLogRoles(this, "GcLogRoles", FALSE),
- m_bGcLogStatuses(this, "GcLogStatuses", FALSE),
- m_bGcLogChatHistory(this, "GcLogChatHistory", TRUE),
- m_bHostNameAsResource(this, "HostNameAsResource", FALSE),
- m_bIgnoreMUCInvites(this, "IgnoreMUCInvites", FALSE),
- m_bKeepAlive(this, "KeepAlive", TRUE),
- m_bLogChatstates(this, "LogChatstates", FALSE),
- m_bLogPresence(this, "LogPresence", TRUE),
- m_bLogPresenceErrors(this, "LogPresenceErrors", FALSE),
- m_bManualConnect(this, "ManualConnect", FALSE),
- m_bMsgAck(this, "MsgAck", FALSE),
- m_bRosterSync(this, "RosterSync", FALSE),
- m_bSavePassword(this, "SavePassword", TRUE),
- m_bShowForeignResourceInMirVer(this, "ShowForeignResourceInMirVer", FALSE),
- m_bShowOSVersion(this, "ShowOSVersion", TRUE),
- m_bShowTransport(this, "ShowTransport", TRUE),
- m_bUseSSL(this, "UseSSL", FALSE),
- m_bUseTLS(this, "UseTLS", TRUE),
- m_bUseDomainLogin(this, "UseDomainLogin", FALSE),
- m_bAcceptNotes(this, "AcceptNotes", TRUE),
- m_bAutosaveNotes(this, "AutosaveNotes", FALSE),
+ m_bBsDirectManual(this, "BsDirectManual", false),
+ m_bBsOnlyIBB(this, "BsOnlyIBB", false),
+ m_bBsProxyManual(this, "BsProxyManual", false),
+ m_bDisable3920auth(this, "Disable3920auth", false),
+ m_bDisableFrame(this, "DisableFrame", true),
+ m_bEnableAvatars(this, "EnableAvatars", true),
+ m_bEnableRemoteControl(this, "EnableRemoteControl", false),
+ m_bEnableMsgArchive(this, "EnableMsgArchive", false),
+ m_bEnableUserActivity(this, "EnableUserActivity", true),
+ m_bEnableUserMood(this, "EnableUserMood", true),
+ m_bEnableUserTune(this, "EnableUserTune", false),
+ m_bEnableZlib(this, "EnableZlib", true),
+ m_bExtendedSearch(this, "ExtendedSearch", true),
+ m_bFixIncorrectTimestamps(this, "FixIncorrectTimestamps", true),
+ m_bGcLogAffiliations(this, "GcLogAffiliations", false),
+ m_bGcLogBans(this, "GcLogBans", true),
+ m_bGcLogConfig(this, "GcLogConfig", false),
+ m_bGcLogRoles(this, "GcLogRoles", false),
+ m_bGcLogStatuses(this, "GcLogStatuses", false),
+ m_bGcLogChatHistory(this, "GcLogChatHistory", true),
+ m_bHostNameAsResource(this, "HostNameAsResource", false),
+ m_bIgnoreMUCInvites(this, "IgnoreMUCInvites", false),
+ m_bKeepAlive(this, "KeepAlive", true),
+ m_bLogChatstates(this, "LogChatstates", false),
+ m_bLogPresence(this, "LogPresence", true),
+ m_bLogPresenceErrors(this, "LogPresenceErrors", false),
+ m_bManualConnect(this, "ManualConnect", false),
+ m_bMsgAck(this, "MsgAck", false),
+ m_bRosterSync(this, "RosterSync", false),
+ m_bSavePassword(this, "SavePassword", true),
+ m_bShowForeignResourceInMirVer(this, "ShowForeignResourceInMirVer", false),
+ m_bShowOSVersion(this, "ShowOSVersion", true),
+ m_bShowTransport(this, "ShowTransport", true),
+ m_bUseSSL(this, "UseSSL", false),
+ m_bUseTLS(this, "UseTLS", true),
+ m_bUseDomainLogin(this, "UseDomainLogin", false),
+ m_bAcceptNotes(this, "AcceptNotes", true),
+ m_bAutosaveNotes(this, "AutosaveNotes", false),
m_bRcMarkMessagesAsRead(this, "RcMarkMessagesAsRead", 1),
m_iConnectionKeepAliveInterval(this, "ConnectionKeepAliveInterval", 60000),
m_iConnectionKeepAliveTimeout(this, "ConnectionKeepAliveTimeout", 50000),
- m_bProcessXMPPLinks(this, "ProcessXMPPLinks", FALSE),
- m_bIgnoreRosterGroups(this, "IgnoreRosterGroups", FALSE),
- m_bEnableCarbons(this, "EnableCarbons", TRUE),
- m_bUseOMEMO(this, "UseOMEMO", FALSE),
- m_bEnableStreamMgmt(this, "UseStreamMgmt", TRUE)
+ m_bProcessXMPPLinks(this, "ProcessXMPPLinks", false),
+ m_bIgnoreRosterGroups(this, "IgnoreRosterGroups", false),
+ m_bEnableCarbons(this, "EnableCarbons", true),
+ m_bUseOMEMO(this, "UseOMEMO", false),
+ m_bEnableStreamMgmt(this, "UseStreamMgmt", false)
{
m_szXmlStreamToBeInitialized = nullptr;
@@ -428,7 +428,7 @@ int CJabberProto::Authorize(MEVENT hDbEvent)
m_ThreadInfo->send(XmlNode(L"presence") << XATTR(L"to", newJid) << XATTR(L"type", L"subscribed"));
// Automatically add this user to my roster if option is enabled
- if (m_bAutoAdd == TRUE) {
+ if (m_bAutoAdd == true) {
JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_ROSTER, newJid);
if (item == nullptr || (item->subscription != SUB_BOTH && item->subscription != SUB_TO)) {
debugLogW(L"Try adding contact automatically jid = %s", blob.get_email());