gnome-icon-theme r1814 - in trunk: . 24x24/apps 48x48/apps 48x48/emblems 48x48/status scalable/emblems

[dobey svn gnome org]

Author: dobey
Date: Thu Jun 12 13:06:34 2008
New Revision: 1814
URL: http://svn.gnome.org/viewvc/gnome-icon-theme?rev=1814&view=rev

Log:
2008-06-12  Rodney Dawes  <dobey pwns gmail com>

	* 24x24/apps/Makefile.am:
	* 24x24/apps/display-capplet.png:
	Remove this as control-center ships its own
	
	* 48x48/apps/Makefile.am:
	* 48x48/apps/gnome-amusements.png:
	* 48x48/apps/gnome-audio.png:
	* 48x48/apps/gnome-desktop-config.png:
	* 48x48/apps/gnome-pdf.png:
	* 48x48/apps/gnome-server-config.png:
	* 48x48/apps/gnome-system-config.png:
	* 48x48/apps/hint.png:
	* 48x48/apps/im.png:
	* 48x48/apps/launcher-program.png:
	* 48x48/apps/postscript-viewer.png:
	Remove more deprecated icons

	* 48x48/emblems/Makefile.am:
	* 48x48/emblems/emblem-OK.*:
	* 48x48/emblems/emblem-camera.*:
	* 48x48/emblems/emblem-distinguished.*:
	* 48x48/emblems/emblem-draft.*:
	* 48x48/emblems/emblem-handshake.*:
	* 48x48/emblems/emblem-note.*:
	* 48x48/emblems/emblem-people.*:
	* 48x48/emblems/emblem-pictures.*:
	* 48x48/emblems/emblem-presentation.*:
	* 48x48/emblems/emblem-sound.*:
	* 48x48/emblems/emblem-trash.*:
	Remove some otherwise useless emblems

	* 48x48/emblems/Makefile.am:
	* 48x48/emblems/emblem-desktop.*:
	* scalable/emblems/Makefile.am:
	* scalable/emblems/emblem-desktop.*:
	Replaced the old emblem-desktop with a new style version



Added:
   trunk/scalable/emblems/emblem-desktop.icon.in
      - copied unchanged from r1808, /trunk/48x48/emblems/emblem-desktop.icon.in
   trunk/scalable/emblems/emblem-desktop.svg
      - copied unchanged from r1808, /trunk/scalable/places/user-desktop.svg
Removed:
   trunk/24x24/apps/display-capplet.png
   trunk/48x48/apps/gnome-amusements.png
   trunk/48x48/apps/gnome-audio.png
   trunk/48x48/apps/gnome-desktop-config.png
   trunk/48x48/apps/gnome-pdf.png
   trunk/48x48/apps/gnome-server-config.png
   trunk/48x48/apps/gnome-system-config.png
   trunk/48x48/apps/hint.png
   trunk/48x48/apps/im.png
   trunk/48x48/apps/launcher-program.png
   trunk/48x48/apps/postscript-viewer.png
   trunk/48x48/emblems/emblem-OK.icon.in
   trunk/48x48/emblems/emblem-OK.png
   trunk/48x48/emblems/emblem-camera.icon.in
   trunk/48x48/emblems/emblem-camera.png
   trunk/48x48/emblems/emblem-desktop.icon.in
   trunk/48x48/emblems/emblem-desktop.png
   trunk/48x48/emblems/emblem-distinguished.icon.in
   trunk/48x48/emblems/emblem-distinguished.png
   trunk/48x48/emblems/emblem-draft.icon.in
   trunk/48x48/emblems/emblem-draft.png
   trunk/48x48/emblems/emblem-handshake.icon.in
   trunk/48x48/emblems/emblem-handshake.png
   trunk/48x48/emblems/emblem-note.icon.in
   trunk/48x48/emblems/emblem-note.png
   trunk/48x48/emblems/emblem-people.icon.in
   trunk/48x48/emblems/emblem-people.png
   trunk/48x48/emblems/emblem-pictures.icon.in
   trunk/48x48/emblems/emblem-pictures.png
   trunk/48x48/emblems/emblem-presentation.icon.in
   trunk/48x48/emblems/emblem-presentation.png
   trunk/48x48/emblems/emblem-sound.icon.in
   trunk/48x48/emblems/emblem-sound.png
   trunk/48x48/emblems/emblem-trash.icon.in
   trunk/48x48/emblems/emblem-trash.png
   trunk/48x48/status/
Modified:
   trunk/24x24/apps/Makefile.am
   trunk/48x48/apps/Makefile.am
   trunk/48x48/emblems/Makefile.am
   trunk/ChangeLog
   trunk/scalable/emblems/Makefile.am

