aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--data/art/Makefile.am13
-rw-r--r--data/bme.desktop.in.in2
-rw-r--r--data/epiphany.desktop.in.in2
4 files changed, 22 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 958632328..2b0b93ff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-10 Paul Drain <pd@cipherfunk.org>
+
+ * data/art/Makefile.am:
+ * data/bme-desktop.in.in:
+ * data/epiphany-desktop.in.in:
+
+ Install App-Friendly Theme Icons (GNOME Goal Two)
+
2006-04-10 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-find-toolbar.c:
diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index 24a6892a5..1e4af4dc8 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -6,8 +6,19 @@ art_DATA = \
epiphany-bookmarks.png
appicon_DATA = epiphany-bookmarks.png
-appicondir = $(datadir)/pixmaps
+appicondir = $(datadir)/icons/hicolor/48x48/apps
artdir = $(pkgdatadir)/art
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating GTK+ icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
+
EXTRA_DIST = $(appicon_DATA) $(art_DATA)
diff --git a/data/bme.desktop.in.in b/data/bme.desktop.in.in
index acefabe19..b363d4de9 100644
--- a/data/bme.desktop.in.in
+++ b/data/bme.desktop.in.in
@@ -7,7 +7,7 @@ Exec=epiphany --bookmarks-editor
StartupNotify=true
Terminal=false
Type=Application
-Icon=epiphany-bookmarks.png
+Icon=epiphany-bookmarks
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=epiphany
X-GNOME-Bugzilla-Component=General
diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in.in
index 9f57afd5f..90675b257 100644
--- a/data/epiphany.desktop.in.in
+++ b/data/epiphany.desktop.in.in
@@ -7,7 +7,7 @@ Exec=epiphany %U
StartupNotify=true
Terminal=false
Type=Application
-Icon=web-browser.png
+Icon=web-browser
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=epiphany
X-GNOME-Bugzilla-Component=General