more clean-up and fixes for the default theme change

	more clean-up and fixes for the default theme change

	* icons/ardmore/ardmore.xml:
	* icons/arlo/arlo.xml:
	* icons/default.xml:
	* icons/eazel/eazel.xml:
	* icons/gnome/gnome.xml:
	* icons/vector/vector.xml:
	* icons/villanova/villanova.xml:
	at Arlo's request, capitalized the theme names and also made
	them localizable, and tweaks to some of the theme files to fix
	problems caused by the new default

	* src/nautilus-sidebar-tabs.c:
	(nautilus_sidebar_tabs_load_theme_data):
	added a way to specify the non-pixmap tabs, since it uses
	pixmap ones in the default now

	* src/nautilus-theme-selector.c:
	(get_theme_description_and_display_name), (add_theme):
	made it use a localizable name in the xml file instead of the
	actual folder name.

	* src/nautilus-window-toolbars.c: (get_file_name_from_icon_name):
	added a way to get the stock gnome toolbar icons, now that we have
	our own in the default theme

	* nautilus.spec.in:
	added the throbber component to our package

8 files changed, 10 insertions, 14 deletions

diff --git a/icons/ardmore/ardmore.xml b/icons/ardmore/ardmore.xml
index 1b2970d6d..4eafc4306 100644
--- a/icons/ardmore/ardmore.xml
+++ b/icons/ardmore/ardmore.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
-<theme name="ardmore" _description="This theme uses photo-realistic folders.">
+<theme _name="Ardmore" _description="This theme uses photo-realistic folders.">
   <sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="./bluewall.png" SIDEBAR_BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
   <directory BACKGROUND_TILE_IMAGE="./blueridge.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
   <desktop BACKGROUND_TILE_IMAGE="patterns/fleur_de_lis.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
-  <toolbar ICON_THEME="eazel" FRAME_TYPE="none"/>
   <zoom_control NUMBER_V_OFFSET="-6" DIGIT_WIDTH="6"/>
-  <icon-images DEFAULT_THEME="eazel"/>
  </theme>
diff --git a/icons/arlo/arlo.xml b/icons/arlo/arlo.xml
index 0c65fb36b..02c1cfe58 100644
--- a/icons/arlo/arlo.xml
+++ b/icons/arlo/arlo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<theme name="Crux - Teal" _description="A Teal variation of the Crux theme, designed to fit with the Eazel logo.">
+<theme _name="Crux/Teal" _description="A Teal variation of the Crux theme, designed to fit with the Eazel logo.">
   <directory BACKGROUND_TILE_IMAGE="./backgrounds/window_pattern.png" DARK_INFO_COLOR="0x777777"
 
 LIGHT_INFO_COLOR="0xAAAAAA" SELECTION_BOX_COLOR_RGBA="0x497B7E40" SELECTION_BOX_COLOR="rgb:4949/7B7B/7E7E" />
diff --git a/icons/default.xml b/icons/default.xml
index 0ed7b1495..d4c79548e 100644
--- a/icons/default.xml
+++ b/icons/default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<theme name="Default" _description="This is the default theme for Nautilus.">
+<theme _name="Default" _description="This is the default theme for Nautilus.">
   <sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="./side_bar_image.png"
   SIDEBAR_BACKGROUND_COLOR="rgb:4747/4A4A/7C7C-rgb:2222/2323/3A3A:h"
   TITLE_COLOR="rgb:FFFF/FFFF/FFFF" TITLE_INFO_COLOR="rgb:FFFF/FFFF/FFFF" TITLE_SHADOW_COLOR="rgb:0000/0000/0000"
diff --git a/icons/eazel/eazel.xml b/icons/eazel/eazel.xml
index d8344c407..efa704fd0 100644
--- a/icons/eazel/eazel.xml
+++ b/icons/eazel/eazel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<theme name="eazel">
+<theme _name="Eazel" _description="This theme is obsolete and will go away soon.">
   <sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="./side_bar_image.png"
   SIDEBAR_BACKGROUND_COLOR="rgb:4747/4A4A/7C7C-rgb:2222/2323/3A3A:h"
   TITLE_COLOR="rgb:FFFF/FFFF/FFFF" TITLE_INFO_COLOR="rgb:FFFF/FFFF/FFFF" TITLE_SHADOW_COLOR="rgb:0000/0000/0000"
