Philipp Hörist pushed to branch master at gajim / gajim
Commits:
f6066069 by lovetox at 2020-03-15T08:59:14+01:00
Make XMLConsole work again
- - - - -
2 changed files:
- gajim/common/client.py
- gajim/gtk/xml_console.py
Changes:
=====================================
gajim/common/client.py
=====================================
@@ -269,11 +269,14 @@ class Client(ConnectionHandlers):
self.get_module('MAM').reset_state()
def _on_stanza_sent(self, _client, signal_name, stanza):
- pass
+ app.nec.push_incoming_event(NetworkEvent('stanza-sent',
+ account=self._account,
+ stanza=stanza))
def _on_stanza_received(self, _client, signal_name, stanza):
- pass
-
+ app.nec.push_incoming_event(NetworkEvent('stanza-received',
+ account=self._account,
+ stanza=stanza))
def get_own_jid(self, warn=False):
"""
Return the last full JID we received on a bind event.
=====================================
gajim/gtk/xml_console.py
=====================================
@@ -332,22 +332,25 @@ class XMLConsoleWindow(Gtk.ApplicationWindow,
EventHelper):
tag.set_priority(0)
tag.set_property('invisible', value)
- def _nec_stanza_received(self, obj):
+ def _nec_stanza_received(self, event):
if self.selected_account is not None:
- if obj.conn.name != self.selected_account:
+ if event.account != self.selected_account:
return
- self._print_stanza(obj, 'incoming')
+ self._print_stanza(event, 'incoming')
- def _nec_stanza_sent(self, obj):
+ def _nec_stanza_sent(self, event):
if self.selected_account is not None:
- if obj.conn.name != self.selected_account:
+ if event.account != self.selected_account:
return
- self._print_stanza(obj, 'outgoing')
+ self._print_stanza(event, 'outgoing')
+
+ def _print_stanza(self, event, kind):
+ account_label = app.get_account_label(event.account)
+
+ stanza = event.stanza
+ if not isinstance(stanza, str):
+ stanza = stanza.__str__(fancy=True)
- def _print_stanza(self, obj, kind):
- account = app.get_jid_from_account(obj.conn.name)
- stanza = obj.stanza_str
- # Kind must be 'incoming' or 'outgoing'
if not stanza:
return
@@ -369,8 +372,8 @@ class XMLConsoleWindow(Gtk.ApplicationWindow, EventHelper):
stanza = '<!-- {kind} {time} ({account}) -->\n{stanza}\n\n'.format(
kind=kind.capitalize(),
time=time.strftime('%c'),
- account=account,
- stanza=stanza.replace('><', '>\n<'))
+ account=account_label,
+ stanza=stanza)
buffer_.insert_with_tags_by_name(end_iter, stanza, type_, kind)
if at_the_end:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/f606606943befafaede16ef028053f26431a6ff5
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/f606606943befafaede16ef028053f26431a6ff5
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
