Remove unused theme elements.

2002-10-05  Dave Camp  <dave@ximian.com>

	* icons/crux_eggplant/crux_eggplant.xml:
	* icons/crux_teal/crux_teal.xml:
	* icons/default/default.xml:
	* icons/gnome/gnome.xml:
	* icons/sierra/sierra.xml:
	* icons/tahoe/tahoe.xml:  Remove unused theme elements.
	* configure.in:
	* icons/crux_eggplant/Makefile.am:
	* icons/crux_teal/Makefile.am:
	* icons/default/Makefile.am:
	* icons/gnome/Makefile.am:
	* icons/sierra/Makefile.am:
	* icons/tahoe/Makefile.am: Remove unused icons and backgrounds
	from the build.
	* libnautilus-private/nautilus-theme.c: (has_theme_xml),
	(theme_get_themes_for_location): Check for the existence of
	theme.xml rather than an i-directory image.

15 files changed, 51 insertions, 233 deletions

diff --git a/ChangeLog b/ChangeLog
index 62070136a..0a3c061a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,24 @@
 2002-10-05  Dave Camp  <dave@ximian.com>
+
+	* icons/crux_eggplant/crux_eggplant.xml:
+	* icons/crux_teal/crux_teal.xml:
+	* icons/default/default.xml:
+	* icons/gnome/gnome.xml:
+	* icons/sierra/sierra.xml:
+	* icons/tahoe/tahoe.xml:  Remove unused theme elements.
+	* configure.in:
+	* icons/crux_eggplant/Makefile.am:
+	* icons/crux_teal/Makefile.am:
+	* icons/default/Makefile.am:
+	* icons/gnome/Makefile.am:
+	* icons/sierra/Makefile.am:
+	* icons/tahoe/Makefile.am: Remove unused icons and backgrounds
+	from the build.
+	* libnautilus-private/nautilus-theme.c: (has_theme_xml),
+	(theme_get_themes_for_location): Check for the existence of
+	theme.xml rather than an i-directory image.
+
+2002-10-05  Dave Camp  <dave@ximian.com>
 	
 	* libnautilus-private/nautilus-directory-background.c:
 	(initialize_background_from_settings),
diff --git a/configure.in b/configure.in
index ab8ba2e1e..dd9febcf7 100644
--- a/configure.in
+++ b/configure.in
@@ -363,10 +363,8 @@ data/patterns/Makefile
 docs/Makefile
 icons/Makefile
 icons/crux_eggplant/Makefile
-icons/crux_eggplant/backgrounds/Makefile
 icons/crux_eggplant/throbber/Makefile
 icons/crux_teal/Makefile
-icons/crux_teal/backgrounds/Makefile
 icons/crux_teal/throbber/Makefile
 icons/default/Makefile
 icons/gnome/Makefile
diff --git a/icons/crux_eggplant/Makefile.am b/icons/crux_eggplant/Makefile.am
index 9a807e6ab..3ef6b3cdb 100644
--- a/icons/crux_eggplant/Makefile.am
+++ b/icons/crux_eggplant/Makefile.am
@@ -1,25 +1,12 @@
 crux_eggplantdir = $(datadir)/pixmaps/nautilus/crux_eggplant
 
-SUBDIRS = backgrounds throbber
+SUBDIRS = throbber
 
 crux_eggplant_DATA =				\
 	crux_eggplant.xml			\
 	Search.png				\
 	decrement.png				\
 	decrement-i.png				\
-	emblem-nowrite.png			\
-	emblem-nowrite-72.png			\
-	emblem-nowrite-96.png			\
-	i-directory-12.png			\
-	i-directory-20.png			\
-	i-directory-24.png			\
-	i-directory-36.png			\
-	i-directory.png				\
-	i-directory-72.png			\
-	i-directory-96.png                      \
-	i-directory-192.png                     \
-	i-directory.xml				\
-	i-regular.xml				\
 	increment.png				\
 	increment-i.png				\
 	number_strip.png			\
