gnome-media r4157 - in trunk/gnome-volume-control: . data/icons data/icons/16x16/apps data/icons/22x22/apps data/icons/24x24/apps data/icons/32x32/apps data/icons/48x48/apps data/icons/scalable/apps

[hadess svn gnome org]

Author: hadess
Date: Fri Jan 23 16:14:21 2009
New Revision: 4157
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4157&view=rev

Log:
2009-01-23  Bastien Nocera  <hadess hadess net>

	* data/icons/16x16/apps/Makefile.am:
	* data/icons/22x22/apps/Makefile.am:
	* data/icons/24x24/apps/Makefile.am:
	* data/icons/32x32/apps/Makefile.am:
	* data/icons/48x48/apps/Makefile.am:
	* data/icons/scalable/apps/Makefile.am:
	Install the application icon in the global
	icon theme, not in our private directory
	(Closes: #568635)

	* data/icons/Makefile.am: Don't run gtk-update-icon-cache
	for a private icons directory



Modified:
   trunk/gnome-volume-control/ChangeLog
   trunk/gnome-volume-control/data/icons/16x16/apps/Makefile.am
   trunk/gnome-volume-control/data/icons/22x22/apps/Makefile.am
   trunk/gnome-volume-control/data/icons/24x24/apps/Makefile.am
   trunk/gnome-volume-control/data/icons/32x32/apps/Makefile.am
   trunk/gnome-volume-control/data/icons/48x48/apps/Makefile.am
   trunk/gnome-volume-control/data/icons/Makefile.am
   trunk/gnome-volume-control/data/icons/scalable/apps/Makefile.am

Modified: trunk/gnome-volume-control/data/icons/16x16/apps/Makefile.am
==============================================================================
--- trunk/gnome-volume-control/data/icons/16x16/apps/Makefile.am	(original)
+++ trunk/gnome-volume-control/data/icons/16x16/apps/Makefile.am	Fri Jan 23 16:14:21 2009
@@ -1,6 +1,6 @@
 NULL =
 
-themedir = $(pkgdatadir)/icons/hicolor
+themedir = $(datadir)/icons/hicolor
 size = 16x16
 context = apps
 

Modified: trunk/gnome-volume-control/data/icons/22x22/apps/Makefile.am
==============================================================================
--- trunk/gnome-volume-control/data/icons/22x22/apps/Makefile.am	(original)
+++ trunk/gnome-volume-control/data/icons/22x22/apps/Makefile.am	Fri Jan 23 16:14:21 2009
@@ -1,6 +1,6 @@
 NULL =
 
-themedir = $(pkgdatadir)/icons/hicolor
+themedir = $(datadir)/icons/hicolor
 size = 22x22
 context = apps
 

Modified: trunk/gnome-volume-control/data/icons/24x24/apps/Makefile.am
==============================================================================
--- trunk/gnome-volume-control/data/icons/24x24/apps/Makefile.am	(original)
+++ trunk/gnome-volume-control/data/icons/24x24/apps/Makefile.am	Fri Jan 23 16:14:21 2009
@@ -1,6 +1,6 @@
 NULL =
 
-themedir = $(pkgdatadir)/icons/hicolor
+themedir = $(datadir)/icons/hicolor
 size = 24x24
 context = apps
 

Modified: trunk/gnome-volume-control/data/icons/32x32/apps/Makefile.am
==============================================================================
--- trunk/gnome-volume-control/data/icons/32x32/apps/Makefile.am	(original)
+++ trunk/gnome-volume-control/data/icons/32x32/apps/Makefile.am	Fri Jan 23 16:14:21 2009
@@ -1,6 +1,6 @@
 NULL =
 
-themedir = $(pkgdatadir)/icons/hicolor
+themedir = $(datadir)/icons/hicolor
 size = 32x32
 context = apps
 

Modified: trunk/gnome-volume-control/data/icons/48x48/apps/Makefile.am
==============================================================================
--- trunk/gnome-volume-control/data/icons/48x48/apps/Makefile.am	(original)
+++ trunk/gnome-volume-control/data/icons/48x48/apps/Makefile.am	Fri Jan 23 16:14:21 2009
@@ -1,6 +1,6 @@
 NULL =
 
-themedir = $(pkgdatadir)/icons/hicolor
+themedir = $(datadir)/icons/hicolor
 size = 48x48
 context = apps
 

Modified: trunk/gnome-volume-control/data/icons/Makefile.am
==============================================================================
--- trunk/gnome-volume-control/data/icons/Makefile.am	(original)
+++ trunk/gnome-volume-control/data/icons/Makefile.am	Fri Jan 23 16:14:21 2009
@@ -9,7 +9,7 @@
 	48x48		\
 	$(NULL)
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache

Modified: trunk/gnome-volume-control/data/icons/scalable/apps/Makefile.am
==============================================================================
--- trunk/gnome-volume-control/data/icons/scalable/apps/Makefile.am	(original)
+++ trunk/gnome-volume-control/data/icons/scalable/apps/Makefile.am	Fri Jan 23 16:14:21 2009
@@ -1,6 +1,6 @@
 NULL =
 
-themedir = $(pkgdatadir)/icons/hicolor
+themedir = $(datadir)/icons/hicolor
 size = scalable
 context = apps