|
|
18fbde |
From 875bbe6acb379addef064f014030d349539bdbe4 Mon Sep 17 00:00:00 2001
|
|
|
18fbde |
From: Ray Strode <rstrode@redhat.com>
|
|
|
18fbde |
Date: Fri, 31 Aug 2018 12:48:00 -0400
|
|
|
18fbde |
Subject: [PATCH 2/4] objectManager: correct other invalid index code in
|
|
|
18fbde |
onNameVanished
|
|
|
18fbde |
|
|
|
18fbde |
The object manager tries to synthesize interface removal
|
|
|
18fbde |
events if the bus name of a remote object drops off the bus.
|
|
|
18fbde |
|
|
|
18fbde |
The code had bad typos in it, though: it reuses the `i`
|
|
|
18fbde |
index variable in its inner loop, where it should be using
|
|
|
18fbde |
the `j` index variable.
|
|
|
18fbde |
|
|
|
18fbde |
This commit corrects the i/j confusion.
|
|
|
18fbde |
---
|
|
|
18fbde |
js/misc/objectManager.js | 4 ++--
|
|
|
18fbde |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
18fbde |
|
|
|
18fbde |
diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
|
|
|
18fbde |
index 5dffaa130..1442e3df8 100644
|
|
|
18fbde |
--- a/js/misc/objectManager.js
|
|
|
18fbde |
+++ b/js/misc/objectManager.js
|
|
|
18fbde |
@@ -213,62 +213,62 @@ var ObjectManager = new Lang.Class({
|
|
|
18fbde |
return;
|
|
|
18fbde |
}
|
|
|
18fbde |
|
|
|
18fbde |
let objectPaths = Object.keys(objects);
|
|
|
18fbde |
for (let i = 0; i < objectPaths.length; i++) {
|
|
|
18fbde |
let objectPath = objectPaths[i];
|
|
|
18fbde |
let object = objects[objectPath];
|
|
|
18fbde |
|
|
|
18fbde |
let interfaceNames = Object.getOwnPropertyNames(object);
|
|
|
18fbde |
for (let j = 0; j < interfaceNames.length; j++) {
|
|
|
18fbde |
let interfaceName = interfaceNames[j];
|
|
|
18fbde |
|
|
|
18fbde |
// Prevent load from completing until the interface is loaded
|
|
|
18fbde |
this._numLoadInhibitors++;
|
|
|
18fbde |
this._addInterface(objectPath,
|
|
|
18fbde |
interfaceName,
|
|
|
18fbde |
this._tryToCompleteLoad.bind(this));
|
|
|
18fbde |
}
|
|
|
18fbde |
}
|
|
|
18fbde |
this._tryToCompleteLoad();
|
|
|
18fbde |
});
|
|
|
18fbde |
},
|
|
|
18fbde |
|
|
|
18fbde |
_onNameVanished() {
|
|
|
18fbde |
let objectPaths = Object.keys(this._objects);
|
|
|
18fbde |
for (let i = 0; i < objectPaths.length; i++) {
|
|
|
18fbde |
let objectPath = objectPaths[i];
|
|
|
18fbde |
let object = this._objects[objectPath];
|
|
|
18fbde |
|
|
|
18fbde |
let interfaceNames = Object.keys(object);
|
|
|
18fbde |
- for (let j = 0; i < interfaceNames.length; i++) {
|
|
|
18fbde |
- let interfaceName = interfaceNames[i];
|
|
|
18fbde |
+ for (let j = 0; j < interfaceNames.length; j++) {
|
|
|
18fbde |
+ let interfaceName = interfaceNames[j];
|
|
|
18fbde |
|
|
|
18fbde |
if (object[interfaceName])
|
|
|
18fbde |
this._removeInterface(objectPath, interfaceName);
|
|
|
18fbde |
}
|
|
|
18fbde |
}
|
|
|
18fbde |
},
|
|
|
18fbde |
|
|
|
18fbde |
_registerInterfaces(interfaces) {
|
|
|
18fbde |
for (let i = 0; i < interfaces.length; i++) {
|
|
|
18fbde |
let info = Gio.DBusInterfaceInfo.new_for_xml(interfaces[i]);
|
|
|
18fbde |
this._interfaceInfos[info.name] = info;
|
|
|
18fbde |
}
|
|
|
18fbde |
},
|
|
|
18fbde |
|
|
|
18fbde |
getProxy(objectPath, interfaceName) {
|
|
|
18fbde |
let object = this._objects[objectPath];
|
|
|
18fbde |
|
|
|
18fbde |
if (!object)
|
|
|
18fbde |
return null;
|
|
|
18fbde |
|
|
|
18fbde |
return object[interfaceName];
|
|
|
18fbde |
},
|
|
|
18fbde |
|
|
|
18fbde |
getProxiesForInterface(interfaceName) {
|
|
|
18fbde |
let proxyList = this._interfaces[interfaceName];
|
|
|
18fbde |
|
|
|
18fbde |
if (!proxyList)
|
|
|
18fbde |
return [];
|
|
|
18fbde |
|
|
|
18fbde |
return proxyList;
|
|
|
18fbde |
--
|
|
|
18fbde |
2.21.0
|
|
|
18fbde |
|