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

extensionSystem: Start using OUT_OF_DATE

Browse Source 
We were defining OUT_OF_DATE as a possible state, but never using it
properly.

https://bugzilla.gnome.org/show_bug.cgi?id=654770
This commit is contained in:
Jasper St. Pierre 2011-07-05 14:40:48 -04:00
parent 465d03ab2c
commit 6241a8269f
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/extensionSystem.js
View File

@ -128,6 +128,12 @@ function installExtensionFromManifest(manifest, meta) {
let uuid = manifest['uuid']; let uuid = manifest['uuid'];
let name = manifest['name']; let name = manifest['name'];
if (!versionCheck(manifest['shell-version'], Config.PACKAGE_VERSION)) {
meta.state = ExtensionState.OUT_OF_DATE;
logExtensionError(uuid, 'version: ' + name + ' is not compatible with current GNOME Shell version', meta.state);
return;
}
let url = manifest['__installer']; let url = manifest['__installer'];
_httpSession.queue_message(Soup.Message.new('GET', url), _httpSession.queue_message(Soup.Message.new('GET', url),
function(session, message) { function(session, message) {
@ -213,13 +219,14 @@ function enableExtension(uuid) {
_signals.emit('extension-state-changed', meta); _signals.emit('extension-state-changed', meta);
} }
function logExtensionError(uuid, message) { function logExtensionError(uuid, message, state) {
if (!errors[uuid]) errors[uuid] = []; if (!errors[uuid]) errors[uuid] = [];
errors[uuid].push(message); errors[uuid].push(message);
global.logError('Extension "%s" had error: %s'.format(uuid, message)); global.logError('Extension "%s" had error: %s'.format(uuid, message));
state = state || ExtensionState.ERROR;
_signals.emit('extension-state-changed', { uuid: uuid, _signals.emit('extension-state-changed', { uuid: uuid,
error: message, error: message,
state: ExtensionState.ERROR }); state: state });
} }
function loadExtension(dir, enabled, type) { function loadExtension(dir, enabled, type) {
@ -285,6 +292,13 @@ function loadExtension(dir, enabled, type) {
// Default to error, we set success as the last step // Default to error, we set success as the last step
meta.state = ExtensionState.ERROR; meta.state = ExtensionState.ERROR;
if (!versionCheck(meta['shell-version'], Config.PACKAGE_VERSION) ||
(meta['js-version'] && !versionCheck(meta['js-version'], Config.GJS_VERSION))) {
logExtensionError(uuid, 'extension is not compatible with current GNOME Shell and/or GJS version', ExtensionState.OUT_OF_DATE);
meta.state = ExtensionState.OUT_OF_DATE;
return;
}
let extensionJs = dir.get_child('extension.js'); let extensionJs = dir.get_child('extension.js');
if (!extensionJs.query_exists(null)) { if (!extensionJs.query_exists(null)) {
logExtensionError(uuid, 'Missing extension.js'); logExtensionError(uuid, 'Missing extension.js');