Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim

Commits:

3 changed files:

Changes:

  • gajim/common/config.py
    ... ... @@ -65,7 +65,6 @@ class Config:
    65 65
     
    
    66 66
         __options = ({
    
    67 67
             # name: [ type, default_value, help_string, restart ]
    
    68
    -        'verbose': [opt_bool, False, '', True],
    
    69 68
             'autopopup': [opt_bool, False],
    
    70 69
             'autopopupaway': [opt_bool, False],
    
    71 70
             'sounddnd': [opt_bool, False, _('Play sound even when being busy.')],
    

  • gajim/common/setting_values.py
    ... ... @@ -13,7 +13,6 @@ class _ACCOUNT_DEFAULT:
    13 13
     # pylint: disable=line-too-long
    
    14 14
     
    
    15 15
     APP_SETTINGS = {
    
    16
    -    'verbose': False,
    
    17 16
         'autopopup': False,
    
    18 17
         'show_notifications': True,
    
    19 18
         'autopopupaway': False,
    

  • gajim/gui_interface.py
    ... ... @@ -73,7 +73,6 @@
    73 73
     from gajim.common import socks5
    
    74 74
     from gajim.common import helpers
    
    75 75
     from gajim.common import passwords
    
    76
    -from gajim.common import logging_helpers
    
    77 76
     from gajim.common.helpers import ask_for_status_message
    
    78 77
     from gajim.common.helpers import get_group_chat_nick
    
    79 78
     from gajim.common.structs import MUCData
    
    ... ... @@ -2125,9 +2124,6 @@ def __init__(self):
    2125 2124
             app.load_css_config()
    
    2126 2125
     
    
    2127 2126
             app.storage.archive.reset_shown_unread_messages()
    
    2128
    -        # override logging settings from config (don't take care of '-q' option)
    
    2129
    -        if app.settings.get('verbose'):
    
    2130
    -            logging_helpers.set_verbose()
    
    2131 2127
     
    
    2132 2128
             for account in app.settings.get_accounts():
    
    2133 2129
                 if app.settings.get_account_setting(account, 'is_zeroconf'):