[gnome-shell] wanda: Use an StIcon again for createIcon
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] wanda: Use an StIcon again for createIcon
- Date: Tue, 2 Oct 2012 21:42:58 +0000 (UTC)
commit e2ff5846df49a91413ee1749cac9ea6a74e77727
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Oct 2 16:16:56 2012 -0300
wanda: Use an StIcon again for createIcon
With the DND bug fixed, this is no longer necessary.
js/ui/wanda.js | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/js/ui/wanda.js b/js/ui/wanda.js
index 9850ebc..31b940d 100644
--- a/js/ui/wanda.js
+++ b/js/ui/wanda.js
@@ -1,11 +1,9 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const Clutter = imports.gi.Clutter;
const GdkPixbuf = imports.gi.GdkPixbuf;
const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
const St = imports.gi.St;
const IconGrid = imports.ui.iconGrid;
@@ -169,15 +167,8 @@ const WandaSearchProvider = new Lang.Class({
// only one which speaks the truth!
'name': capitalize(fish[0]),
'createIcon': function(iconSize) {
- // for DND only (maybe could be improved)
- // DON'T use St.Icon here, it crashes the shell
- // (dnd.js code assumes it can query the actor size
- // without parenting it, while StWidget accesses
- // StThemeNode in get_preferred_width/height, which
- // triggers an assertion failure)
- return St.TextureCache.get_default().load_icon_name(null,
- 'face-smile',
- iconSize);
+ return new St.Icon({ gicon: Gio.icon_new_for_string('face-smile'),
+ icon_size: iconSize });
}
}]);
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]