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

Commits:

2 changed files:

Changes:

  • gajim/common/storage/archive.py
    ... ... @@ -222,7 +222,7 @@ def _migrate(self) -> None:
    222 222
                         )''',
    
    223 223
     
    
    224 224
                     '''CREATE INDEX IF NOT EXISTS idx_logs_stanza_id
    
    225
    -                    ON logs(stanza_id)''',
    
    225
    +                   ON logs(stanza_id)''',
    
    226 226
                     'PRAGMA user_version=1'
    
    227 227
                 ]
    
    228 228
     
    
    ... ... @@ -252,7 +252,8 @@ def _migrate(self) -> None:
    252 252
     
    
    253 253
             if user_version < 5:
    
    254 254
                 statements = [
    
    255
    -                'CREATE INDEX idx_logs_message_id ON logs (message_id)',
    
    255
    +                '''CREATE INDEX IF NOT EXISTS idx_logs_message_id
    
    256
    +                   ON logs (message_id)''',
    
    256 257
                     'PRAGMA user_version=5'
    
    257 258
                 ]
    
    258 259
                 self._execute_multiple(statements)
    

  • gajim/gtk/control.py
    ... ... @@ -1169,6 +1169,3 @@ def _on_room_subject(self,
    1169 1169
             if (app.settings.get('show_subject_on_join') or
    
    1170 1170
                     not contact.is_joining):
    
    1171 1171
                 self.conversation_view.add_muc_subject(subject)
    1172
    -
    
    1173
    -    def rejoin(self) -> None:
    
    1174
    -        self.client.get_module('MUC').join(self.contact.jid)