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

Revert "objectManager: handle proxies coming and going"

Browse Source 
This reverts commit 1ef6262139.

https://bugzilla.gnome.org/show_bug.cgi?id=772589
This commit is contained in:
Ray Strode 2017-01-09 22:34:21 -05:00
parent 71d9d483f2
commit 2e332ffd12
1 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/misc/objectManager.js
View File

@ -46,7 +46,7 @@ const ObjectManager = new Lang.Class({
g_interface_info: ObjectManagerInfo, g_interface_info: ObjectManagerInfo,
g_name: this._serviceName, g_name: this._serviceName,
g_object_path: this._managerPath, g_object_path: this._managerPath,
g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START }); g_flags: Gio.DBusProxyFlags.NONE });
this._interfaceInfos = {}; this._interfaceInfos = {};
this._objects = {}; this._objects = {};
@ -65,9 +65,6 @@ const ObjectManager = new Lang.Class({
}, },
_tryToCompleteLoad: function() { _tryToCompleteLoad: function() {
if (this._numLoadInhibitors == 0)
return;
this._numLoadInhibitors--; this._numLoadInhibitors--;
if (this._numLoadInhibitors == 0) { if (this._numLoadInhibitors == 0) {
if (this._onLoaded) if (this._onLoaded)
@ -89,7 +86,7 @@ const ObjectManager = new Lang.Class({
g_object_path: objectPath, g_object_path: objectPath,
g_interface_name: interfaceName, g_interface_name: interfaceName,
g_interface_info: info, g_interface_info: info,
g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START }); g_flags: Gio.DBusProxyFlags.NONE });
proxy.init_async(GLib.PRIORITY_DEFAULT, proxy.init_async(GLib.PRIORITY_DEFAULT,
this._cancellable, this._cancellable,
@ -184,18 +181,6 @@ const ObjectManager = new Lang.Class({
return; return;
} }
this._managerProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
if (this._dbusProxy.g_name_owner)
this._onNameAppeared();
else
this._onNameVanished();
}));
if (this._dbusProxy.g_name_owner)
this._onNameAppeared();
},
_onNameAppeared: function() {
this._managerProxy.GetManagedObjectsRemote(Lang.bind(this, function(result, error) { this._managerProxy.GetManagedObjectsRemote(Lang.bind(this, function(result, error) {
if (!result) { if (!result) {
if (error) { if (error) {
@ -228,21 +213,6 @@ const ObjectManager = new Lang.Class({
})); }));
}, },
_onNameVanished: function() {
let objectPaths = Object.keys(this._objects);
for (let i = 0; i < objectPaths.length; i++) {
let object = this._objects[objectPaths];
let interfaceNames = Object.keys(object);
for (let j = 0; i < interfaceNames.length; i++) {
let interfaceName = interfaceNames[i];
if (object[interfaceName])
this._removeInterface(objectPath, interfaceName);
}
}
},
_registerInterfaces: function(interfaces) { _registerInterfaces: function(interfaces) {
for (let i = 0; i < interfaces.length; i++) { for (let i = 0; i < interfaces.length; i++) {
let info = Gio.DBusInterfaceInfo.new_for_xml(interfaces[i]); let info = Gio.DBusInterfaceInfo.new_for_xml(interfaces[i]);