nautilus r13583 - in trunk: . data data/icons data/icons/16x16 data/icons/16x16/apps data/icons/22x22 data/icons/22x22/apps data/icons/24x24 data/icons/24x24/apps data/icons/32x32 data/icons/32x32/apps data/icons/scalable data/icons/scalable/apps icons icons/appicon

[lferrett svn gnome org]

Author: lferrett
Date: Thu Jan 10 13:50:53 2008
New Revision: 13583
URL: http://svn.gnome.org/viewvc/nautilus?rev=13583&view=rev

Log:
2008-01-10  Luca Ferretti  <elle uca libero it>

	* configure.in:
	* data/Makefile.am:
	* data/icons/*:
	* icons/Makefile.am:
	* icons/appicon/*:
	Move "nautilus" named icon from icon/appicon to data/icons
	matching the directory and naming structure of other GNOME
	projects.

	This will also help if we'll need to add custom themeable
	icons.



Added:
   trunk/data/icons/
   trunk/data/icons/16x16/
   trunk/data/icons/16x16/Makefile.am
   trunk/data/icons/16x16/apps/
   trunk/data/icons/16x16/apps/Makefile.am
      - copied unchanged from r13582, /trunk/icons/appicon/16x16/Makefile.am
   trunk/data/icons/16x16/apps/nautilus.png
      - copied unchanged from r13582, /trunk/icons/appicon/16x16/nautilus.png
   trunk/data/icons/16x16/apps/nautilus.svg
      - copied unchanged from r13582, /trunk/icons/appicon/16x16/nautilus.svg
   trunk/data/icons/22x22/
   trunk/data/icons/22x22/Makefile.am
   trunk/data/icons/22x22/apps/
   trunk/data/icons/22x22/apps/Makefile.am
      - copied unchanged from r13582, /trunk/icons/appicon/22x22/Makefile.am
   trunk/data/icons/22x22/apps/nautilus.png
      - copied unchanged from r13582, /trunk/icons/appicon/22x22/nautilus.png
   trunk/data/icons/22x22/apps/nautilus.svg
      - copied unchanged from r13582, /trunk/icons/appicon/22x22/nautilus.svg
   trunk/data/icons/24x24/
   trunk/data/icons/24x24/Makefile.am
   trunk/data/icons/24x24/apps/
   trunk/data/icons/24x24/apps/Makefile.am
      - copied unchanged from r13582, /trunk/icons/appicon/24x24/Makefile.am
   trunk/data/icons/24x24/apps/nautilus.png
      - copied unchanged from r13582, /trunk/icons/appicon/24x24/nautilus.png
   trunk/data/icons/32x32/
   trunk/data/icons/32x32/Makefile.am
   trunk/data/icons/32x32/apps/
   trunk/data/icons/32x32/apps/Makefile.am
      - copied unchanged from r13582, /trunk/icons/appicon/32x32/Makefile.am
   trunk/data/icons/32x32/apps/nautilus.png
      - copied unchanged from r13582, /trunk/icons/appicon/32x32/nautilus.png
   trunk/data/icons/32x32/apps/nautilus.svg
      - copied unchanged from r13582, /trunk/icons/appicon/32x32/nautilus.svg
   trunk/data/icons/Makefile.am
   trunk/data/icons/scalable/
   trunk/data/icons/scalable/Makefile.am
   trunk/data/icons/scalable/apps/
   trunk/data/icons/scalable/apps/Makefile.am
      - copied unchanged from r13582, /trunk/icons/appicon/scalable/Makefile.am
   trunk/data/icons/scalable/apps/nautilus.svg
      - copied unchanged from r13582, /trunk/icons/appicon/scalable/nautilus.svg
Removed:
   trunk/icons/appicon/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/Makefile.am
   trunk/icons/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan 10 13:50:53 2008
@@ -462,15 +462,20 @@
 cut-n-paste-code/gsequence/Makefile
 cut-n-paste-code/widgets/Makefile
 data/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/16x16/apps/Makefile
+data/icons/22x22/Makefile
+data/icons/22x22/apps/Makefile
+data/icons/24x24/Makefile
+data/icons/24x24/apps/Makefile
+data/icons/32x32/Makefile
+data/icons/32x32/apps/Makefile
+data/icons/scalable/Makefile
+data/icons/scalable/apps/Makefile
 data/patterns/Makefile
 docs/Makefile
 icons/Makefile
-icons/appicon/Makefile
-icons/appicon/16x16/Makefile
-icons/appicon/22x22/Makefile
-icons/appicon/24x24/Makefile
-icons/appicon/32x32/Makefile
-icons/appicon/scalable/Makefile
 libbackground/Makefile
 libnautilus-private/Makefile
 libnautilus-extension/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Jan 10 13:50:53 2008
@@ -22,6 +22,7 @@
 CLEANFILES = $(xml_files)
 
 SUBDIRS = \
+	icons    \
 	patterns \
 	$(NULL)
 

Added: trunk/data/icons/16x16/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/16x16/Makefile.am	Thu Jan 10 13:50:53 2008
@@ -0,0 +1 @@
+SUBDIRS = apps

Added: trunk/data/icons/22x22/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/22x22/Makefile.am	Thu Jan 10 13:50:53 2008
@@ -0,0 +1 @@
+SUBDIRS = apps

Added: trunk/data/icons/24x24/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/24x24/Makefile.am	Thu Jan 10 13:50:53 2008
@@ -0,0 +1 @@
+SUBDIRS = apps

Added: trunk/data/icons/32x32/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/32x32/Makefile.am	Thu Jan 10 13:50:53 2008
@@ -0,0 +1 @@
+SUBDIRS = apps

Added: trunk/data/icons/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/Makefile.am	Thu Jan 10 13:50:53 2008
@@ -0,0 +1,14 @@
+SUBDIRS = 16x16 22x22 24x24 32x32 scalable
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi

Added: trunk/data/icons/scalable/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/scalable/Makefile.am	Thu Jan 10 13:50:53 2008
@@ -0,0 +1 @@
+SUBDIRS = apps

Modified: trunk/icons/Makefile.am
==============================================================================
--- trunk/icons/Makefile.am	(original)
+++ trunk/icons/Makefile.am	Thu Jan 10 13:50:53 2008
@@ -1,7 +1,5 @@
 NULL=
 
-SUBDIRS = appicon
-
 icondir = $(datadir)/pixmaps/nautilus
 
 icon_DATA =\