diff options
| author | Thomas Thurman <tthurman@gnome.org> | 2008-10-15 21:01:54 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-10-15 21:01:54 +0000 |
| commit | 7d67a9aee9bce86f478f3f83caeb8205da7dd398 (patch) | |
| tree | 34d9e7740885395911c2bca060e93185e902ded5 /src/core | |
| parent | b1b8d5126406d454375f0556b7a82dfd60ec8b04 (diff) | |
| download | metacity-7d67a9aee9bce86f478f3f83caeb8205da7dd398.tar.gz | |
Since Patrick Niklaus's checkin of 2008-08-14 dealt with windows with no
2008-10-15 Thomas Thurman <tthurman@gnome.org>
Since Patrick Niklaus's checkin of 2008-08-14 dealt with windows with
no icons not using fallback icons, we don't need fallback icons.
* src/ui/theme.h: remove fallback icons from struct.
* src/core/iconcache.c (meta_read_icons): don't look for fallbacks.
* src/*/ui.[ch] (meta_ui_get_fallback_icons): removed
* src/ui/theme-parser.c (typedef, parse_toplevel_element): don't
parse fallback specifications.
svn path=/trunk/; revision=3958
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/iconcache.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/core/iconcache.c b/src/core/iconcache.c index db96bbbb..c4fd19f5 100644 --- a/src/core/iconcache.c +++ b/src/core/iconcache.c @@ -817,30 +817,14 @@ meta_read_icons (MetaScreen *screen, if (icon_cache->want_fallback && icon_cache->origin < USING_FALLBACK_ICON) { - GdkPixbuf *fallback_icon; - GdkPixbuf *fallback_mini_icon; - - fallback_icon = NULL; - fallback_mini_icon = NULL; - - meta_ui_get_fallback_icons(&fallback_icon, &fallback_mini_icon); - - if (fallback_icon == NULL || fallback_mini_icon == NULL) - { - get_fallback_icons (screen, - iconp, - ideal_width, - ideal_height, - mini_iconp, - ideal_mini_width, - ideal_mini_height); - } + get_fallback_icons (screen, + iconp, + ideal_width, + ideal_height, + mini_iconp, + ideal_mini_width, + ideal_mini_height); - if (fallback_icon != NULL) - *iconp = fallback_icon; - if (fallback_mini_icon != NULL) - *mini_iconp = fallback_mini_icon; - replace_cache (icon_cache, USING_FALLBACK_ICON, *iconp, *mini_iconp); |