summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2016-06-05 13:35:03 +0200
committermathieui <mathieui@mathieui.net>2016-06-05 13:35:03 +0200
commitc00cfecdf86175446fe89480184fdf419b9c1c2a (patch)
treefdc1479ad4c4237aea0f4701cdb937744dfd34f5
parentcf595c0ffd06f9b69f0466009516bf02bbc3ad99 (diff)
downloadpoezio-c00cfecdf86175446fe89480184fdf419b9c1c2a.tar.gz
poezio-c00cfecdf86175446fe89480184fdf419b9c1c2a.tar.bz2
poezio-c00cfecdf86175446fe89480184fdf419b9c1c2a.tar.xz
poezio-c00cfecdf86175446fe89480184fdf419b9c1c2a.zip
Enable message carbons by default
-rw-r--r--data/default_config.cfg2
-rw-r--r--doc/source/configuration.rst8
-rw-r--r--src/config.py2
3 files changed, 7 insertions, 5 deletions
diff --git a/data/default_config.cfg b/data/default_config.cfg
index e3d32d22..e463b7b4 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -410,7 +410,7 @@ notify_messages = true
# Enable Message Carbons (XEP-0280) to deliver message copies from and to
# other resources with carbons enabled.
-enable_carbons = false
+enable_carbons = true
# Acknowledge message delivery receipts (XEP-0184)
ack_message_receipts = true
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index a21159b3..9310ccbd 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -295,10 +295,12 @@ to understand what is :ref:`carbons <carbons-details>` or
enable_carbons
- **Default value:** ``false``
+ **Default value:** ``true``
- Set this to ``true`` to enable Message Carbons (XEP-280), which allows transparent message
- delivery from and to other resources with carbons enabled.
+ Set this to ``false`` to disable Message Carbons (XEP-280), which allows
+ transparent message delivery from and to other resources with carbons
+ enabled. There should be no reason to disable this except if you encounter
+ issues with your server.
enable_user_activity
diff --git a/src/config.py b/src/config.py
index e8e3269a..307e8e47 100644
--- a/src/config.py
+++ b/src/config.py
@@ -50,7 +50,7 @@ DEFAULT_CONFIG = {
'display_mood_notifications': False,
'display_tune_notifications': False,
'display_user_color_in_join_part': True,
- 'enable_carbons': False,
+ 'enable_carbons': True,
'enable_user_activity': True,
'enable_user_gaming': True,
'enable_user_mood': True,