summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorPatrick Niklaus <marex@compiz-fusion.org>2008-08-14 14:01:51 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-08-14 14:01:51 +0000
commit5631cbe22d9ef06db1406881f8407d705b26aff5 (patch)
treeafc7e4777582b5aa0238c973b852294e6e7fcc6e /src/Makefile.am
parent92fe1574ec11a89b40750be7a9961c31c6163db8 (diff)
downloadmetacity-5631cbe22d9ef06db1406881f8407d705b26aff5.tar.gz
metacity-5631cbe22d9ef06db1406881f8407d705b26aff5.tar.bz2
Icons for windows are taken from the desktop theme, not from the Metacity
2008-08-14 Patrick Niklaus <marex@compiz-fusion.org> Icons for windows are taken from the desktop theme, not from the Metacity theme or from the fallback icon that Metacity provided. Closes #524343. * src/ui/ui.c: Use GtkIconTheme to load the default window icon. Assumes the existence of an icon called "window", otherwise falls back to "gtk-missing-image". Fixes #524343. * src/ui/preview-widget: See above. * src/include/common.h: Add META_DEFAULT_ICON_NAME. * src/Makefile.am: Remove default_icon.png from inlinepixbufs.h. * src/default_icon.png: Removed. svn path=/trunk/; revision=3812
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f45a6f..eafb5ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -180,9 +180,8 @@ else
install-data-local:
endif
-IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
-VARIABLES=default_icon_data $(srcdir)/default_icon.png \
- stock_maximize_data $(srcdir)/stock_maximize.png \
+IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
+VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
stock_minimize_data $(srcdir)/stock_minimize.png \
stock_delete_data $(srcdir)/stock_delete.png