Merge branch 'master' of git.poez.io:poezio into slix

Conflicts:
	src/bookmark.py
	src/config.py
	src/connection.py
	src/core/commands.py
	src/core/core.py
	src/core/handlers.py
	src/windows/info_bar.py
	src/windows/muc.py
	src/windows/roster_win.py
	src/windows/text_win.py
	src/xhtml.py

1 files changed, 8 insertions, 9 deletions

diff --git a/src/windows/info_bar.py b/src/windows/info_bar.py
index 10225d5d..e66343c5 100644
--- a/src/windows/info_bar.py
+++ b/src/windows/info_bar.py
@@ -24,10 +24,10 @@ class GlobalInfoBar(Win):
         self._win.erase()
         self.addstr(0, 0, "[", to_curses_attr(get_theme().COLOR_INFORMATION_BAR))
 
-        create_gaps = config.get('create_gaps', False)
-        show_names = config.get('show_tab_names', False)
-        show_nums = config.get('show_tab_numbers', True)
-        use_nicks = config.get('use_tab_nicks', True)
+        create_gaps = config.get('create_gaps')
+        show_names = config.get('show_tab_names')
+        show_nums = config.get('show_tab_numbers')
+        use_nicks = config.get('use_tab_nicks')
         # ignore any remaining gap tabs if the feature is not enabled
         if create_gaps:
             sorted_tabs = self.core.tabs[:]
@@ -37,7 +37,7 @@ class GlobalInfoBar(Win):
         for nb, tab in enumerate(sorted_tabs):
             if not tab: continue
             color = tab.color
-            if not config.get('show_inactive_tabs', True) and\
+            if not config.get('show_inactive_tabs') and\
                     color is get_theme().COLOR_TAB_NORMAL:
                 continue
             try:
@@ -70,11 +70,11 @@ class VerticalGlobalInfoBar(Win):
         height, width = self._win.getmaxyx()
         self._win.erase()
         sorted_tabs = [tab for tab in self.core.tabs if tab]
-        if not config.get('show_inactive_tabs', True):
+        if not config.get('show_inactive_tabs'):
             sorted_tabs = [tab for tab in sorted_tabs if\
                                tab.vertical_color != get_theme().COLOR_VERTICAL_TAB_NORMAL]
         nb_tabs = len(sorted_tabs)
-        use_nicks = config.get('use_tab_nicks', True)
+        use_nicks = config.get('use_tab_nicks')
         if nb_tabs >= height:
             for y, tab in enumerate(sorted_tabs):
                 if tab.vertical_color == get_theme().COLOR_VERTICAL_TAB_CURRENT:
@@ -89,8 +89,7 @@ class VerticalGlobalInfoBar(Win):
                 sorted_tabs = sorted_tabs[pos-height//2 : pos+height//2]
         for y, tab in enumerate(sorted_tabs):
             color = tab.vertical_color
-
-            if not config.get('vertical_tab_list_sort', 'desc') != 'asc':
+            if not config.get('vertical_tab_list_sort') != 'asc':
                 y = height - y - 1
             self.addstr(y, 0, "%2d" % tab.nb,
                     to_curses_attr(get_theme().COLOR_VERTICAL_TAB_NUMBER))