extensionDownloader: Clean up names of methods
FromUUID is redundant. https://bugzilla.gnome.org/show_bug.cgi?id=679099
This commit is contained in:
parent
c99e8eb29d
commit
23e86d7dd5
@ -22,7 +22,7 @@ const REPOSITORY_URL_INFO = REPOSITORY_URL_BASE + '/extension-info/';
|
|||||||
|
|
||||||
let _httpSession;
|
let _httpSession;
|
||||||
|
|
||||||
function installExtensionFromUUID(uuid, invocation) {
|
function installExtension(uuid, invocation) {
|
||||||
let params = { uuid: uuid,
|
let params = { uuid: uuid,
|
||||||
shell_version: Config.PACKAGE_VERSION };
|
shell_version: Config.PACKAGE_VERSION };
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ function installExtensionFromUUID(uuid, invocation) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function uninstallExtensionFromUUID(uuid) {
|
function uninstallExtension(uuid) {
|
||||||
let extension = ExtensionUtils.extensions[uuid];
|
let extension = ExtensionUtils.extensions[uuid];
|
||||||
if (!extension)
|
if (!extension)
|
||||||
return false;
|
return false;
|
||||||
@ -115,7 +115,7 @@ function gotExtensionZipFile(session, message, uuid, callback, errback) {
|
|||||||
try {
|
try {
|
||||||
ExtensionSystem.loadExtension(extension);
|
ExtensionSystem.loadExtension(extension);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
uninstallExtensionFromUUID(uuid);
|
uninstallExtension(uuid);
|
||||||
errback('LoadExtensionError', e);
|
errback('LoadExtensionError', e);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -287,11 +287,11 @@ const GnomeShellExtensions = new Lang.Class({
|
|||||||
},
|
},
|
||||||
|
|
||||||
InstallRemoteExtensionAsync: function([uuid], invocation) {
|
InstallRemoteExtensionAsync: function([uuid], invocation) {
|
||||||
return ExtensionDownloader.installExtensionFromUUID(uuid, invocation);
|
return ExtensionDownloader.installExtension(uuid, invocation);
|
||||||
},
|
},
|
||||||
|
|
||||||
UninstallExtension: function(uuid) {
|
UninstallExtension: function(uuid) {
|
||||||
return ExtensionDownloader.uninstallExtensionFromUUID(uuid);
|
return ExtensionDownloader.uninstallExtension(uuid);
|
||||||
},
|
},
|
||||||
|
|
||||||
LaunchExtensionPrefs: function(uuid) {
|
LaunchExtensionPrefs: function(uuid) {
|
||||||
|
Loading…
Reference in New Issue
Block a user