Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits:
2654afdf by wurstsalat at 2021-07-21T23:05:26+02:00
Fix declined MUC invitations
- - - - -
2 changed files:
- gajim/gtk/notification_manager.py
- gajim/gui_interface.py
Changes:
=====================================
gajim/gtk/notification_manager.py
=====================================
@@ -335,7 +335,7 @@ def __init__(self, account, event):
NotificationRow.__init__(self, account, event.muc)
self.type = 'invitation-declined'
- image = self._generate_avatar_image(event.from_)
+ image = self._generate_avatar_image(event.from_.bare)
self.grid.attach(image, 1, 1, 1, 2)
title_label = self._generate_label()
=====================================
gajim/gui_interface.py
=====================================
@@ -372,20 +372,6 @@ def handle_event_msgnotsent(obj):
obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name,
msg_type='error')
- def handle_event_gc_decline(self, event):
- # TODO: Adapt to new mainwindow
- gc_control = self.msg_win_mgr.get_gc_control(str(event.muc),
- event.account)
- if gc_control:
- if event.reason:
- gc_control.add_info_message(
- _('%(jid)s declined the invitation: %(reason)s') % {
- 'jid': event.from_, 'reason': event.reason})
- else:
- gc_control.add_info_message(
- _('%(jid)s declined the invitation') % {
- 'jid': event.from_})
-
def handle_event_gc_invitation(self, event):
event = events.GcInvitationtEvent(event)
@@ -1072,7 +1058,6 @@ def create_core_handlers_list(self):
'file-request-error': [self.handle_event_file_request_error],
'file-request-received': [self.handle_event_file_request],
'muc-invitation': [self.handle_event_gc_invitation],
- 'muc-decline': [self.handle_event_gc_decline],
'http-auth-received': [self.handle_event_http_auth],
'information': [self.handle_event_information],
'iq-error-received': [self.handle_event_iq_error],
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/2654afdfd8162eac3508bed90a6e6384d17308c0
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/2654afdfd8162eac3508bed90a6e6384d17308c0
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
