Require icon-naming-utils >= 0.6.5 for compat Set the themedir variable

2006-01-16  Rodney Dawes  <dobey@novell.com>

	* configure.in: Require icon-naming-utils >= 0.6.5 for compat
	Set the themedir variable here, to improve maintainability

	* index.theme.in: Update for new contexts, and removals

	* *: Update to use the icon naming spec where we can for now
	Get rid of extra duplicate icons, and use generic versions instead
	Remove extraneous sizes to prepare for 16, 22, and scalable only in
	the future

	Solves #317460, #318505, #163693, #303601, #112909, #169745

1 files changed, 74 insertions, 194 deletions

diff --git a/index.theme.in b/index.theme.in
index 5c54d48b3..e12617d29 100755
--- a/index.theme.in
+++ b/index.theme.in
@@ -1,86 +1,21 @@
 [Icon Theme]
 _Name=GNOME
 _Comment=Default GNOME Theme
-Directories=192x192/apps,192x192/devices,192x192/emblems,192x192/filesystems,192x192/mimetypes,96x96/apps,96x96/devices,96x96/emblems,96x96/filesystems,96x96/mimetypes,72x72/apps,72x72/devices,72x72/emblems,72x72/filesystems,72x72/mimetypes,48x48/apps,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,36x36/apps,36x36/devices,36x36/emblems,36x36/filesystems,36x36/mimetypes,36x36/stock/document,36x36/stock/generic,32x32/apps,32x32/filesystems,32x32/mimetypes,32x32/stock/code,32x32/stock/chart,32x32/stock/data,32x32/stock/document,32x32/stock/generic,32x32/stock/io,32x32/stock/media,32x32/stock/net,32x32/stock/object,24x24/apps,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,12x12/apps,12x12/devices,12x12/emblems,12x12/filesystems,12x12/mimetypes,scalable/apps,scalable/devices,scalable/emblems,scalable/filesystems,scalable/mimetypes
+Directories=48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic
 
-[192x192/apps]
-Size=192
-Context=Applications
-Type=Fixed
-
-[192x192/devices]
-Size=192
-Context=Devices
-Type=Fixed
-
-[192x192/emblems]
-Size=192
-Context=Emblems
-Type=Fixed
-
-[192x192/filesystems]
-Size=192
-Context=FileSystems
-Type=Fixed
-
-[192x192/mimetypes]
-Size=192
-Context=MimeTypes
-Type=Fixed
-
-[96x96/apps]
-Size=96
-Context=Applications
-Type=Fixed
-
-[96x96/devices]
-Size=96
-Context=Devices
-Type=Fixed
-
-[96x96/emblems]
-Size=96
-Context=Emblems
-Type=Fixed
-
-[96x96/filesystems]
-Size=96
-Context=FileSystems
-Type=Fixed
-
-[96x96/mimetypes]
-Size=96
-Context=MimeTypes
+[48x48/actions]
+Size=48
+Context=Actions
 Type=Fixed
 
-[72x72/apps]
-Size=72
+[48x48/apps]
+Size=48
 Context=Applications
 Type=Fixed
 
-[72x72/devices]
-Size=72
-Context=Devices
-Type=Fixed
-
-[72x72/emblems]
-Size=72
-Context=Emblems
-Type=Fixed
-
-[72x72/filesystems]
-Size=72
-Context=FileSystems
-Type=Fixed
-
-[72x72/mimetypes]
-Size=72
-Context=MimeTypes
-Type=Fixed
-
-[48x48/apps]
+[48x48/categories]
 Size=48
-Context=Applications
+Context=Categories
 Type=Fixed
 
 [48x48/devices]
@@ -103,6 +38,16 @@ Size=48
 Context=MimeTypes
 Type=Fixed
 
+[48x48/places]
+Size=48
+Context=Places
+Type=Fixed
+
+[48x48/status]
+Size=48
+Context=Status
+Type=Fixed
+
 [48x48/stock/code]
 Size=48
 Context=Stock
@@ -128,104 +73,19 @@ Size=48
 Context=Stock
 Type=Fixed
 