diff --git a/icons/crux_eggplant/crux_eggplant.xml b/icons/crux_eggplant/crux_eggplant.xml
index 3d4913263..13fbe7551 100644
--- a/icons/crux_eggplant/crux_eggplant.xml
+++ b/icons/crux_eggplant/crux_eggplant.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0"?>
 <theme _name="Crux-Eggplant" _description="An Eggplant variation of the Crux theme.">
-  <directory background_tile_image="./backgrounds/window_pattern.png"
-  			dark_info_color="0x777777"
-  			light_info_color="0xAAAAAA"
-  			selection_box_color_rgba="0x71577440"
-  			selection_box_color="#715774" 
-			background_color="#F0F0F0"/>
+  <directory dark_info_color="0x777777"
+  	     light_info_color="0xAAAAAA"
+  	     selection_box_color_rgba="0x71577440"
+  	     selection_box_color="#715774"/>
   			
   <sidebar sidebar_background_color="#886F8D-#250C2A%90-#000000:h"
            sidebar_background_tile_image="patterns/.striated.png"
-           combine="true"
-           left_offset="0" shadow_offset="1" text_h_offset="-4"
-           label_color="#FFFFFF"
-           tab_font="Helvetica Bold" />
-
-  <desktop background_tile_image="./backgrounds/background_pattern.png"/>
+           combine="true"/>
 
   <zoom_control number_v_offset="-6" number_v_2_offset="0"/>
 </theme>
diff --git a/icons/crux_teal/Makefile.am b/icons/crux_teal/Makefile.am
index c4ff3cde2..1825beed2 100644
--- a/icons/crux_teal/Makefile.am
+++ b/icons/crux_teal/Makefile.am
@@ -1,33 +1,12 @@
 crux_tealdir = $(datadir)/pixmaps/nautilus/crux_teal
 
-SUBDIRS = backgrounds throbber
+SUBDIRS = throbber
 
 crux_teal_DATA =	\
 	crux_teal.xml		\
 	Search.png	\
 	decrement.png		\
 	decrement-i.png		\
-	emblem-nowrite.png	\
-	emblem-nowrite-72.png      \
-	emblem-nowrite-96.png	\
-	i-directory-12.png      \
-	i-directory-20.png      \
-	i-directory-24.png      \
-	i-directory-36.png      \
-	i-directory.png		\
-	i-directory-72.png	\
-	i-directory-96.png      \
-	i-directory-192.png     \
-	i-directory.xml		\
-	i-regular-12.png	\
-	i-regular-20.png        \
-	i-regular-24.png	\
-	i-regular-36.png	\
-	i-regular.png	\
-	i-regular-72.png	\
-	i-regular-96.png	\
-	i-regular-192.png	\
-	i-regular.xml		\
 	increment.png		\
 	increment-i.png		\
 	number_strip.png	\
diff --git a/icons/crux_teal/crux_teal.xml b/icons/crux_teal/crux_teal.xml
index 35e36b2dd..0be89d4e7 100644
--- a/icons/crux_teal/crux_teal.xml
+++ b/icons/crux_teal/crux_teal.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0"?>
 <theme _name="Crux-Teal" _description="A Teal variation of the Crux theme.">
-  <directory background_tile_image="./backgrounds/window_pattern.png" dark_info_color="0x777777"
+  <directory dark_info_color="0x777777"
              light_info_color="0xAAAAAA"
              selection_box_color_rgba="0x497B7E40"
              selection_box_color="#497B7E"
-             background_color="#F0F0F0"
              highlight_color_rgba="0xAA497B7E"/>
 
   <sidebar sidebar_background_color="#669999-#003333%90-#000000:h"
            sidebar_background_tile_image="patterns/.striated.png"
-	   combine="true"
-           left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="#FFFFFF"
-           tab_font="Helvetica Bold" />
+	   combine="true"/>
            
-  <desktop background_tile_image="./backgrounds/background_pattern.png" />
   <zoom_control number_v_offset="-6" number_v_2_offset="0"/>
 </theme>
