Daniel Brötzmann pushed to branch master at gajim / gajim

Commits:

3 changed files:

Changes:

  • gajim/common/setting_values.py
    ... ... @@ -32,7 +32,6 @@ class _ACCOUNT_DEFAULT:
    32 32
         'trayicon': 'always',
    
    33 33
         'allow_hide_roster': False,
    
    34 34
         'iconset': 'dcraven',
    
    35
    -    'collapsed_rows': '',
    
    36 35
         'roster_theme': 'default',
    
    37 36
         'sort_by_show_in_roster': True,
    
    38 37
         'sort_by_show_in_muc': False,
    
    ... ... @@ -41,7 +40,6 @@ class _ACCOUNT_DEFAULT:
    41 40
         'speller_language': '',
    
    42 41
         'emoticons_theme': 'noto-emoticons',
    
    43 42
         'ascii_formatting': True,
    
    44
    -    'show_ascii_formatting_chars': True,
    
    45 43
         'sounds_on': True,
    
    46 44
         'gc_refer_to_nick_char': ',',
    
    47 45
         'mainwin_x_position': 0,
    
    ... ... @@ -201,7 +199,6 @@ class _ACCOUNT_DEFAULT:
    201 199
             'roster_version': '',
    
    202 200
             'subscription_request_msg': '',
    
    203 201
             'ft_send_local_ips': True,
    
    204
    -        'opened_chat_controls': '',
    
    205 202
             'recent_groupchats': '',
    
    206 203
             'filetransfer_preference': 'httpupload',
    
    207 204
             'send_chatstate_default': 'composing_only',
    
    ... ... @@ -332,7 +329,6 @@ class _ACCOUNT_DEFAULT:
    332 329
         'app': {
    
    333 330
             'allow_hide_roster': _('Allow to hide the contact list window even if the notification area icon is not shown.'),
    
    334 331
             'ascii_formatting': _('Treat * / _ pairs as possible formatting characters.'),
    
    335
    -        'show_ascii_formatting_chars': _('If enabled, do not remove */_ . So *abc* will be bold but with * * not removed.'),
    
    336 332
             'gc_refer_to_nick_char': _('Character to add after nickname when using nickname completion (tab) in group chat.'),
    
    337 333
             'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'),
    
    338 334
             'time_stamp': _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'),
    

  • gajim/gtk/chat_list.py
    ... ... @@ -581,7 +581,7 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str,
    581 581
                     if line.contact_name == our_nick:
    
    582 582
                         self._ui.nick_label.set_text(_('Me:'))
    
    583 583
                     else:
    
    584
    -                    self._ui.nick_label.set_text(_('%(muc_nick)s: ') % {
    
    584
    +                    self._ui.nick_label.set_text(_('%(muc_nick)s:') % {
    
    585 585
                             'muc_nick': line.contact_name})
    
    586 586
                     self._ui.nick_label.show()
    
    587 587
     
    

  • gajim/gtk/notification.py
    ... ... @@ -206,6 +206,9 @@ def _issue_notification(self,
    206 206
             if timeout < 0:
    
    207 207
                 timeout = app.settings.get('notification_timeout')
    
    208 208
     
    
    209
    +        title = GLib.markup_escape_text(title)
    
    210
    +        text = GLib.markup_escape_text(text)
    
    211
    +
    
    209 212
             if sys.platform == 'win32':
    
    210 213
                 self._withdraw()
    
    211 214
                 self._win32_active_popup = PopupNotification(