[gnome-shell] polkitAgent: Inherit AuthenticationAgent from Shell.PolkitAuthenticationAgent
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] polkitAgent: Inherit AuthenticationAgent from Shell.PolkitAuthenticationAgent
- Date: Fri, 8 Nov 2019 23:18:16 +0000 (UTC)
commit 0ed702d1afaec4c674df42038830a013e6f6d168
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date: Tue May 28 22:58:35 2019 +0200
polkitAgent: Inherit AuthenticationAgent from Shell.PolkitAuthenticationAgent
AuthenticationAgent is just a wrapper of Shell's PolkitAuthenticationAgent, so
instead of using composition we can simply extend the base GObject.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/563
js/ui/components/polkitAgent.js | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index 8759400ef3..b7321a0a15 100644
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -369,19 +369,20 @@ var AuthenticationDialog = GObject.registerClass({
}
});
-var AuthenticationAgent = class {
- constructor() {
+var AuthenticationAgent = GObject.registerClass(
+class AuthenticationAgent extends Shell.PolkitAuthenticationAgent {
+ _init() {
+ super._init();
+
this._currentDialog = null;
- this._handle = null;
- this._native = new Shell.PolkitAuthenticationAgent();
- this._native.connect('initiate', this._onInitiate.bind(this));
- this._native.connect('cancel', this._onCancel.bind(this));
+ this.connect('initiate', this._onInitiate.bind(this));
+ this.connect('cancel', this._onCancel.bind(this));
this._sessionUpdatedId = 0;
}
enable() {
try {
- this._native.register();
+ this.register();
} catch (e) {
log('Failed to register AuthenticationAgent');
}
@@ -389,7 +390,7 @@ var AuthenticationAgent = class {
disable() {
try {
- this._native.unregister();
+ this.unregister();
} catch (e) {
log('Failed to unregister AuthenticationAgent');
}
@@ -439,8 +440,8 @@ var AuthenticationAgent = class {
Main.sessionMode.disconnect(this._sessionUpdatedId);
this._sessionUpdatedId = 0;
- this._native.complete(dismissed);
+ this.complete(dismissed);
}
-};
+});
var Component = AuthenticationAgent;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]