diff --git a/icons/default/Makefile.am b/icons/default/Makefile.am
index 8d8947e08..0e9385159 100644
--- a/icons/default/Makefile.am
+++ b/icons/default/Makefile.am
@@ -6,79 +6,10 @@ icon_DATA =\
 	Search.png \
 	decrement.png \
 	default.xml \
-	desktop-home.png \
-	emblem-art.png \
-	emblem-camera.png \
-	emblem-mail.png \
-	emblem-pictures.png \
-	emblem-sound.png \
-	emblem-documents.png \
-	emblem-multimedia.png \
-	emblem-package.png \
-	emblem-web.png \
-	emblem-OK.svg \
-	emblem-broken-link.png \
-	emblem-certified.svg \
-	emblem-cool.svg \
-	emblem-danger.svg \
-	emblem-distinguished.svg \
-	emblem-draft.svg \
-	emblem-favorite.svg \
-	emblem-generic.png \
-	emblem-important.svg \
-	emblem-new.svg \
-	emblem-noread.svg \
-	emblem-nowrite.svg \
-	emblem-ohno.svg \
-	emblem-personal.svg \
-	emblem-special.svg \
-	emblem-symbolic-link.png \
-        emblem-symbolic-link-12.png \
-        emblem-symbolic-link-24.png \
-        emblem-symbolic-link-36.png \
-	emblem-trash.png \
-	emblem-urgent.svg \
-	i-directory-12.png \
-	i-directory-24.png \
-	i-directory-36.png \
-	i-directory-72.png \
-	i-directory-96.png \
-	i-directory.png \
-	i-directory-accept-12.png \
-	i-directory-accept-24.png \
-	i-directory-accept-36.png \
-	i-directory-accept-72.png \
-	i-directory-accept-96.png \
-	i-directory-accept.png \
-	i-directory.xml \
-	i-directory-accept.xml \
-	i-regular-12.png \
-	i-regular-24.png \
-	i-regular-36.png \
-	i-regular-72.png \
-	i-regular-96.png \
-	i-regular.png \
-	i-regular.xml \
-	i-bookmark-20.png \
-	i-bookmark-missing-20.png \
-	i-bookmark-missing.png \
-	i-bookmark.png \
-	i-broken-image.png \
-	i-search-72.png \
-	i-spreadsheet.png \
-	i-stalled.png \
-	i-symlink.png \
-	i-web-72.png \
 	increment.png \
-	loading.png \
-	manual.png \
 	number_strip.png \
 	side_bar_image.png \
 	theme_preview.png \
-	trash-empty.png \
-	trash-full.png \
-	trash-empty-192.png \
-	trash-full-192.png \
 	zoom_body.png \
 	$(NULL)
 
diff --git a/icons/default/default.xml b/icons/default/default.xml
index 481f98d15..a91e54f73 100644
--- a/icons/default/default.xml
+++ b/icons/default/default.xml
@@ -4,14 +4,9 @@
 
   <sidebar sidebar_background_tile_image="./side_bar_image.png"
            sidebar_background_color="#474A7C-#22233A:h"
-	   combine="true"
-           left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="#FFFFFF"
-           tab_font="Helvetica Bold" />
+	   combine="true"/>
 
- <desktop background_tile_image="patterns/brushed_metal.png" background_color="#F0F0F0"/>
- 
- <directory background_color="#F0F0F0"
-            selection_box_color_rgba="0x727D974C"
+ <directory selection_box_color_rgba="0x727D974C"
             selection_box_color="#727D97"/>
 
  <icon highlight_background_color="#000000"
diff --git a/icons/gnome/Makefile.am b/icons/gnome/Makefile.am
index a7a7b2750..43539d12c 100644
--- a/icons/gnome/Makefile.am
+++ b/icons/gnome/Makefile.am
@@ -7,45 +7,7 @@ gnomedir = $(datadir)/pixmaps/nautilus/gnome
 gnome_DATA =				\
 	gnome.xml 			\
 	Services.png			\
