diff options
author | Bastien Nocera <hadess@hadess.net> | 2010-05-07 16:32:06 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2010-05-10 02:32:47 +0100 |
commit | bafb33207f2054d01d3cce6cf9dc48e149809ee4 (patch) | |
tree | e561757b5b3fb6dcf4603353cd497d11536be0da | |
parent | ab0e7fcf4239c583c1480c5c3031aa4500f175f7 (diff) | |
download | gnome-settings-daemon-bafb33207f2054d01d3cce6cf9dc48e149809ee4.tar.gz |
Fix loading OSD icons when there's no SVG version
In gnome-icon-theme in 2.30.x, there's no SVG icons anymore,
so the OSD popups won't look like the rest of the system,
as "hand-drawn" icons will be used instead.
https://bugzilla.gnome.org/show_bug.cgi?id=618023
-rw-r--r-- | plugins/media-keys/gsd-media-keys-window.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c index 4b736e9c..25470680 100644 --- a/plugins/media-keys/gsd-media-keys-window.c +++ b/plugins/media-keys/gsd-media-keys-window.c @@ -208,22 +208,9 @@ load_pixbuf (GsdMediaKeysWindow *window, pixbuf = gtk_icon_theme_load_icon (theme, name, icon_size, - GTK_ICON_LOOKUP_FORCE_SVG, + GTK_ICON_LOOKUP_FORCE_SIZE, NULL); - /* make sure the pixbuf is close to the requested size - * this is necessary because GTK_ICON_LOOKUP_FORCE_SVG - * seems to be broken */ - if (pixbuf != NULL) { - int width; - - width = gdk_pixbuf_get_width (pixbuf); - if (width < (float)icon_size * 0.75) { - g_object_unref (pixbuf); - pixbuf = NULL; - } - } - return pixbuf; } |