From a1f8f2efa18cd1022bca6894bbfb8e19165a9e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 8 Mar 2023 19:27:27 +0100 Subject: [PATCH] portalHelper: Remove pointless destroyWindow() method Years ago, the function used to clean up the cache when the window was closed. But now that an ephemeral data manager is used, nothing is cached anymore and the function is left as a mere wrapper around this.destroy(). Part-of: --- js/portalHelper/main.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js index cdf8b51cc..62a522e51 100644 --- a/js/portalHelper/main.js +++ b/js/portalHelper/main.js @@ -116,7 +116,6 @@ class PortalWindow extends Gtk.ApplicationWindow { _init(application, url, timestamp, doneCallback) { super._init({ application }); - this.connect('delete-event', this.destroyWindow.bind(this)); this._headerBar = new PortalHeaderBar(); this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.NOT_YET_DETERMINED); this.set_titlebar(this._headerBar); @@ -161,10 +160,6 @@ class PortalWindow extends Gtk.ApplicationWindow { this.application.set_accels_for_action('app.quit', ['q', 'w']); } - destroyWindow() { - this.destroy(); - } - _syncUri() { let uri = this._webView.uri; if (uri) @@ -293,7 +288,7 @@ class WebPortalHelper extends Gtk.Application { this._queue = []; let action = new Gio.SimpleAction({ name: 'quit' }); - action.connect('activate', () => this.active_window.destroyWindow()); + action.connect('activate', () => this.active_window.destroy()); this.add_action(action); } @@ -326,7 +321,7 @@ class WebPortalHelper extends Gtk.Application { if (obj.connection == connection) { if (obj.window) - obj.window.destroyWindow(); + obj.window.destroy(); this._queue.splice(i, 1); break; }