statusNotifierWatcher: Return possible errors in registration to clients

jbicha · Sep 30, 2022 · b60005d · b60005d
1 parent eec4888
commit b60005d
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/statusNotifierWatcher.js b/statusNotifierWatcher.js
@@ -128,7 +128,7 @@ var StatusNotifierWatcher = class AppIndicatorsStatusNotifierWatcher {
         }
     }
 
-    _ensureItemRegistered(service, busName, objPath) {
+    async _ensureItemRegistered(service, busName, objPath) {
         const id = Util.indicatorId(service, busName, objPath);
         let item = this._items.get(id);
 
@@ -139,7 +139,7 @@ var StatusNotifierWatcher = class AppIndicatorsStatusNotifierWatcher {
             return;
         }
 
-        this._registerItem(service, busName, objPath);
+        await this._registerItem(service, busName, objPath);
     }
 
     async _seekStatusNotifierItems() {
@@ -203,9 +203,15 @@ var StatusNotifierWatcher = class AppIndicatorsStatusNotifierWatcher {
             return;
         }
 
-        this._ensureItemRegistered(service, busName, objPath);
-
-        invocation.return_value(null);
+        try {
+            await this._ensureItemRegistered(service, busName, objPath);
+            invocation.return_value(null);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                logError(e);
+            invocation.return_dbus_error('org.gnome.gjs.JSError.ValueError',
+                e.message);
+        }
     }
 
     _onIndicatorDestroyed(indicator) {