Removed sidebar_tab_pieces from the Makefiles and theme definitions.

2002-09-21  Dave Camp  <dave@ximian.com>

	* configure.in:
	* icons/Makefile.am:
	* icons/crux_eggplant/Makefile.am:
	* icons/crux_eggplant/crux_eggplant.xml:
	* icons/crux_teal/Makefile.am:
	* icons/crux_teal/crux_teal.xml:
	* icons/default/default.xml:
	* icons/gnome/Makefile.am:
	* icons/gnome/gnome.xml:
	* icons/sierra/sierra.xml: Removed sidebar_tab_pieces from the
	Makefiles and theme definitions.
	* src/nautilus-sidebar.c:
	* src/nautilus-sidebar.h: Removed.

9 files changed, 8 insertions, 9 deletions

diff --git a/icons/Makefile.am b/icons/Makefile.am
index 24099492e..c2da889ae 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS =\
 	crux_teal \
 	default \
 	gnome \
-	sidebar_tab_pieces \
 	sierra \
 	tahoe \
 	throbber \
diff --git a/icons/crux_eggplant/Makefile.am b/icons/crux_eggplant/Makefile.am
index 51436daf5..9a807e6ab 100644
--- a/icons/crux_eggplant/Makefile.am
+++ b/icons/crux_eggplant/Makefile.am
@@ -1,6 +1,6 @@
 crux_eggplantdir = $(datadir)/pixmaps/nautilus/crux_eggplant
 
-SUBDIRS = sidebar_tab_pieces backgrounds throbber
+SUBDIRS = backgrounds throbber
 
 crux_eggplant_DATA =				\
 	crux_eggplant.xml			\
diff --git a/icons/crux_eggplant/crux_eggplant.xml b/icons/crux_eggplant/crux_eggplant.xml
index 9e93da562..3d4913263 100644
--- a/icons/crux_eggplant/crux_eggplant.xml
+++ b/icons/crux_eggplant/crux_eggplant.xml
@@ -9,7 +9,7 @@
   			
   <sidebar sidebar_background_color="#886F8D-#250C2A%90-#000000:h"
            sidebar_background_tile_image="patterns/.striated.png"
-           tab_piece_images="sidebar_tab_pieces" combine="true"
+           combine="true"
            left_offset="0" shadow_offset="1" text_h_offset="-4"
            label_color="#FFFFFF"
            tab_font="Helvetica Bold" />
diff --git a/icons/crux_teal/Makefile.am b/icons/crux_teal/Makefile.am
index 8c225c081..c4ff3cde2 100644
--- a/icons/crux_teal/Makefile.am
+++ b/icons/crux_teal/Makefile.am
@@ -1,6 +1,6 @@
 crux_tealdir = $(datadir)/pixmaps/nautilus/crux_teal
 
-SUBDIRS = sidebar_tab_pieces backgrounds throbber
+SUBDIRS = backgrounds throbber
 
 crux_teal_DATA =	\
 	crux_teal.xml		\
diff --git a/icons/crux_teal/crux_teal.xml b/icons/crux_teal/crux_teal.xml
index eefa852a1..35e36b2dd 100644
--- a/icons/crux_teal/crux_teal.xml
+++ b/icons/crux_teal/crux_teal.xml
@@ -9,7 +9,7 @@
 
   <sidebar sidebar_background_color="#669999-#003333%90-#000000:h"
            sidebar_background_tile_image="patterns/.striated.png"
-           tab_piece_images="sidebar_tab_pieces" combine="true"
+	   combine="true"
            left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="#FFFFFF"
            tab_font="Helvetica Bold" />
            
diff --git a/icons/default/default.xml b/icons/default/default.xml
index ef58f064f..481f98d15 100644
--- a/icons/default/default.xml
+++ b/icons/default/default.xml
@@ -4,7 +4,7 @@
 
   <sidebar sidebar_background_tile_image="./side_bar_image.png"
            sidebar_background_color="#474A7C-#22233A:h"
-           tab_piece_images="sidebar_tab_pieces" combine="true"
+	   combine="true"
            left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="#FFFFFF"
            tab_font="Helvetica Bold" />
 
diff --git a/icons/gnome/Makefile.am b/icons/gnome/Makefile.am
index 1630294aa..a7a7b2750 100644
--- a/icons/gnome/Makefile.am
+++ b/icons/gnome/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-SUBDIRS = throbber sidebar_tab_pieces
+SUBDIRS = throbber
 
 gnomedir = $(datadir)/pixmaps/nautilus/gnome
 
diff --git a/icons/gnome/gnome.xml b/icons/gnome/gnome.xml
index 428e78487..3cc70fed1 100644
--- a/icons/gnome/gnome.xml
+++ b/icons/gnome/gnome.xml
@@ -2,7 +2,7 @@
 
 <theme _name="GNOME" _description="A theme designed to fit well with the classic GNOME environment."> 
 
-  <sidebar tab_piece_images="sidebar_tab_pieces" combine="true"
+  <sidebar combine="true"
            left_offset="0" shadow_offset="1" text_h_offset="-4"/>
 
   <desktop background_tile_image="patterns/dark-gnome.jpg"
diff --git a/icons/sierra/sierra.xml b/icons/sierra/sierra.xml
index ae6993561..a53739945 100644
--- a/icons/sierra/sierra.xml
+++ b/icons/sierra/sierra.xml
@@ -1,6 +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" tab_piece_images="none"/>
+  <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"/>
   <zoom_control number_v_offset="-6" number_v_2_offset="-1" number_h_offset="-2"/>