Skip to content

Commit b497f10

Browse files
committed
libtransport: oob_split should not be default mode
1 parent d670192 commit b497f10

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

libtransport/Config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
100100
("service.enable_xhtml", value<bool>()->default_value(true), "")
101101
("service.enable_remove_buddy", value<bool>()->default_value(false), "Remove your legacy network buddies when you unsubscribe from them. If disabled, you can still remove them in Spectrum but they'll remain on the legacy network roster.")
102102
("service.oob_replace_body", value<bool>()->default_value(true), "Media messages: replace plaintext with a single media URL. Loses any plaintext captions and formatting but has better support in XMPP clients.")
103-
("service.oob_split", value<bool>()->default_value(true), "Split mixed media/text or multiple media attachments into several messages. Ensures better compatibility with poorly implemented XMPP clients.")
103+
("service.oob_split", value<bool>()->default_value(false), "Split mixed media/text or multiple media attachments into several messages. Ensures better compatibility with poorly implemented XMPP clients.")
104104
("service.max_room_list_size", value<int>()->default_value(100), "")
105105
("service.login_delay", value<int>()->default_value(0), "")
106106
("service.jid_escaping", value<bool>()->default_value(true), "")

libtransport/NetworkPluginServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@ NetworkPluginServer::wrapIncomingMedia(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swif
18861886
const std::string body = msg->getBody().get();
18871887

18881888
OobMode oobMode = OobWrapAll;
1889-
if (CONFIG_BOOL_DEFAULTED(m_config, "service.oob_split", true))
1889+
if (CONFIG_BOOL_DEFAULTED(m_config, "service.oob_split", false))
18901890
//Split the message into parts so that each part only contains one media instance or one chunk of text
18911891
oobMode = OobSplit;
18921892
else if (CONFIG_BOOL_DEFAULTED(m_config, "service.oob_replace_body", false))

0 commit comments

Comments
 (0)