extensionSystem: Make unloadExtension take an extension object, not a UUID

For consistency with loadExtension.

https://bugzilla.gnome.org/show_bug.cgi?id=682578
This commit is contained in:
Jasper St. Pierre
2012-08-23 22:36:33 -03:00
parent 18c62a1987
commit 4696bfbb80
2 changed files with 6 additions and 10 deletions

View File

@ -158,20 +158,16 @@ function loadExtension(extension) {
_signals.emit('extension-state-changed', extension);
}
function unloadExtension(uuid) {
let extension = ExtensionUtils.extensions[uuid];
if (!extension)
return false;
function unloadExtension(extension) {
// Try to disable it -- if it's ERROR'd, we can't guarantee that,
// but it will be removed on next reboot, and hopefully nothing
// broke too much.
disableExtension(uuid);
disableExtension(extension.uuid);
extension.state = ExtensionState.UNINSTALLED;
_signals.emit('extension-state-changed', extension);
delete ExtensionUtils.extensions[uuid];
delete ExtensionUtils.extensions[extension.uuid];
return true;
}