diff options
| author | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2006-05-05 12:42:32 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2006-05-05 12:42:32 +0000 |
| commit | 9d4494489db90209bcdb7d104189d26ab7c58c60 (patch) | |
| tree | 1c6ecd039dc2754f6182843eba586d829e77a45d | |
| parent | c88a140a7471a911342c3747d506b83c56562c93 (diff) | |
| download | metacity-9d4494489db90209bcdb7d104189d26ab7c58c60.tar.gz | |
images from icon themes is a versioned enhancement
| -rw-r--r-- | src/theme.c | 3 | ||||
| -rw-r--r-- | src/theme.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/theme.c b/src/theme.c index b915e4d6..a391d727 100644 --- a/src/theme.c +++ b/src/theme.c @@ -4623,7 +4623,8 @@ meta_theme_load_image (MetaTheme *theme, if (pixbuf == NULL) { - if (g_str_has_prefix (filename, "theme:")) + if (g_str_has_prefix (filename, "theme:") && + META_THEME_ALLOWS (theme, META_THEME_IMAGES_FROM_ICON_THEMES)) { pixbuf = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default (), diff --git a/src/theme.h b/src/theme.h index aef47a83..a0f35105 100644 --- a/src/theme.h +++ b/src/theme.h @@ -858,5 +858,6 @@ guint meta_theme_earliest_version_with_button (MetaButtonType type); /* What version of the theme file format were various features introduced in? */ #define META_THEME_UBIQUITOUS_CONSTANTS 2 #define META_THEME_VARIED_ROUND_CORNERS 2 +#define META_THEME_IMAGES_FROM_ICON_THEMES 2 #endif |