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

background: Don't wait for gdk-pixbuf to fail before loading animations

Browse Source 
We don't have any better way of determining whether something is a slideshow
animation, so discriminate on the .xml filename instead of waiting for
gdk-pixbuf to determine whether it can load a file or not.

https://bugzilla.gnome.org/show_bug.cgi?id=719803
This commit is contained in:
Jasper St. Pierre 2013-12-03 15:56:12 -05:00
parent dbdc884c96
commit eb1c85f3f5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/background.js
View File

@ -536,24 +536,25 @@ const Background = new Lang.Class({
}); });
}, },
_loadFile: function(filename) { _loadImage: function(filename) {
this._cache.getImageContent({ monitorIndex: this._monitorIndex, this._cache.getImageContent({ monitorIndex: this._monitorIndex,
effects: this._effects, effects: this._effects,
style: this._style, style: this._style,
filename: filename, filename: filename,
cancellable: this._cancellable, cancellable: this._cancellable,
onFinished: Lang.bind(this, function(content) { onFinished: Lang.bind(this, function(content) {
if (!content) { if (content)
if (!this._cancellable.is_cancelled()) this._addImage(content, 0, filename);
this._loadAnimation(filename);
return;
}
this._addImage(content, 0, filename);
this._setLoaded(); this._setLoaded();
}) })
}); });
},
_loadFile: function(filename) {
if (filename.endsWith('.xml'))
this._loadAnimation(filename);
else
this._loadImage(filename);
}, },
_load: function () { _load: function () {