isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbusServices/extensions: Fix shutdown after showing prefs

Browse Source 
GTK4 relies entirely on refcounting for cleanup (that is,
there is no longer a destroy() method that forces a dispose
run regardless of the refcount).

Unfortunately that makes cleanup harder in (some) language
bindings, where an object may be kept alive implicitly by
closures etc.

Address this by releasing the hold count when the window
is closed rather than when it is destroyed.

This isn't the most elegant, but it ensure that the service
doesn't get stuck if an extension doesn't carefully clean
up everything in its prefs widget.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4564

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2013>
This commit is contained in:
Florian Müllner 2021-10-28 19:27:57 +02:00 committed by Marge Bot
parent 09ed1c533c
commit 4d2b008966
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/dbusServices/extensions/extensionsService.js
View File

@ -133,7 +133,10 @@ var ExtensionsService = class extends ServiceImplementation {
if (options.modal) if (options.modal)
window.modal = options.modal.get_boolean(); window.modal = options.modal.get_boolean();
window.connect('destroy', () => this.release()); window.connect('close-request', () => {
this.release();
return false;
});
this.hold(); this.hold();
window.show(); window.show();