moved the eazel throbber into the default theme; moved Arlo's throbber

	moved the eazel throbber into the default theme; moved Arlo's throbber
	into his theme and restored the generic throbber to the gnome theme.
	Updated the theme files to reflect this.

71 files changed, 89 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a1874b98..baca08943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2000-10-26  Andy Hertzfeld  <andy@eazel.com>
+
+	moved the eazel throbber into the default theme; moved Arlo's throbber
+	into his theme and restored the generic throbber to the gnome theme.
+	Updated the theme files to reflect this.
+	
+	* configure.in:
+	* icons/ardmore/ardmore.xml:
+	* icons/arlo/Makefile.am:
+	* icons/arlo/arlo.xml:
+	* icons/arlo/throbber/.cvsignore:
+	* icons/arlo/throbber/Makefile.am:
+	* icons/default.xml:
+	* icons/eazel/Makefile.am:
+	* icons/eazel/eazel.xml:
+	* icons/gnome/Makefile.am:
+	* icons/gnome/gnome.xml:
+	* icons/gnome/throbber/.cvsignore:
+	* icons/gnome/throbber/Makefile.am:
+	* icons/throbber/Makefile.am:
+
 2000-10-26  Darin Adler  <darin@eazel.com>
 
 	Fix bug 3998 (Move to Trash crashes Nautilus if item with that
diff --git a/configure.in b/configure.in
index 66f4377cf..390b159da 100644
--- a/configure.in
+++ b/configure.in
@@ -656,9 +656,10 @@ icons/ardmore/Makefile
 icons/arlo/Makefile
 icons/arlo/sidebar_tab_pieces/Makefile
 icons/arlo/backgrounds/Makefile
+icons/arlo/throbber/Makefile
 icons/eazel/Makefile
-icons/eazel/throbber/Makefile
 icons/gnome/Makefile
+icons/gnome/throbber/Makefile
 icons/throbber/Makefile
 icons/vector/Makefile
 data/Makefile
diff --git a/icons/ardmore/ardmore.xml b/icons/ardmore/ardmore.xml
index f4b1dc274..d73c086ac 100644
--- a/icons/ardmore/ardmore.xml
+++ b/icons/ardmore/ardmore.xml
@@ -6,6 +6,5 @@
   <toolbar ICON_THEME="eazel" FRAME_TYPE="none"/>
   <zoom_control NUMBER_V_OFFSET="-6" DIGIT_WIDTH="6"/>
   <icon-images DEFAULT_THEME="eazel"/>
-  <throbber FRAME_COUNT="15" URL="http://www.eazel.com" IMAGE_THEME="eazel"/>
   <description TEXT="This theme uses photo-realistic folders."/>
  </theme>
diff --git a/icons/arlo/Makefile.am b/icons/arlo/Makefile.am
index 05afb2607..3290b141d 100644
--- a/icons/arlo/Makefile.am
+++ b/icons/arlo/Makefile.am
@@ -1,6 +1,6 @@
 arlodir = $(datadir)/pixmaps/nautilus/arlo
 
-SUBDIRS = sidebar_tab_pieces backgrounds
+SUBDIRS = sidebar_tab_pieces backgrounds throbber
 
 arlo_DATA =	\
 	arlo.xml		\
diff --git a/icons/arlo/arlo.xml b/icons/arlo/arlo.xml
index 859f8a22a..8d88b9760 100644
--- a/icons/arlo/arlo.xml
+++ b/icons/arlo/arlo.xml
@@ -8,5 +8,6 @@ LIGHT_INFO_COLOR="0xAAAAAA" SELECTION_BOX_COLOR_RGBA="0x497B7E40" SELECTION_BOX_
   <desktop BACKGROUND_TILE_IMAGE="./backgrounds/background_pattern.png"/>
   <zoom_control NUMBER_V_OFFSET="-6" DIGIT_WIDTH="6"/>
   <description TEXT="This theme is based on the teal in the Eazel logo."/>
+  <throbber FRAME_COUNT="28" URL="http://www.eazel.com"/>
 </theme>
 
diff --git a/icons/arlo/throbber/.cvsignore b/icons/arlo/throbber/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/icons/arlo/throbber/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/icons/arlo/throbber/001.png b/icons/arlo/throbber/001.png
new file mode 100644
index 000000000..6710d52c2
--- /dev/null
+++ b/icons/arlo/throbber/001.png
diff --git a/icons/arlo/throbber/002.png b/icons/arlo/throbber/002.png
new file mode 100644
index 000000000..a7267d672
--- /dev/null
+++ b/icons/arlo/throbber/002.png
diff --git a/icons/arlo/throbber/003.png b/icons/arlo/throbber/003.png
new file mode 100644
index 000000000..e8d278da4
--- /dev/null
+++ b/icons/arlo/throbber/003.png
diff --git a/icons/arlo/throbber/004.png b/icons/arlo/throbber/004.png
new file mode 100644
index 000000000..02cc183f7
--- /dev/null
+++ b/icons/arlo/throbber/004.png
diff --git a/icons/arlo/throbber/005.png b/icons/arlo/throbber/005.png
new file mode 100644
index 000000000..f60a15906
--- /dev/null
+++ b/icons/arlo/throbber/005.png
diff --git a/icons/arlo/throbber/006.png b/icons/arlo/throbber/006.png
new file mode 100644
index 000000000..6e6d96c47
--- /dev/null
+++ b/icons/arlo/throbber/006.png
diff --git a/icons/arlo/throbber/007.png b/icons/arlo/throbber/007.png
new file mode 100644
index 000000000..c3b8136b0
--- /dev/null
+++ b/icons/arlo/throbber/007.png
diff --git a/icons/arlo/throbber/008.png b/icons/arlo/throbber/008.png
new file mode 100644
index 000000000..39e8757a7
--- /dev/null
+++ b/icons/arlo/throbber/008.png
diff --git a/icons/arlo/throbber/009.png b/icons/arlo/throbber/009.png
new file mode 100644
index 000000000..f28914f33
--- /dev/null
+++ b/icons/arlo/throbber/009.png
diff --git a/icons/arlo/throbber/010.png b/icons/arlo/throbber/010.png
new file mode 100644
index 000000000..1642904fe
--- /dev/null
+++ b/icons/arlo/throbber/010.png
diff --git a/icons/arlo/throbber/011.png b/icons/arlo/throbber/011.png
new file mode 100644
index 000000000..79b30d092
--- /dev/null
+++ b/icons/arlo/throbber/011.png
diff --git a/icons/arlo/throbber/012.png b/icons/arlo/throbber/012.png
new file mode 100644
index 000000000..aa538a6d8
--- /dev/null
+++ b/icons/arlo/throbber/012.png
diff --git a/icons/arlo/throbber/013.png b/icons/arlo/throbber/013.png
new file mode 100644
index 000000000..d147fb9fa
--- /dev/null
+++ b/icons/arlo/throbber/013.png
diff --git a/icons/arlo/throbber/014.png b/icons/arlo/throbber/014.png
new file mode 100644
index 000000000..d5be97f76
--- /dev/null
+++ b/icons/arlo/throbber/014.png
diff --git a/icons/arlo/throbber/015.png b/icons/arlo/throbber/015.png
new file mode 100644
index 000000000..f1dcfe270
--- /dev/null
+++ b/icons/arlo/throbber/015.png
diff --git a/icons/throbber/016.png b/icons/arlo/throbber/016.png
index 832c6f049..832c6f049 100644
--- a/icons/throbber/016.png
+++ b/icons/arlo/throbber/016.png
diff --git a/icons/throbber/017.png b/icons/arlo/throbber/017.png
index 8b3cdef0e..8b3cdef0e 100644
--- a/icons/throbber/017.png
+++ b/icons/arlo/throbber/017.png
diff --git a/icons/throbber/018.png b/icons/arlo/throbber/018.png
index 406aff0e7..406aff0e7 100644
--- a/icons/throbber/018.png
+++ b/icons/arlo/throbber/018.png
diff --git a/icons/throbber/019.png b/icons/arlo/throbber/019.png
index 31fc6fcd1..31fc6fcd1 100644
--- a/icons/throbber/019.png
+++ b/icons/arlo/throbber/019.png
diff --git a/icons/throbber/020.png b/icons/arlo/throbber/020.png
index 678458ef3..678458ef3 100644
--- a/icons/throbber/020.png
+++ b/icons/arlo/throbber/020.png
diff --git a/icons/throbber/021.png b/icons/arlo/throbber/021.png
index d6072679b..d6072679b 100644
--- a/icons/throbber/021.png
+++ b/icons/arlo/throbber/021.png
diff --git a/icons/throbber/022.png b/icons/arlo/throbber/022.png
index 979ac3bb9..979ac3bb9 100644
--- a/icons/throbber/022.png
+++ b/icons/arlo/throbber/022.png
diff --git a/icons/throbber/023.png b/icons/arlo/throbber/023.png
index b0781da39..b0781da39 100644
--- a/icons/throbber/023.png
+++ b/icons/arlo/throbber/023.png
diff --git a/icons/throbber/024.png b/icons/arlo/throbber/024.png
index c482da229..c482da229 100644
--- a/icons/throbber/024.png
+++ b/icons/arlo/throbber/024.png
diff --git a/icons/throbber/025.png b/icons/arlo/throbber/025.png
index ba7f51b39..ba7f51b39 100644
--- a/icons/throbber/025.png
+++ b/icons/arlo/throbber/025.png
diff --git a/icons/throbber/026.png b/icons/arlo/throbber/026.png
index e72a5c5a1..e72a5c5a1 100644
--- a/icons/throbber/026.png
+++ b/icons/arlo/throbber/026.png
diff --git a/icons/throbber/027.png b/icons/arlo/throbber/027.png
index 5c6a0c996..5c6a0c996 100644
--- a/icons/throbber/027.png
+++ b/icons/arlo/throbber/027.png
diff --git a/icons/throbber/028.png b/icons/arlo/throbber/028.png
index 8dc78e4f8..8dc78e4f8 100644
--- a/icons/throbber/028.png
+++ b/icons/arlo/throbber/028.png
diff --git a/icons/arlo/throbber/Makefile.am b/icons/arlo/throbber/Makefile.am
new file mode 100644
index 000000000..7943bc304
--- /dev/null
+++ b/icons/arlo/throbber/Makefile.am
@@ -0,0 +1,37 @@
+NULL=
+
+throbberdir = $(datadir)/pixmaps/nautilus/arlo/throbber
+
+throbber_DATA = 	\
+	001.png		\
+	002.png		\
+	003.png		\
+	004.png		\
+	005.png		\
+	006.png		\
+	007.png		\
+	008.png		\
+	009.png		\
+	010.png		\
+	011.png		\
+	012.png		\
+	013.png		\
+	014.png		\
+	015.png		\
+	016.png		\
+	017.png		\
+	018.png		\
+	019.png		\
+	020.png		\
+	021.png		\
+	022.png		\
+	023.png		\
+	024.png		\
+	025.png		\
+	026.png		\
+	027.png		\
+	028.png		\
+	rest.png	\
+	$(NULL)
+		
+EXTRA_DIST = $(throbber_DATA)
diff --git a/icons/arlo/throbber/rest.png b/icons/arlo/throbber/rest.png
new file mode 100644
index 000000000..8dc78e4f8
--- /dev/null
+++ b/icons/arlo/throbber/rest.png
diff --git a/icons/default.xml b/icons/default.xml
index c0d4480a4..7e71ef84e 100644
--- a/icons/default.xml
+++ b/icons/default.xml
@@ -7,5 +7,5 @@
   <description TEXT="This simple theme uses the standard GNOME icons."/>
   <toolbar FRAME_TYPE="in"/>
   <thumbnails FRAME_OFFSETS="3,3,6,6"/>
-  <throbber FRAME_COUNT="28" URL="http://www.eazel.com"/>
+  <throbber FRAME_COUNT="15" URL="http://www.eazel.com"/>
  </theme>
diff --git a/icons/eazel/Makefile.am b/icons/eazel/Makefile.am
index ff0b7d516..827ca5c5f 100644
--- a/icons/eazel/Makefile.am
+++ b/icons/eazel/Makefile.am
@@ -2,7 +2,7 @@ NULL=
 
 eazeldir = $(datadir)/pixmaps/nautilus/eazel
 
-SUBDIRS = throbber
+SUBDIRS =
 
 eazel_DATA =					\
 	Back.png				\
diff --git a/icons/eazel/eazel.xml b/icons/eazel/eazel.xml
index e1acf6d3c..bf268e01f 100644
--- a/icons/eazel/eazel.xml
+++ b/icons/eazel/eazel.xml
@@ -5,5 +5,4 @@
   <desktop BACKGROUND_TILE_IMAGE="backgrounds/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"/>
-  <throbber FRAME_COUNT="15" URL="http://www.eazel.com"/>
  </theme>
diff --git a/icons/gnome/Makefile.am b/icons/gnome/Makefile.am
index 76bf6e0f4..9150cbd28 100644
--- a/icons/gnome/Makefile.am
+++ b/icons/gnome/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-SUBDIRS =
+SUBDIRS = throbber
 
 gnomedir = $(datadir)/pixmaps/nautilus/gnome
 
diff --git a/icons/gnome/gnome.xml b/icons/gnome/gnome.xml
index 2eac73d04..467da76ad 100644
--- a/icons/gnome/gnome.xml
+++ b/icons/gnome/gnome.xml
@@ -6,5 +6,5 @@
   <icon HIGHLIGHT_BACKGROUND_COLOR="rgb:0000/0000/0000" HIGHLIGHT_TEXT_COLOR="rgb:FFFF/FFFF/FFFF" TEXT_FILL_COLOR="rgb:FFFF/FFFF/FFFF"/>
   <description TEXT="This theme uses the classic GNOME icons."/>
   <thumbnails FRAME_OFFSETS="3,3,6,6"/>
-  <throbber FRAME_COUNT="28" URL="http://www.gnome.org"/>
+  <throbber FRAME_COUNT="10" URL="http://www.gnome.org"/>
  </theme>
diff --git a/icons/gnome/throbber/.cvsignore b/icons/gnome/throbber/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/icons/gnome/throbber/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/icons/gnome/throbber/001.png b/icons/gnome/throbber/001.png
new file mode 100644
index 000000000..983dd96ab
--- /dev/null
+++ b/icons/gnome/throbber/001.png
diff --git a/icons/gnome/throbber/002.png b/icons/gnome/throbber/002.png
new file mode 100644
index 000000000..4893c2cef
--- /dev/null
+++ b/icons/gnome/throbber/002.png
diff --git a/icons/gnome/throbber/003.png b/icons/gnome/throbber/003.png
new file mode 100644
index 000000000..74ae652f3
--- /dev/null
+++ b/icons/gnome/throbber/003.png
diff --git a/icons/gnome/throbber/004.png b/icons/gnome/throbber/004.png
new file mode 100644
index 000000000..4fb64f3f2
--- /dev/null
+++ b/icons/gnome/throbber/004.png
diff --git a/icons/gnome/throbber/005.png b/icons/gnome/throbber/005.png
new file mode 100644
index 000000000..6e94eec1c
--- /dev/null
+++ b/icons/gnome/throbber/005.png
diff --git a/icons/gnome/throbber/006.png b/icons/gnome/throbber/006.png
new file mode 100644
index 000000000..dfe184e07
--- /dev/null
+++ b/icons/gnome/throbber/006.png
diff --git a/icons/gnome/throbber/007.png b/icons/gnome/throbber/007.png
new file mode 100644
index 000000000..8ad45c77c
--- /dev/null
+++ b/icons/gnome/throbber/007.png
diff --git a/icons/gnome/throbber/008.png b/icons/gnome/throbber/008.png
new file mode 100644
index 000000000..84fc597fb
--- /dev/null
+++ b/icons/gnome/throbber/008.png
diff --git a/icons/gnome/throbber/009.png b/icons/gnome/throbber/009.png
new file mode 100644
index 000000000..dcf773154
--- /dev/null
+++ b/icons/gnome/throbber/009.png
diff --git a/icons/gnome/throbber/010.png b/icons/gnome/throbber/010.png
new file mode 100644
index 000000000..9c30fadf7
--- /dev/null
+++ b/icons/gnome/throbber/010.png
diff --git a/icons/gnome/throbber/Makefile.am b/icons/gnome/throbber/Makefile.am
new file mode 100644
index 000000000..c74f05471
--- /dev/null
+++ b/icons/gnome/throbber/Makefile.am
@@ -0,0 +1,19 @@
+NULL=
+
+throbberdir = $(datadir)/pixmaps/nautilus/gnome/throbber
+
+throbber_DATA = 	\
+	001.png		\
+	002.png		\
+	003.png		\
+	004.png		\
+	005.png		\
+	006.png		\
+	007.png		\
+	008.png		\
+	009.png		\
+	010.png		\
+	rest.png	\
+	$(NULL)
+		
+EXTRA_DIST = $(throbber_DATA)
diff --git a/icons/gnome/throbber/rest.png b/icons/gnome/throbber/rest.png
new file mode 100644
index 000000000..f80d03b73
--- /dev/null
+++ b/icons/gnome/throbber/rest.png
diff --git a/icons/throbber/001.png b/icons/throbber/001.png
index 6710d52c2..187bcd7c4 100644
--- a/icons/throbber/001.png
+++ b/icons/throbber/001.png
diff --git a/icons/throbber/002.png b/icons/throbber/002.png
index a7267d672..8acae28b4 100644
--- a/icons/throbber/002.png
+++ b/icons/throbber/002.png
diff --git a/icons/throbber/003.png b/icons/throbber/003.png
index e8d278da4..00342738e 100644
--- a/icons/throbber/003.png
+++ b/icons/throbber/003.png
diff --git a/icons/throbber/004.png b/icons/throbber/004.png
index 02cc183f7..49a9271ba 100644
--- a/icons/throbber/004.png
+++ b/icons/throbber/004.png
diff --git a/icons/throbber/005.png b/icons/throbber/005.png
index f60a15906..a6c518661 100644
--- a/icons/throbber/005.png
+++ b/icons/throbber/005.png
diff --git a/icons/throbber/006.png b/icons/throbber/006.png
index 6e6d96c47..b45bfcd76 100644
--- a/icons/throbber/006.png
+++ b/icons/throbber/006.png
diff --git a/icons/throbber/007.png b/icons/throbber/007.png
index c3b8136b0..58004a43a 100644
--- a/icons/throbber/007.png
+++ b/icons/throbber/007.png
diff --git a/icons/throbber/008.png b/icons/throbber/008.png
index 39e8757a7..1702ced20 100644
--- a/icons/throbber/008.png
+++ b/icons/throbber/008.png
diff --git a/icons/throbber/009.png b/icons/throbber/009.png
index f28914f33..a2830eaad 100644
--- a/icons/throbber/009.png
+++ b/icons/throbber/009.png
diff --git a/icons/throbber/010.png b/icons/throbber/010.png
index 1642904fe..483d3c6ac 100644
--- a/icons/throbber/010.png
+++ b/icons/throbber/010.png
diff --git a/icons/throbber/011.png b/icons/throbber/011.png
index 79b30d092..00fe8457e 100644
--- a/icons/throbber/011.png
+++ b/icons/throbber/011.png
diff --git a/icons/throbber/012.png b/icons/throbber/012.png
index aa538a6d8..2daaa4680 100644
--- a/icons/throbber/012.png
+++ b/icons/throbber/012.png
diff --git a/icons/throbber/013.png b/icons/throbber/013.png
index d147fb9fa..cf9745eb3 100644
--- a/icons/throbber/013.png
+++ b/icons/throbber/013.png
diff --git a/icons/throbber/014.png b/icons/throbber/014.png
index d5be97f76..54954fa52 100644
--- a/icons/throbber/014.png
+++ b/icons/throbber/014.png
diff --git a/icons/throbber/015.png b/icons/throbber/015.png
index f1dcfe270..e5aabdadc 100644
--- a/icons/throbber/015.png
+++ b/icons/throbber/015.png
diff --git a/icons/throbber/Makefile.am b/icons/throbber/Makefile.am
index d8251543d..218cd6aa1 100644
--- a/icons/throbber/Makefile.am
+++ b/icons/throbber/Makefile.am
@@ -18,19 +18,6 @@ throbber_DATA = 	\
 	013.png		\
 	014.png		\
 	015.png		\
-	016.png		\
-	017.png		\
-	018.png		\
-	019.png		\
-	020.png		\
-	021.png		\
-	022.png		\
-	023.png		\
-	024.png		\
-	025.png		\
-	026.png		\
-	027.png		\
-	028.png		\
 	rest.png	\
 	$(NULL)
 		
diff --git a/icons/throbber/rest.png b/icons/throbber/rest.png
index 8dc78e4f8..785bf3f4a 100644
--- a/icons/throbber/rest.png
+++ b/icons/throbber/rest.png