-	application-x-e-cfg.png		\
-	audio-192.png			\
-	emblem-nowrite-72.png		\
-	emblem-nowrite-96.png		\
-	emblem-nowrite.png		\
-	i-core.png			\
-	i-dirclosed.png			\
-	i-directory-12.png		\
-	i-directory-192.png		\
-	i-directory-20.png		\
-	i-directory-24.png		\
-	i-directory-36.png		\
-	i-directory-72.png		\
-	i-directory-96.png		\
-	i-directory-accept-12.png	\
-	i-directory-accept-192.png	\
-	i-directory-accept-20.png	\
-	i-directory-accept-24.png	\
-	i-directory-accept-36.png	\
-	i-directory-accept-72.png	\
-	i-directory-accept-96.png	\
-	i-directory-accept.png		\
-	i-directory.png			\
-	i-executable.png		\
-	i-music-192.png			\
-	i-music.png			\
-	i-nfs.png			\
-	i-regular.png			\
-	i-regular.xml			\
-	i-stalled.png			\
-	linux-penguin.png		\
-	rpm-directory.png		\
 	theme_preview.png		\
-	trash-empty-192.png		\
-	trash-empty-accept-192.png	\
-	trash-empty-accept.png		\
-	trash-empty.png			\
-	trash-full-192.png		\
-	trash-full.png			\
 	$(NULL)
 
 EXTRA_DIST = $(gnome_DATA)
diff --git a/icons/gnome/gnome.xml b/icons/gnome/gnome.xml
index 3cc70fed1..a3c8704de 100644
--- a/icons/gnome/gnome.xml
+++ b/icons/gnome/gnome.xml
@@ -2,12 +2,6 @@
 
 <theme _name="GNOME" _description="A theme designed to fit well with the classic GNOME environment."> 
 
-  <sidebar combine="true"
-           left_offset="0" shadow_offset="1" text_h_offset="-4"/>
-
-  <desktop background_tile_image="patterns/dark-gnome.jpg"
-	   background_color="#:F400/F200/e800"/>
-
   <thumbnails frame_offsets="3,3,6,6"/>
   <toolbar icon_theme="standard"/>
   <throbber frame_count="6" url="http://www.gnome.org"/>
diff --git a/icons/sierra/Makefile.am b/icons/sierra/Makefile.am
index d43398aa6..04798c305 100644
--- a/icons/sierra/Makefile.am
+++ b/icons/sierra/Makefile.am
@@ -1,21 +1,8 @@
 sierradir = $(datadir)/pixmaps/nautilus/sierra
 
 sierra_DATA =	\
-	green_weave.png			\
-	i-directory-12.png		\
-	i-directory-24.png		\
-	i-directory-36.png		\
-	i-directory-72.png		\
-	i-directory-96.png		\
-	i-directory.png			\
-	i-directory-accept-12.png	\
-	i-directory-accept-24.png	\
-	i-directory-accept-36.png	\
-	i-directory-accept-72.png	\
-	i-directory-accept-96.png	\
-	i-directory-accept.png		\
+	green_weave.png                 \
 	number_strip.png		\
-	Sierra_desktop.png		\
 	theme_preview.png		\
 	sierra.xml
 
diff --git a/icons/sierra/sierra.xml b/icons/sierra/sierra.xml
index a53739945..b478242f3 100644
--- a/icons/sierra/sierra.xml
+++ b/icons/sierra/sierra.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <theme _name="Sierra" _description="Uses manila folders and gray-green backgrounds.">
   <sidebar sidebar_background_tile_image="./green_weave.png" sidebar_background_color="#FFFFFF"/>
-  <directory background_color="#BAC5C0" selection_box_color_rgba="0x70818359" selection_box_color="#708183"/>
-  <desktop background_tile_image="./Sierra_desktop.png" background_color="#FFFFFF"/>
+  <directory selection_box_color_rgba="0x70818359" selection_box_color="#708183"/>
   <zoom_control number_v_offset="-6" number_v_2_offset="-1" number_h_offset="-2"/>
 </theme>