-[36x36/apps]
-Size=36
-Context=Applications
-Type=Fixed
-
-[36x36/devices]
-Size=36
-Context=Devices
-Type=Fixed
-
-[36x36/emblems]
-Size=36
-Context=Emblems
-Type=Fixed
-
-[36x36/filesystems]
-Size=36
-Context=FileSystems
-Type=Fixed
-
-[36x36/mimetypes]
-Size=36
-Context=MimeTypes
-Type=Fixed
-
-[36x36/stock/document]
-Size=36
-Context=Stock
-Type=Fixed
-
-[36x36/stock/generic]
-Size=36
-Context=Stock
+[24x24/actions]
+Size=24
+Context=Actions
 Type=Fixed
 
-[32x32/apps]
-Size=32
+[24x24/apps]
+Size=24
 Context=Applications
 Type=Fixed
 
-[32x32/filesystems]
-Size=32
-Context=FileSystems
-Type=Fixed
-
-[32x32/mimetypes]
-Size=32
-Context=MimeTypes
-Type=Fixed
-
-[32x32/stock/code]
-Size=32
-Context=Stock
-Type=Fixed
-
-[32x32/stock/chart]
-Size=32
-Context=Stock
-Type=Fixed
-
-[32x32/stock/data]
-Size=32
-Context=Stock
-Type=Fixed
-
-[32x32/stock/document]
-Size=32
-Context=Stock
-Type=Fixed
-
-[32x32/stock/generic]
-Size=32
-Context=Stock
-Type=Fixed
-
-[32x32/stock/io]
-Size=32
-Context=Stock
-Type=Fixed
-
-[32x32/stock/media]
-Size=32
-Context=Stock
-Type=Fixed
-
-[32x32/stock/net]
-Size=32
-Context=Stock
-Type=Fixed
-
-[32x32/stock/object]
-Size=32
-Context=Stock
-Type=Fixed
-
-[24x24/apps]
+[24x24/categories]
 Size=24
-Context=Applications
+Context=Categories
 Type=Fixed
 
 [24x24/devices]
@@ -248,6 +108,16 @@ Size=24
 Context=MimeTypes
 Type=Fixed
 
+[24x24/places]
+Size=24
+Context=Places
+Type=Fixed
+
+[24x24/status]
+Size=24
+Context=Status
+Type=Fixed
+
 [24x24/stock/chart]
 Size=24
 Context=Stock
@@ -318,11 +188,21 @@ Size=24
 Context=Stock
 Type=Fixed
 
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Fixed
+
 [16x16/apps]
 Size=16
 Context=Applications
 Type=Fixed
 
+[16x16/categories]
+Size=16
+Context=Categories
+Type=Fixed
+
 [16x16/devices]
 Size=16
 Context=Devices
@@ -338,6 +218,16 @@ Size=16
 Context=MimeTypes
 Type=Fixed
 
+[16x16/places]
+Size=16
+Context=Places
+Type=Fixed
+
+[16x16/status]
+Size=16
+Context=Status
+Type=Fixed
+
 [16x16/stock/chart]
 Size=16
 Context=Stock
@@ -413,31 +303,6 @@ Size=16
 Context=Stock
 Type=Fixed
 
-[12x12/apps]
-Size=12
-Context=Applications
-Type=Fixed
-
-[12x12/devices]
-Size=12
-Context=Devices
-Type=Fixed
-
-[12x12/emblems]
-Size=12
-Context=Emblems
-Type=Fixed
-
-[12x12/filesystems]
-Size=12
-Context=FileSystems
-Type=Fixed
-
-[12x12/mimetypes]
-Size=12
-Context=MimeTypes
-Type=Fixed
-
 [scalable/apps]
 Size=48
 MinSize=32
@@ -459,16 +324,31 @@ MaxSize=256
 Context=Emblems
 Type=Scalable
 
-[scalable/filesystems]
+[scalable/mimetypes]
 Size=48
 MinSize=32
 MaxSize=256
-Context=FileSystems
+Context=MimeTypes
 Type=Scalable
 
-[scalable/mimetypes]
+[scalable/places]
 Size=48
 MinSize=32
 MaxSize=256
-Context=MimeTypes
+Context=Places
 Type=Scalable
+
+[scalable/status]
+Size=48
+MinSize=32
+MaxSize=256
+Context=Status
+Type=Scalable
+
+[scalable/stock/generic]
+Size=48
+MinSize=32
+MaxSize=256
+Context=Stock
+Type=Scalable
+