Philipp Hörist pushed to branch mainwindow at gajim / gajim
Commits:
-
ba5d7ead
by lovetox at 2021-03-01T22:36:54+01:00
3 changed files:
Changes:
| ... | ... | @@ -619,12 +619,6 @@ def _on_receipt_received(self, event): |
| 619 | 619 |
def _on_displayed_received(self, event):
|
| 620 | 620 |
self.conv_textview.show_displayed(event.marker_id)
|
| 621 | 621 |
|
| 622 |
- def _on_zeroconf_error(self, event):
|
|
| 623 |
- self.add_status_message(event.message)
|
|
| 624 |
- |
|
| 625 |
- def _on_update_roster_avatar(self, _event):
|
|
| 626 |
- self._update_avatar()
|
|
| 627 |
- |
|
| 628 | 622 |
def _nec_ping(self, event):
|
| 629 | 623 |
if self.contact != event.contact:
|
| 630 | 624 |
return
|
| ... | ... | @@ -84,10 +84,6 @@ def __init__(self): |
| 84 | 84 |
|
| 85 | 85 |
self.register_events([
|
| 86 | 86 |
('presence-received', ged.GUI1, self._on_event),
|
| 87 |
- ('mood-received', ged.GUI1, self._on_event),
|
|
| 88 |
- ('activity-received', ged.GUI1, self._on_event),
|
|
| 89 |
- ('tune-received', ged.GUI1, self._on_event),
|
|
| 90 |
- ('location-received', ged.GUI1, self._on_event),
|
|
| 91 | 87 |
('caps-update', ged.GUI1, self._on_event),
|
| 92 | 88 |
('message-sent', ged.OUT_POSTCORE, self._on_event),
|
| 93 | 89 |
('message-received', ged.CORE, self._on_event),
|
| ... | ... | @@ -96,31 +92,10 @@ def __init__(self): |
| 96 | 92 |
('receipt-received', ged.GUI1, self._on_event),
|
| 97 | 93 |
('displayed-received', ged.GUI1, self._on_event),
|
| 98 | 94 |
('message-error', ged.GUI1, self._on_event),
|
| 99 |
- ('update-roster-avatar', ged.GUI1, self._on_event),
|
|
| 100 |
- ('update-room-avatar', ged.GUI1, self._on_event),
|
|
| 101 |
- ('update-gc-avatar', ged.GUI1, self._on_event),
|
|
| 102 | 95 |
('muc-creation-failed', ged.GUI1, self._on_event),
|
| 103 |
- ('muc-joined', ged.GUI1, self._on_event),
|
|
| 104 |
- ('muc-join-failed', ged.GUI1, self._on_event),
|
|
| 105 |
- ('muc-user-joined', ged.GUI1, self._on_event),
|
|
| 106 |
- ('muc-user-left', ged.GUI1, self._on_event),
|
|
| 107 |
- ('muc-nickname-changed', ged.GUI1, self._on_event),
|
|
| 108 | 96 |
('muc-self-presence', ged.GUI1, self._on_event),
|
| 109 |
- ('muc-self-kicked', ged.GUI1, self._on_event),
|
|
| 110 |
- ('muc-user-affiliation-changed', ged.GUI1, self._on_event),
|
|
| 111 |
- ('muc-user-status-show-changed', ged.GUI1, self._on_event),
|
|
| 112 |
- ('muc-user-role-changed', ged.GUI1, self._on_event),
|
|
| 113 |
- ('muc-destroyed', ged.GUI1, self._on_event),
|
|
| 114 |
- ('muc-presence-error', ged.GUI1, self._on_event),
|
|
| 115 |
- ('muc-password-required', ged.GUI1, self._on_event),
|
|
| 116 |
- ('muc-config-changed', ged.GUI1, self._on_event),
|
|
| 117 |
- ('muc-subject', ged.GUI1, self._on_event),
|
|
| 118 |
- ('muc-captcha-challenge', ged.GUI1, self._on_event),
|
|
| 119 |
- ('muc-captcha-error', ged.GUI1, self._on_event),
|
|
| 120 | 97 |
('muc-voice-request', ged.GUI1, self._on_event),
|
| 121 | 98 |
('muc-disco-update', ged.GUI1, self._on_event),
|
| 122 |
- ('muc-configuration-finished', ged.GUI1, self._on_event),
|
|
| 123 |
- ('muc-configuration-failed', ged.GUI1, self._on_event),
|
|
| 124 | 99 |
('our-show', ged.GUI1, self._on_our_show),
|
| 125 | 100 |
('signed-in', ged.GUI1, self._on_signed_in),
|
| 126 | 101 |
])
|
| ... | ... | @@ -1732,21 +1732,6 @@ def process_connections(self): |
| 1732 | 1732 |
def save_config():
|
| 1733 | 1733 |
app.settings.save()
|
| 1734 | 1734 |
|
| 1735 |
- def update_avatar(self, account=None, jid=None,
|
|
| 1736 |
- contact=None, room_avatar=False):
|
|
| 1737 |
- self.avatar_storage.invalidate_cache(jid or contact.get_full_jid())
|
|
| 1738 |
- if room_avatar:
|
|
| 1739 |
- app.nec.push_incoming_event(
|
|
| 1740 |
- NetworkEvent('update-room-avatar', account=account, jid=jid))
|
|
| 1741 |
- elif contact is None:
|
|
| 1742 |
- app.nec.push_incoming_event(
|
|
| 1743 |
- NetworkEvent('update-roster-avatar', account=account, jid=jid))
|
|
| 1744 |
- else:
|
|
| 1745 |
- app.nec.push_incoming_event(NetworkEvent('update-gc-avatar',
|
|
| 1746 |
- account=account,
|
|
| 1747 |
- contact=contact,
|
|
| 1748 |
- jid=contact.room_jid))
|
|
| 1749 |
- |
|
| 1750 | 1735 |
def save_avatar(self, data):
|
| 1751 | 1736 |
return self.avatar_storage.save_avatar(data)
|
| 1752 | 1737 |
|