summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2017-11-24 03:07:17 +0000
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2017-11-24 03:07:17 +0000
commit068aa591e3bf01d1f052db5b87b1771772b51c9e (patch)
treeede45d8e9c6889ebbad2a2684d496b2e01a3b4cf
parente629cb5f94bb572ce7fc305a5f8e4994b6cc5258 (diff)
downloadpoezio-068aa591e3bf01d1f052db5b87b1771772b51c9e.tar.gz
poezio-068aa591e3bf01d1f052db5b87b1771772b51c9e.tar.bz2
poezio-068aa591e3bf01d1f052db5b87b1771772b51c9e.tar.xz
poezio-068aa591e3bf01d1f052db5b87b1771772b51c9e.zip
config: Switch the default for show_muc_jid from True to False.
-rw-r--r--data/default_config.cfg6
-rw-r--r--poezio/config.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/data/default_config.cfg b/data/default_config.cfg
index 583f4726..93b8d377 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -309,9 +309,9 @@ use_bookmarks_method =
# display the tab if set to true.
#use_tab_nicks = true
-# If set to false, poezio will only display the user part of the JID (before
-# the @) when displaying the chatroom tab name.
-#show_muc_jid = true
+# If set to false, poezio will first display the bookmark name, or if empty the
+# user part of the JID (before the @) when displaying the chatroom tab name.
+#show_muc_jid = false
# If this option is set to false, the contact list will not show the contact
# JIDs when that is possible.
diff --git a/poezio/config.py b/poezio/config.py
index 5ee4a2b4..4289bae5 100644
--- a/poezio/config.py
+++ b/poezio/config.py
@@ -116,7 +116,7 @@ DEFAULT_CONFIG = {
'show_composing_tabs': 'direct',
'show_inactive_tabs': True,
'show_jid_in_conversations': True,
- 'show_muc_jid': True,
+ 'show_muc_jid': False,
'show_roster_jids': True,
'show_roster_subscriptions': '',
'show_s2s_errors': True,