v9.1: fix dbus

domferr · domferr · commit 5ba65f9d0270 · 2024-06-22T21:57:53.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tilingshell",
-  "version": "9.0",
+  "version": "9.1",
   "author": "Domenico Ferraro <ferraro.domenico125@gmail.com>",
   "private": true,
   "license": "GPL v2.0",
diff --git a/resources/metadata.json b/resources/metadata.json
@@ -10,7 +10,7 @@
     "46"
   ],
   "version": 9,
-  "version-name": "9.0",
+  "version-name": "9.1",
   "url": "https://github.com/domferr/tilingshell",
   "settings-schema": "org.gnome.shell.extensions.tilingshell",
   "donations": {
diff --git a/src/dbus.ts b/src/dbus.ts
@@ -14,10 +14,11 @@ export default class DBus {
         this._dbus = null;
     }
 
-    public enable() {
+    public enable(ext: any) {
         if (this._dbus) return;
 
-        this._dbus = Gio.DBusExportedObject.wrapJSObject(node, this);
+        this._dbus = Gio.DBusExportedObject.wrapJSObject(node, ext);
+        this._dbus.export(Gio.DBus.session, '/org/gnome/shell/extensions/TilingShell');
     }
 
     public disable() {
diff --git a/src/extension.ts b/src/extension.ts
@@ -97,7 +97,8 @@ export default class TilingShellExtension extends Extension {
 
     if (this._dbus) this._dbus.disable();
     this._dbus = new DBus();
-    this._dbus.enable();
+    this._dbus.enable(this);
+    
     debug('extension is enabled');
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tilingshell",`
`3`		`- "version": "9.0",`
	`3`	`+ "version": "9.1",`
`4`	`4`	`"author": "Domenico Ferraro <[email protected]>",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "GPL v2.0",`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,11 @@ export default class DBus {`
`14`	`14`	`this._dbus = null;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public enable() {`
	`17`	`+ public enable(ext: any) {`
`18`	`18`	`if (this._dbus) return;`
`19`	`19`
`20`		`- this._dbus = Gio.DBusExportedObject.wrapJSObject(node, this);`
	`20`	`+ this._dbus = Gio.DBusExportedObject.wrapJSObject(node, ext);`
	`21`	`+ this._dbus.export(Gio.DBus.session, '/org/gnome/shell/extensions/TilingShell');`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`public disable() {`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ export default class TilingShellExtension extends Extension {`
`97`	`97`
`98`	`98`	`if (this._dbus) this._dbus.disable();`
`99`	`99`	`this._dbus = new DBus();`
`100`		`- this._dbus.enable();`
	`100`	`+ this._dbus.enable(this);`
	`101`	`+`
`101`	`102`	`debug('extension is enabled');`
`102`	`103`	`}`
`103`	`104`