diff --git a/icons/tahoe/Makefile.am b/icons/tahoe/Makefile.am
index 8bfa60f0a..167e58f71 100644
--- a/icons/tahoe/Makefile.am
+++ b/icons/tahoe/Makefile.am
@@ -4,20 +4,7 @@ tahoedir = $(datadir)/pixmaps/nautilus/tahoe
 
 tahoe_DATA =\
 	tahoe.xml \
-	blueridge.png \
 	bluewall.png \
-	i-directory-12.png \
-	i-directory-accept-12.png \
-	i-directory-24.png \
-	i-directory-accept-24.png \
-	i-directory-36.png \
-	i-directory-accept-36.png \
-	i-directory-72.png \
-	i-directory-accept-72.png \
-	i-directory-96.png \
-	i-directory-accept-96.png \
-	i-directory.png \
-	i-directory-accept.png \
 	number_strip.png \
 	theme_preview.png \
 	$(NULL)
diff --git a/icons/tahoe/tahoe.xml b/icons/tahoe/tahoe.xml
index 4087a319f..ec442e93e 100644
--- a/icons/tahoe/tahoe.xml
+++ b/icons/tahoe/tahoe.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <theme _name="Tahoe" _description="This theme uses photo-realistic folders.">
   <sidebar sidebar_background_tile_image="./bluewall.png" sidebar_background_color="#FFFFFF" title_color="#000000" title_shadow_color="#BBBBBB" title_info_color="#000000"/>
-  <directory background_tile_image="./blueridge.png" background_color="#FFFFFF"/>
-  <desktop background_tile_image="patterns/fleur_de_lis.png" background_color="#FFFFFF"/>
   <zoom_control number_v_offset="-6" number_v_2_offset="-1" number_h_offset="-2"/>
 </theme>
 
diff --git a/libnautilus-private/nautilus-theme.c b/libnautilus-private/nautilus-theme.c
index 816a8fa50..a098dcdee 100644
--- a/libnautilus-private/nautilus-theme.c
+++ b/libnautilus-private/nautilus-theme.c
@@ -395,31 +395,6 @@ vfs_file_exists (const char *file_uri)
 	return result == GNOME_VFS_OK;
 }
 
-static gboolean
-has_image_file (const char *path_uri,
-		const char *dir_name,
-		const char *image_file)
-{
-	char* image_uri;
-	gboolean exists;
-
-	image_uri = g_strdup_printf ("%s/%s/%s.png", path_uri, dir_name, image_file);
-
-	exists = vfs_file_exists (image_uri);
-	g_free (image_uri);
-
-	if (exists) {
-		return TRUE;
-	}
-
-	image_uri = g_strdup_printf ("%s/%s/%s.svg", path_uri, dir_name, image_file);
-
-	exists = vfs_file_exists (image_uri);
-	g_free (image_uri);
-
-	return exists;
-}
-
 static char*
 theme_get_property (const char *themes_location_uri,
 		    const char *theme_name,
@@ -534,6 +509,23 @@ theme_list_prepend (GList *theme_list,
 	return g_list_prepend (theme_list, attributes);
 }
 
+static gboolean 
+has_theme_xml (const char *theme_location_uri,
+	       const char *theme_name)
+{
+	char *xml_uri;
+	gboolean ret;
+	
+	xml_uri = g_strdup_printf ("%s/%s/%s.xml", 
+				   theme_location_uri,
+				   theme_name, theme_name);
+
+	ret = vfs_file_exists (xml_uri);
+	g_free (xml_uri);
+	
+	return ret;
+}
+
 static GList *
 theme_get_themes_for_location (const char *themes_location_uri,
 			       gboolean builtin)
@@ -563,7 +555,7 @@ theme_get_themes_for_location (const char *themes_location_uri,
 
 		if ((file_info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
 		    && (file_info->name[0] != '.')) {
-			if (has_image_file (themes_location_uri, file_info->name, "i-directory" )) {
+			if (has_theme_xml (themes_location_uri, file_info->name )) {
 				themes = theme_list_prepend (themes,
 							     themes_location_uri,
 							     file_info->name,