diff --git a/icons/gnome/gnome.xml b/icons/gnome/gnome.xml
index 177a1a449..fc35378ae 100644
--- a/icons/gnome/gnome.xml
+++ b/icons/gnome/gnome.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<theme name="gnome" _description="This theme uses the classic GNOME icons.">
-  <sidebar SIDEBAR_BACKGROUND_COLOR="rgb:DDDD/DDDD/FFFF"/>
+<theme _name="GNOME" _description="This theme uses the classic GNOME icons.">
+  <sidebar SIDEBAR_BACKGROUND_COLOR="rgb:DDDD/DDDD/FFFF" TAB_PIECE_IMAGES="none"/>
   <desktop BACKGROUND_TILE_IMAGE="patterns/gnome.jpg"/>
   <directory BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
   <icon HIGHLIGHT_BACKGROUND_COLOR="rgb:0000/0000/0000" HIGHLIGHT_TEXT_COLOR="rgb:FFFF/FFFF/FFFF" TEXT_FILL_COLOR="rgb:FFFF/FFFF/FFFF"/>
   <thumbnails FRAME_OFFSETS="3,3,6,6"/>
-  <toolbar ICONS="default"/>
+  <toolbar ICON_THEME="standard"/>
   <throbber FRAME_COUNT="10" URL="http://www.gnome.org"/>
  </theme>
diff --git a/icons/theme_preview.png b/icons/theme_preview.png
index e3c09e0f8..cde4566ab 100644
--- a/icons/theme_preview.png
+++ b/icons/theme_preview.png
diff --git a/icons/vector/vector.xml b/icons/vector/vector.xml
index c09007594..41d63d7f7 100644
--- a/icons/vector/vector.xml
+++ b/icons/vector/vector.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-<theme name="vector" _description="This experimental theme uses vector-based icons.">
+<theme _name="Vector" _description="This experimental theme uses vector-based icons.">
   <sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="patterns/blue_sky.png" TAB_PIECE_THEME="arlo" TAB_PIECE_IMAGES="sidebar_tab_pieces" LEFT_OFFSET="0"/>
   <directory BACKGROUND_COLOR="rgb:FFFF/FFFF/3333-rgb:FFFF/9999/3333:h"/>
-  <toolbar ICON_THEME="eazel" FRAME_TYPE="out"/>
   <desktop BACKGROUND_TILE_IMAGE="patterns/clouds.png"/>
   <zoom_control NUMBER_V_OFFSET="-6" NUMBER_H_OFFSET="-2" DIGIT_WIDTH="6"/>
 </theme>
diff --git a/icons/villanova/villanova.xml b/icons/villanova/villanova.xml
index 23c4b2949..da7cdd570 100644
--- a/icons/villanova/villanova.xml
+++ b/icons/villanova/villanova.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-<theme name="villanova">
-  <sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="./green_weave.png" SIDEBAR_BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
+<theme _name="Sierra">
+  <sidebar SIDEBAR_BACKGROUND_TILE_IMAGE="./green_weave.png" SIDEBAR_BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF" TAB_PIECE_IMAGES="none"/>
   <directory BACKGROUND_TILE_IMAGE="./villanova_green.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF" SELECTION_BOX_COLOR_RGBA="0x70818359" SELECTION_BOX_COLOR="rgb:7000/8111/8333"/>
   <desktop BACKGROUND_TILE_IMAGE="patterns/fleur_de_lis.png" BACKGROUND_COLOR="rgb:FFFF/FFFF/FFFF"/>
-  <toolbar ICON_THEME="eazel" FRAME_TYPE="none"/>
   <zoom_control NUMBER_V_OFFSET="-6" DIGIT_WIDTH="6"/>
  </theme>