VesperOS/gnome-shell-extensions
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

places-menu: make the icon query asynchronous

Browse Source 
Don't use the sync version of g_file_query_info because that might
potentially block (especially when the connection is slow or drops).

https://bugzilla.gnome.org/show_bug.cgi?id=781765
This commit is contained in:
Christian Kellner
2017-04-26 23:48:16 +02:00
parent 8453cf05a7
commit 8a4b245812
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/places-menu/placeDisplay.js
+24 -17
View File
@@ -61,24 +61,31 @@ const PlaceInfo = new Lang.Class({
},
getIcon: function() {
try {
let info = this.file.query_info('standard::symbolic-icon', 0, null);
return info.get_symbolic_icon();
} catch(e if e instanceof Gio.IOErrorEnum) {
// return a generic icon for this kind
switch (this.kind) {
case 'network':
this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
Lang.bind(this, function(file, result) {
try {
let info = file.query_info_finish(result);
this.icon = info.get_symbolic_icon();
this.emit('changed');
} catch(e if e instanceof Gio.IOErrorEnum) {
return;
}
}));
// return a generic icon for this kind for now, until we have the
// icon from the query info above
switch (this.kind) {
case 'network':
return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
case 'devices':
return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
case 'special':
case 'bookmarks':
default:
if (!this.file.is_native())
return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
case 'devices':
return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
case 'special':
case 'bookmarks':
default:
if (!this.file.is_native())
return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
else
return new Gio.ThemedIcon({ name: 'folder-symbolic' });
}
else
return new Gio.ThemedIcon({ name: 'folder-symbolic' });
}
},