diff options
author | 2011-11-26 15:45:01 +0100 | |
---|---|---|
committer | 2011-11-26 15:45:01 +0100 | |
commit | 8553e8ba35306bb52a0998d83393dc93ad6de88a (patch) | |
tree | 7de2731c6b5ee5ef28657ef1e09d4ab35da672e0 | |
parent | 088d8259a2dac2bd89fd1ad958d69ee0a46953df (diff) |
install icons into gtk prefix
-rw-r--r-- | icons/Makefile.am | 30 | ||||
-rw-r--r-- | plugins/gtkui/gtkui.c | 1 |
2 files changed, 18 insertions, 13 deletions
diff --git a/icons/Makefile.am b/icons/Makefile.am index de0a5234..bdcbb14e 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,42 +1,46 @@ iconspath=@top_srcdir@/icons -icon16dir=$(prefix)/share/icons/hicolor/16x16/apps +# icons should always be installed into gtk prefix (either gtk2 or gtk3 - doesn't +# matter) +GTK_PREFIX=`pkg-config --variable=prefix gtk+-2.0 || pkg-config --variable=prefix gtk+-3.0` + +icon16dir=$(GTK_PREFIX)/share/icons/hicolor/16x16/apps icon16_DATA=$(iconspath)/16x16/deadbeef.png -icon22dir=$(prefix)/share/icons/hicolor/22x22/apps +icon22dir=$(GTK_PREFIX)/share/icons/hicolor/22x22/apps icon22_DATA=$(iconspath)/22x22/deadbeef.png -icon24dir=$(prefix)/share/icons/hicolor/24x24/apps +icon24dir=$(GTK_PREFIX)/share/icons/hicolor/24x24/apps icon24_DATA=$(iconspath)/24x24/deadbeef.png -icon32dir=$(prefix)/share/icons/hicolor/32x32/apps +icon32dir=$(GTK_PREFIX)/share/icons/hicolor/32x32/apps icon32_DATA=$(iconspath)/32x32/deadbeef.png -icon36dir=$(prefix)/share/icons/hicolor/36x36/apps +icon36dir=$(GTK_PREFIX)/share/icons/hicolor/36x36/apps icon36_DATA=$(iconspath)/36x36/deadbeef.png -icon48dir=$(prefix)/share/icons/hicolor/48x48/apps +icon48dir=$(GTK_PREFIX)/share/icons/hicolor/48x48/apps icon48_DATA=$(iconspath)/48x48/deadbeef.png -icon64dir=$(prefix)/share/icons/hicolor/64x64/apps +icon64dir=$(GTK_PREFIX)/share/icons/hicolor/64x64/apps icon64_DATA=$(iconspath)/64x64/deadbeef.png -icon72dir=$(prefix)/share/icons/hicolor/72x72/apps +icon72dir=$(GTK_PREFIX)/share/icons/hicolor/72x72/apps icon72_DATA=$(iconspath)/72x72/deadbeef.png -icon96dir=$(prefix)/share/icons/hicolor/96x96/apps +icon96dir=$(GTK_PREFIX)/share/icons/hicolor/96x96/apps icon96_DATA=$(iconspath)/96x96/deadbeef.png -icon128dir=$(prefix)/share/icons/hicolor/128x128/apps +icon128dir=$(GTK_PREFIX)/share/icons/hicolor/128x128/apps icon128_DATA=$(iconspath)/128x128/deadbeef.png -icon192dir=$(prefix)/share/icons/hicolor/192x192/apps +icon192dir=$(GTK_PREFIX)/share/icons/hicolor/192x192/apps icon192_DATA=$(iconspath)/192x192/deadbeef.png -icon256dir=$(prefix)/share/icons/hicolor/256x256/apps +icon256dir=$(GTK_PREFIX)/share/icons/hicolor/256x256/apps icon256_DATA=$(iconspath)/256x256/deadbeef.png -iconscalabledir=$(prefix)/share/icons/hicolor/scalable/apps +iconscalabledir=$(GTK_PREFIX)/share/icons/hicolor/scalable/apps iconscalable_DATA=$(iconspath)/scalable/deadbeef.svg EXTRA_DIST = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) $(icon36_DATA) $(icon48_DATA) $(icon64_DATA) $(icon72_DATA) $(icon96_DATA) $(icon128_DATA) $(icon192_DATA) $(icon256_DATA) $(iconscalable_DATA) diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 935d5871..fc18fecb 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -1053,6 +1053,7 @@ gtkui_thread (void *ctx) { gtk_window_set_icon_name (GTK_WINDOW (mainwin), "deadbeef"); } else { + // try loading icon from $prefix/deadbeef.png (for static build) char iconpath[1024]; snprintf (iconpath, sizeof (iconpath), "%s/deadbeef.png", deadbeef->get_prefix ()); gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), iconpath, NULL); |