Roster update: Merge branch 'master' of https://git.louiz.org/poezio

Conflicts:
	src/core.py
	src/tabs.py

1 files changed, 22 insertions, 0 deletions

diff --git a/data/default_config.cfg b/data/default_config.cfg
index dc5cc4d6..2c5f0d81 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -199,6 +199,28 @@ plugins_autoload =
 # with no activity, set to true. Else, set to false
 show_inactive_tabs = true
 
+# If you want to show the tab names in the bottom tab bar, set this to true
+show_tab_names = false
+
+# If you want to disable the numbers in the bottom tab bar, set this to false
+# If show_tab_names and show_tab_numbers are both false, the numbers will be 
+# shown
+show_tab_numbers = true
+
+# Use the contact name, the nick in the MUC instead of the full JID to
+# 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 MUC tab name.
+show_muc_jid = true
+
+# If this option is set to false, the roster will not show the contact JIDs
+# when that is possible.
+# e.g. instead of: toto (toto@example.org) (2)
+# poezio will only show: toto (2)
+show_roster_jids = true
+
 # The terminal can beep on various event. Put the event you want in a list
 # (separated by spaces).
 # The events can be