From 7de35bbd75dcc5ddc6b845714e8733f13889c788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com> Date: Sun, 17 Nov 2019 22:26:55 +0100 Subject: [PATCH] SubscriptionRequest: Rename class --- gajim/gtk/subscription_request.py | 2 +- gajim/gui_interface.py | 6 +++--- gajim/roster_window.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gajim/gtk/subscription_request.py b/gajim/gtk/subscription_request.py index 03306ab909..79b4939e1c 100644 --- a/gajim/gtk/subscription_request.py +++ b/gajim/gtk/subscription_request.py @@ -23,7 +23,7 @@ from gajim.gtk.util import get_builder -class SubscriptionRequestWindow(Gtk.ApplicationWindow): +class SubscriptionRequest(Gtk.ApplicationWindow): def __init__(self, jid, text, account, user_nick=None): Gtk.ApplicationWindow.__init__(self) self.set_name('SubscriptionRequest') diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py index c3cfae08c9..85b5c5b896 100644 --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -106,7 +106,7 @@ from gajim.gtk.filetransfer import FileTransfersWindow from gajim.gtk.http_upload_progress import HTTPUploadProgressWindow from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow -from gajim.gtk.subscription_request import SubscriptionRequestWindow +from gajim.gtk.subscription_request import SubscriptionRequest from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray from gajim.gtk.util import open_window @@ -308,7 +308,7 @@ def handle_event_subscribe_presence(self, obj): if obj.jid in self.instances[account]['sub_request']: self.instances[account]['sub_request'][obj.jid].destroy() self.instances[account]['sub_request'][obj.jid] = \ - SubscriptionRequestWindow(obj.jid, obj.status, account, + SubscriptionRequest(obj.jid, obj.status, account, obj.user_nick) return @@ -1270,7 +1270,7 @@ def handle_event(self, account, fjid, type_): event = app.events.get_first_event(account, jid, type_) if event is None: return - SubscriptionRequestWindow(jid, event.text, account, event.nick) + SubscriptionRequest(jid, event.text, account, event.nick) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'unsubscribed': diff --git a/gajim/roster_window.py b/gajim/roster_window.py index 39fff4199e..4ffd646cf2 100644 --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -80,7 +80,7 @@ from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.adhoc import AdHocCommand -from gajim.gtk.subscription_request import SubscriptionRequestWindow +from gajim.gtk.subscription_request import SubscriptionRequest from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import restore_roster_position @@ -1971,7 +1971,7 @@ def open_event(self, account, jid, event): return True if event.type_ == 'subscription_request': - SubscriptionRequestWindow(jid, event.text, account, event.nick) + SubscriptionRequest(jid, event.text, account, event.nick) app.events.remove_events(account, jid, event) return True -- GitLab