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

Commits:

2 changed files:

Changes:

  • gajim/common/modules/muc.py
    ... ... @@ -974,7 +974,7 @@ def invite(self,
    974 974
             password = self._mucs[str(room)].password
    
    975 975
             self._log.info('Invite %s to %s', jid, room)
    
    976 976
             return self._nbxmpp('MUC').invite(
    
    977
    -            room, jid, reason, password, continue_, type_)
    
    977
    +            room, jid, password, reason, continue_, type_)
    
    978 978
     
    
    979 979
         def _on_client_state_changed(self,
    
    980 980
                                      _client: types.Client,
    

  • gajim/gtk/conversation/rows/info.py
    ... ... @@ -19,7 +19,6 @@
    19 19
     import time
    
    20 20
     from datetime import datetime
    
    21 21
     
    
    22
    -from gi.repository import GLib
    
    23 22
     from gi.repository import Gtk
    
    24 23
     
    
    25 24
     from gajim.common.const import AvatarSize
    
    ... ... @@ -42,8 +41,6 @@ def __init__(self,
    42 41
             self.timestamp = datetime.fromtimestamp(current_timestamp)
    
    43 42
             self.db_timestamp = current_timestamp
    
    44 43
     
    
    45
    -        text = GLib.markup_escape_text(text)
    
    46
    -
    
    47 44
             avatar_placeholder = Gtk.Box()
    
    48 45
             avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1)
    
    49 46
             self.grid.attach(avatar_placeholder, 0, 0, 1, 1)