Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/gtk/const.py
    ... ... @@ -57,8 +57,7 @@ class SettingKind(IntEnum):
    57 57
         FILECHOOSER = 10
    
    58 58
         CHANGEPASSWORD = 11
    
    59 59
         COMBO = 12
    
    60
    -    CHATSTATE_COMBO = 13
    
    61
    -    COLOR = 14
    
    60
    +    COLOR = 13
    
    62 61
     
    
    63 62
     
    
    64 63
     @unique
    

  • gajim/gtk/settings.py
    ... ... @@ -98,7 +98,6 @@ class SettingsBox(Gtk.ListBox):
    98 98
                 SettingKind.HOSTNAME: CutstomHostnameSetting,
    
    99 99
                 SettingKind.CHANGEPASSWORD: ChangePasswordSetting,
    
    100 100
                 SettingKind.COMBO: ComboSetting,
    
    101
    -            SettingKind.CHATSTATE_COMBO: ChatstateComboSetting,
    
    102 101
             }
    
    103 102
     
    
    104 103
             if extend is not None:
    
    ... ... @@ -575,15 +574,6 @@ class ComboSetting(GenericSetting):
    575 574
             pass
    
    576 575
     
    
    577 576
     
    
    578
    -class ChatstateComboSetting(ComboSetting):
    
    579
    -    def on_value_change(self, combo):
    
    580
    -        self.set_value(combo.get_active_id())
    
    581
    -        if 'muc' in self.value:
    
    582
    -            app.config.del_all_per('rooms', 'send_chatstate')
    
    583
    -        else:
    
    584
    -            app.config.del_all_per('contacts', 'send_chatstate')
    
    585
    -
    
    586
    -
    
    587 577
     class ProxyComboSetting(GenericSetting):
    
    588 578
     
    
    589 579
         __gproperties__ = {