Modified: trunk/24x24/apps/Makefile.am
==============================================================================
--- trunk/24x24/apps/Makefile.am	(original)
+++ trunk/24x24/apps/Makefile.am	Thu Jun 12 13:06:34 2008
@@ -14,7 +14,6 @@
 	applets-screenshooter.png	\
 	boot.png			\
 	character-picker.png		\
-	display-capplet.png		\
 	evolution-calendar.png		\
 	evolution-mail.png		\
 	evolution-tasks.png		\

Modified: trunk/48x48/apps/Makefile.am
==============================================================================
--- trunk/48x48/apps/Makefile.am	(original)
+++ trunk/48x48/apps/Makefile.am	Thu Jun 12 13:06:34 2008
@@ -14,24 +14,14 @@
 	config-xfree.png		\
 	disks.png			\
 	gdm.png				\
-	gnome-amusements.png		\
-	gnome-audio.png			\
-	gnome-desktop-config.png 	\
 	gnome-favorites.png		\
 	gnome-finance.png		\
 	gnome-networktool.png		\
-	gnome-pdf.png			\
-	gnome-server-config.png		\
 	gnome-settings-default-applications.png		\
-	gnome-system-config.png		\
-	hint.png			\
 	hwbrowser.png			\
-	im.png				\
-	launcher-program.png		\
 	network-config.png		\
 	palm-pilot.png			\
 	palm-pilot-sync.png		\
-	postscript-viewer.png		\
 	serviceconf.png			\
 	visor.png			\
 	$(NULL)

Modified: trunk/48x48/emblems/Makefile.am
==============================================================================
--- trunk/48x48/emblems/Makefile.am	(original)
+++ trunk/48x48/emblems/Makefile.am	Thu Jun 12 13:06:34 2008
@@ -7,28 +7,16 @@
 
 icon_in_files =				\
 	emblem-art.icon.in		\
-	emblem-camera.icon.in		\
 	emblem-certified.icon.in 	\
 	emblem-cool.icon.in		\
 	emblem-danger.icon.in		\
-	emblem-desktop.icon.in		\
-	emblem-distinguished.icon.in	\
-	emblem-draft.icon.in		\
-	emblem-handshake.icon.in	\
 	emblem-marketing.icon.in	\
 	emblem-money.icon.in		\
 	emblem-multimedia.icon.in	\
-	emblem-note.icon.in		\
 	emblem-ohno.icon.in		\
-	emblem-OK.icon.in 		\
-	emblem-people.icon.in		\
 	emblem-personal.icon.in		\
-	emblem-pictures.icon.in		\
 	emblem-plan.icon.in		\
-	emblem-presentation.icon.in	\
 	emblem-sales.icon.in		\
-	emblem-sound.icon.in		\
-	emblem-trash.icon.in		\
 	$(NULL)
 
 icons_DATA = $(icon_in_files:.icon.in=.icon)
@@ -36,27 +24,15 @@
 png_DATA =				\
 	emblem-art.png			\
 	emblem-cool.png			\
-	emblem-camera.png		\
 	emblem-certified.png		\
 	emblem-danger.png		\
-	emblem-desktop.png		\
-	emblem-distinguished.png	\
-	emblem-draft.png		\
-	emblem-handshake.png		\
 	emblem-marketing.png		\
 	emblem-money.png		\
 	emblem-multimedia.png		\
-	emblem-note.png			\
 	emblem-ohno.png			\
-	emblem-OK.png			\
-	emblem-people.png		\
 	emblem-personal.png		\
-	emblem-pictures.png		\
 	emblem-plan.png			\
-	emblem-presentation.png		\
 	emblem-sales.png		\
-	emblem-sound.png		\
-	emblem-trash.png		\
 	$(NULL)
 
 %.icon:   %.icon.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache

Modified: trunk/scalable/emblems/Makefile.am
==============================================================================
--- trunk/scalable/emblems/Makefile.am	(original)
+++ trunk/scalable/emblems/Makefile.am	Thu Jun 12 13:06:34 2008
@@ -6,6 +6,7 @@
 svgdir = $(iconsdir)
 
 icon_in_files =				\
+	emblem-desktop.icon.in		\
 	emblem-documents.icon.in	\
 	emblem-downloads.icon.in	\
 	emblem-favorite.icon.in		\
@@ -26,6 +27,7 @@
 
 svg_DATA =				\
 	emblem-default.svg		\
+	emblem-desktop.svg		\
 	emblem-documents.svg		\
 	emblem-downloads.svg		\
 	emblem-favorite.svg		\