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


Commits:
0698a1d5 by lovetox at 2022-08-15T20:14:32+02:00
fix: MUC: Send password and reason correctly on invite

- - - - -
f283525a by lovetox at 2022-08-15T20:14:32+02:00
fix: InfoMessage: Don’t escape text

- - - - -


2 changed files:

- gajim/common/modules/muc.py
- gajim/gtk/conversation/rows/info.py


Changes:

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


=====================================
gajim/gtk/conversation/rows/info.py
=====================================
@@ -19,7 +19,6 @@
 import time
 from datetime import datetime
 
-from gi.repository import GLib
 from gi.repository import Gtk
 
 from gajim.common.const import AvatarSize
@@ -42,8 +41,6 @@ def __init__(self,
         self.timestamp = datetime.fromtimestamp(current_timestamp)
         self.db_timestamp = current_timestamp
 
-        text = GLib.markup_escape_text(text)
-
         avatar_placeholder = Gtk.Box()
         avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1)
         self.grid.attach(avatar_placeholder, 0, 0, 1, 1)



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/47137bbbf46707890f64aeba779333df69a38be2...f283525ac3670a88da6dbcd520955fd0526a509e

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/47137bbbf46707890f64aeba779333df69a38be2...f283525ac3670a88da6dbcd520955fd0526a509e
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to