removed the obsolete eazel theme, as well as the old, non-componentized

removed the obsolete eazel theme, as well as the old,
	non-componentized throbber.

	* configure.in:
	* icons/Makefile.am:
	* icons/eazel/.cvsignore:
	* icons/eazel/Makefile.am:
	* icons/eazel/eazel.xml:
	* icons/eazel/*.png:
	* icons/eazel/i-directory-accept.xml:
	* icons/eazel/i-directory.xml:
	* icons/eazel/i-regular.xml:
	* icons/eazel/sidebar_tab_pieces/.cvsignore:
	* icons/eazel/sidebar_tab_pieces/Makefile.am:
	* icons/eazel/sidebar_tab_pieces/*.png:
	* icons/eazel/throbber/.cvsignore:
	* icons/eazel/throbber/Makefile.am:
	* icons/eazel/throbber/*.png:
	* po/POTFILES.in:
	* src/nautilus-throbber.c:
	* src/nautilus-throbber.h:

ChangeLog

@@ -1,3 +1,27 @@
+2001-01-19  Andy Hertzfeld  <andy@eazel.com>
+
+	removed the obsolete eazel theme, as well as the old,
+	non-componentized throbber.
+	
+	* configure.in:
+	* icons/Makefile.am:
+	* icons/eazel/.cvsignore:
+	* icons/eazel/Makefile.am:
+	* icons/eazel/eazel.xml:
+	* icons/eazel/*.png:
+	* icons/eazel/i-directory-accept.xml:
+	* icons/eazel/i-directory.xml:
+	* icons/eazel/i-regular.xml:
+	* icons/eazel/sidebar_tab_pieces/.cvsignore:
+	* icons/eazel/sidebar_tab_pieces/Makefile.am:
+	* icons/eazel/sidebar_tab_pieces/*.png:
+	* icons/eazel/throbber/.cvsignore:
+	* icons/eazel/throbber/Makefile.am:
+	* icons/eazel/throbber/*.png:
+	* po/POTFILES.in:
+	* src/nautilus-throbber.c:
+	* src/nautilus-throbber.h:
+
 2001-01-19  Mike Fleming  <mfleming@eazel.com>
 
 	Half of bug 5975

configure.in

@@ -762,8 +762,6 @@ icons/arlo/Makefile
 icons/arlo/sidebar_tab_pieces/Makefile
 icons/arlo/backgrounds/Makefile
 icons/arlo/throbber/Makefile
-icons/eazel/Makefile
-icons/eazel/sidebar_tab_pieces/Makefile
 icons/gnome/Makefile
 icons/gnome/throbber/Makefile
 icons/sidebar_tab_pieces/Makefile

icons/Makefile.am

@@ -1,6 +1,6 @@
 NULL=
 
-SUBDIRS = ardmore arlo eazel gnome sidebar_tab_pieces vector villanova throbber
+SUBDIRS = ardmore arlo gnome sidebar_tab_pieces vector villanova throbber
 
 icondir = $(datadir)/pixmaps/nautilus
 

icons/eazel/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

icons/eazel/Makefile.am

@@ -1,61 +0,0 @@
-NULL=
-
-eazeldir = $(datadir)/pixmaps/nautilus/eazel
-
-SUBDIRS = sidebar_tab_pieces
-
-eazel_DATA =					\
-	Back.png				\
-	Forward.png				\
-	Home.png				\
-	Refresh.png				\
-	Search.png				\
-	SearchWeb.png				\
-	Services.png				\
-	Stop.png				\
-	Up.png					\
-	eazel.xml				\
-	side_bar_image.png				\
-	i-directory-12.png			\
-	i-directory-12-aa.png			\
-	i-directory-24.png			\
-	i-directory-24-aa.png			\
-	i-directory-36.png			\
-	i-directory-36-aa.png			\
-	i-directory-72.png			\
-	i-directory-72-aa.png			\
-	i-directory-96.png			\
-	i-directory-96-aa.png			\
-	i-directory-accept-24.png		\
-	i-directory-accept-24-aa.png		\
-	i-directory-accept-36.png		\
-	i-directory-accept-36-aa.png		\
-	i-directory-accept-72.png		\
-	i-directory-accept-72-aa.png		\
-	i-directory-accept-96.png		\
-	i-directory-accept-96-aa.png		\
-	i-directory-accept.png			\
-	i-directory-accept-aa.png		\
-	i-directory.png				\
-	i-directory-aa.png			\
-	i-directory-accept.xml			\
-	i-directory.xml				\
-	i-regular-12-aa.png			\
-	i-regular-12.png			\
-	i-regular-24-aa.png			\
-	i-regular-24.png			\
-	i-regular-36-aa.png			\
-	i-regular-36.png			\
-	i-regular-72-aa.png			\
-	i-regular-72.png			\
-	i-regular-96-aa.png			\
-	i-regular-96.png			\
-	i-regular-aa.png			\
-	i-regular.png				\
-	i-regular.xml				\
-	number_strip.png			\
-	theme_preview.png			\
-	zoom_body.png				\
-	$(NULL)
-
-EXTRA_DIST = $(eazel_DATA)

icons/eazel/eazel.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<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"
-  TAB_PIECE_IMAGES="sidebar_tab_pieces" COMBINE="TRUE" LEFT_OFFSET="0" SHADOW_OFFSET="1" TEXT_H_OFFSET="-4" LABEL_COLOR="rgb:FFFF/FFFF/FFFF" TAB_FONT="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
-  <directory BACKGROUND_COLOR="rgb:CFFF/D333/D999"
-  SELECTION_BOX_COLOR_RGBA="0x727D974C" SELECTION_BOX_COLOR="rgb:7222/7DDD/9777" />
-  <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" NUMBER_H_OFFSET="-2" DIGIT_WIDTH="6"/>
- </theme>

icons/eazel/i-directory-accept.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<ICON_SET>
-  <ICON SIZE="24" ATTACH_POINTS="12,11|25,0|25,12|25,24"/>
-  <ICON SIZE="36" ATTACH_POINTS="18,17|38,0|38,20|38,40"/>
-  <ICON SIZE="48" ATTACH_POINTS="28,25|50,0|50,24|50,48"/>
-  <ICON SIZE="72" ATTACH_POINTS="33,31|76,0|76,32|76,64"/>
-  <ICON SIZE="96" ATTACH_POINTS="48,45|100,0|100,48|100,96"/>
-</ICON_SET>

icons/eazel/i-directory.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<ICON_SET>
-  <ICON SIZE="24" ATTACH_POINTS="12,12|25,0|25,12|25,24"/>
-  <ICON SIZE="36" ATTACH_POINTS="20,20|38,0|38,20|38,40"/>
-  <ICON SIZE="48" ATTACH_POINTS="26,26|50,0|50,24|50,48"/>
-  <ICON SIZE="72" ATTACH_POINTS="36,36|76,0|76,32|76,64"/>
-  <ICON SIZE="96" ATTACH_POINTS="50,50|100,0|100,48|100,96"/>
-</ICON_SET>

icons/eazel/i-regular.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<ICON_SET>
-  <ICON SIZE="36" EMBEDDED_TEXT_RECTANGLE="3,3,26,37"/>
-  <ICON SIZE="48" EMBEDDED_TEXT_RECTANGLE="4,4,38,47"/>
-  <ICON SIZE="72" EMBEDDED_TEXT_RECTANGLE="8,8,56,71"/>
-  <ICON SIZE="96" EMBEDDED_TEXT_RECTANGLE="12,12,70,95"/>
-</ICON_SET>

icons/eazel/sidebar_tab_pieces/.cvsignore

@@ -1,2 +0,0 @@
-Makefile.in
-Makefile

icons/eazel/sidebar_tab_pieces/Makefile.am

@@ -1,27 +0,0 @@
-NULL=
-
-eazeltabdir = $(datadir)/pixmaps/nautilus/eazel/sidebar_tab_pieces
-
-eazeltab_DATA = \
-	fill-active.png				\
-	fill-active-prelight.png		\
-	fill-empty-space.png			\
-	fill-prelight.png			\
-	fill.png				\
-	left-bumper.png				\
-	left-bumper-active.png			\
-	left-bumper-active-prelight.png			\
-	left-bumper-prelight.png		\
-	middle-normal-normal.png		\
-	middle-normal-prelight.png		\
-	middle-prelight-normal.png		\
-	right-bumper-prelight.png		\
-	right-bumper.png			\
-	right-empty-space.png			\
-	right-top-active.png			\
-	right-top-active-prelight.png			\
-	right-top-prelight.png			\
-	right-top.png				\
-	$(NULL)
-		
-EXTRA_DIST = $(eazeltab_DATA)

icons/eazel/throbber/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

icons/eazel/throbber/Makefile.am

@@ -1,24 +0,0 @@
-NULL=
-
-throbberdir = $(datadir)/pixmaps/nautilus/eazel/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		\
-	rest.png	\
-	$(NULL)
-		
-EXTRA_DIST = $(throbber_DATA)

po/POTFILES.in

@@ -86,7 +86,6 @@ data/static_bookmarks.xml
 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

src/nautilus-throbber.c

@@ -1,488 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* 
- * Nautilus
- *
- * Copyright (C) 2000 Eazel, Inc.
- *
- * Nautilus is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Nautilus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Andy Hertzfeld <andy@eazel.com>
- *
- * This is the throbber (for busy feedback) for the location bar
- *
- */
-
-#include <config.h>
-#include "nautilus-throbber.h"
-
-#include <libgnome/gnome-defs.h>
-
-#include <math.h>
-#include <gnome.h>
-#include <gdk/gdk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-pixmap.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-theme.h>
-
-#define THROBBER_TIMEOUT 50		/* Milliseconds Per Frame */
-
-struct NautilusThrobberDetails {
-	GList	*image_list;
-
-	GdkPixbuf *quiescent_pixbuf;
-	
-	int	max_frame;
-	int	current_frame;	
-	int	timer_task;
-	gboolean small_mode;
-};
-
-enum {
-	LOCATION_CHANGED,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL];
-
-static void     nautilus_throbber_initialize_class	 (NautilusThrobberClass *klass);
-static void     nautilus_throbber_initialize		 (NautilusThrobber *throbber);
-static void	nautilus_throbber_destroy		 (GtkObject *object);
-static void     nautilus_throbber_draw			 (GtkWidget *widget, 
-							  GdkRectangle *box);
-static int      nautilus_throbber_expose 		 (GtkWidget *widget, 
-							  GdkEventExpose *event);
-static gboolean nautilus_throbber_button_press_event	 (GtkWidget *widget, 
-							  GdkEventButton *event);
-static void	nautilus_throbber_load_images		 (NautilusThrobber *throbber);
-static void	nautilus_throbber_unload_images		 (NautilusThrobber *throbber);
-static void	nautilus_throbber_theme_changed 	 (gpointer user_data);
-static void	nautilus_throbber_size_allocate		 (GtkWidget *widget, GtkAllocation *allocation);
-static void	nautilus_throbber_size_request		 (GtkWidget *widget, GtkRequisition *requisition);
-static void     nautilus_throbber_remove_update_callback (NautilusThrobber *throbber);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber, GTK_TYPE_EVENT_BOX)
-
-static void
-nautilus_throbber_initialize_class (NautilusThrobberClass *throbber_class)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (throbber_class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (throbber_class);
-
-
-	signals[LOCATION_CHANGED] = gtk_signal_new
-		("location_changed",
-		 GTK_RUN_LAST,
-		 object_class->type,
-		 GTK_SIGNAL_OFFSET (NautilusThrobberClass,
-				    location_changed),
-		 gtk_marshal_NONE__STRING,
-		 GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-	
-	object_class->destroy = nautilus_throbber_destroy;
-
-	widget_class->draw = nautilus_throbber_draw;
-	widget_class->expose_event = nautilus_throbber_expose;
-	widget_class->button_press_event = nautilus_throbber_button_press_event;
-	widget_class->size_allocate = nautilus_throbber_size_allocate;
-	widget_class->size_request = nautilus_throbber_size_request;	
-}
-
-static void 
-nautilus_throbber_destroy (GtkObject *object)
-{
-	nautilus_throbber_remove_update_callback (NAUTILUS_THROBBER (object));
-	
-	nautilus_throbber_unload_images (NAUTILUS_THROBBER (object));
-
-	nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
-					      nautilus_throbber_theme_changed,
-					      object);
-
-	g_free (NAUTILUS_THROBBER (object)->details);
-	
-	NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-/* loop through all the images taking their union to compute the width and height of the throbber */
-static void
-get_throbber_dimensions (NautilusThrobber *throbber, int *throbber_width, int* throbber_height)
-{
-	int current_width, current_height;
-	int pixbuf_width, pixbuf_height;
-	GList *current_entry;
-	GdkPixbuf *pixbuf;
-	
-	/* start with the quiescent image */
-	current_width = gdk_pixbuf_get_width (throbber->details->quiescent_pixbuf);
-	current_height = gdk_pixbuf_get_height (throbber->details->quiescent_pixbuf);
-
-	/* loop through all the installed images, taking the union */
-	current_entry = throbber->details->image_list;
-	while (current_entry != NULL) {	
-		pixbuf = (GdkPixbuf*) current_entry->data;
-		pixbuf_width = gdk_pixbuf_get_width (pixbuf);
-		pixbuf_height = gdk_pixbuf_get_height (pixbuf);
-		
-		if (pixbuf_width > current_width) {
-			current_width = pixbuf_width;
-		}
-		
-		if (pixbuf_height > current_height) {
-			current_height = pixbuf_height;
-		}
-		
-		current_entry = current_entry->next;
-	}
-		
-	/* return the result */
-	*throbber_width = current_width;
-	*throbber_height = current_height;
-}
-
-/* initialize the throbber */
-static void
-nautilus_throbber_initialize (NautilusThrobber *throbber)
-{
-	GtkWidget *widget = GTK_WIDGET (throbber);
-	GTK_WIDGET_UNSET_FLAGS (throbber, GTK_NO_WINDOW);
-
-	gtk_widget_set_events (widget, 
-			       gtk_widget_get_events (widget) | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
-	
-	throbber->details = g_new0 (NautilusThrobberDetails, 1);
-	
-	/* set up the instance variables to appropriate defaults */
-	throbber->details->timer_task = -1;
-	
-	/* allocate the pixmap that holds the image */
-	nautilus_throbber_load_images (throbber);
-	
-	/* add a callback for when the theme changes */
-	nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME,
-					  nautilus_throbber_theme_changed,
-					  throbber);
-}
-
-/* allocate a new throbber */
-GtkWidget *
-nautilus_throbber_new (void)
-{
-	return gtk_widget_new (nautilus_throbber_get_type (), NULL);
-}
-
-/* handler for handling theme changes */
-static void
-nautilus_throbber_theme_changed (gpointer user_data)
-{
-	NautilusThrobber *throbber;
-
-	throbber = NAUTILUS_THROBBER (user_data);
-	gtk_widget_hide (GTK_WIDGET (throbber));
-	nautilus_throbber_load_images (throbber);
-	gtk_widget_show (GTK_WIDGET (throbber));	
-	gtk_widget_queue_resize ( GTK_WIDGET (throbber));
-}
-
-
-/* utility to simplify drawing */
-static void
-draw_pixbuf (GdkPixbuf *pixbuf, GdkDrawable *drawable, int x, int y)
-{
-	gdk_pixbuf_render_to_drawable_alpha (pixbuf, drawable, 0, 0, x, y,
-					     gdk_pixbuf_get_width (pixbuf),
-					     gdk_pixbuf_get_height (pixbuf),
-					     GDK_PIXBUF_ALPHA_BILEVEL, 128, GDK_RGB_DITHER_MAX,
-					     0, 0);
-}
-
-/* here's the routine that selects the image to draw, based on the throbber's state */
-
-static GdkPixbuf *
-select_throbber_image (NautilusThrobber *throbber)
-{
-	GList *element;
-
-	if (throbber->details->timer_task == -1)
-		return throbber->details->quiescent_pixbuf;
-	
-	if (throbber->details->image_list == NULL)
-		return NULL;
-
-	element = g_list_nth (throbber->details->image_list, throbber->details->current_frame);
-	
-	return (GdkPixbuf*) element->data;
-}
-
-/* draw the throbber into the passed-in rectangle */
-
-static void
-draw_throbber_image (GtkWidget *widget, GdkRectangle *box)
-{
-	NautilusThrobber *throbber;
-	GdkPixbuf *pixbuf;
-		
-	throbber = NAUTILUS_THROBBER (widget);
-
-	pixbuf = select_throbber_image (throbber);
-	
-	draw_pixbuf (pixbuf, widget->window, box->x, box->y);
-}
-
-static void
-nautilus_throbber_draw (GtkWidget *widget, GdkRectangle *box)
-{ 
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (NAUTILUS_IS_THROBBER (widget));
-	
-	draw_throbber_image (widget, box);	
-}
-
-/* handle expose events */
-
-static int
-nautilus_throbber_expose (GtkWidget *widget, GdkEventExpose *event)
-{
-	GdkRectangle box;
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (NAUTILUS_IS_THROBBER (widget), FALSE);
-
-	box.x = 0; box.y = 0;
-	box.width = widget->allocation.width;
-	box.height = widget->allocation.height;
-
-	draw_throbber_image (widget, &box);	
-	
-	return FALSE;
-}
-
-/* here's the actual timeout task to bump the frame and schedule a redraw */
-
-static int 
-bump_throbber_frame (NautilusThrobber *throbber)
-{
-	throbber->details->current_frame += 1;
-	if (throbber->details->current_frame > throbber->details->max_frame - 1) {
-		throbber->details->current_frame = 0;
-	}
-
-	gtk_widget_queue_draw (GTK_WIDGET (throbber));
-	return TRUE;
-}
-
-
-/* routines to start and stop the throbber */
-
-void
-nautilus_throbber_start (NautilusThrobber *throbber)
-{
-	if (throbber->details->timer_task != -1)
-		gtk_timeout_remove(throbber->details->timer_task);
-	
-	/* reset the frame count */
-	throbber->details->current_frame = 0;
-	throbber->details->timer_task = gtk_timeout_add (THROBBER_TIMEOUT, (GtkFunction) bump_throbber_frame, throbber);
-}
-
-static void
-nautilus_throbber_remove_update_callback (NautilusThrobber *throbber)
-{
-	if (throbber->details->timer_task != -1)
-		gtk_timeout_remove(throbber->details->timer_task);
-	
-	throbber->details->timer_task = -1;
-}
-
-void
-nautilus_throbber_stop (NautilusThrobber *throbber)
-{
-	nautilus_throbber_remove_update_callback (throbber);
-	gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-}
-
-/* routines to load the images used to draw the throbber */
-
-/* unload all the images, and the list itself */
-
-static void
-nautilus_throbber_unload_images (NautilusThrobber *throbber)
-{
-	GList *current_entry;
-
-	if (throbber->details->quiescent_pixbuf != NULL) {
-		gdk_pixbuf_unref (throbber->details->quiescent_pixbuf);
-		throbber->details->quiescent_pixbuf = NULL;
-	}
-
-	/* unref all the images in the list, and then let go of the list itself */
-	current_entry = throbber->details->image_list;
-	while (current_entry != NULL) {
-		gdk_pixbuf_unref ((GdkPixbuf*) current_entry->data);
-		current_entry = current_entry->next;
-	}
-	
-	g_list_free (throbber->details->image_list);
-	throbber->details->image_list = NULL;
-}
-
-static GdkPixbuf*
-load_themed_image (const char *file_name, const char *image_theme, gboolean small_mode)
-{
-	GdkPixbuf *pixbuf, *temp_pixbuf;
-	char *image_path;
-	
-	if (image_theme == NULL) {
-		image_path = nautilus_theme_get_image_path (file_name);
-	} else {
-		image_path = nautilus_theme_get_image_path_from_theme (file_name, image_theme);	
-	}
-	
-	if (image_path) {
-		pixbuf = gdk_pixbuf_new_from_file (image_path);
-		
-		if (small_mode && pixbuf) {
-			temp_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
-							       gdk_pixbuf_get_width (pixbuf) / 2,
-							       gdk_pixbuf_get_height (pixbuf) / 2,
-							       GDK_INTERP_BILINEAR);
-			gdk_pixbuf_unref (pixbuf);
-			pixbuf = temp_pixbuf;
-		}
-		
-		g_free (image_path);
-		return pixbuf;
-	}
-	return NULL;
-}
-
-/* utility to make the throbber frame name from the index */
-
-static char *
-make_throbber_frame_name (int index)
-{
-	return g_strdup_printf ("throbber/%03d.png", index);
-}
-
-/* load all of the images of the throbber sequentially */
-static void
-nautilus_throbber_load_images (NautilusThrobber *throbber)
-{
-	int index;
-	char *throbber_frame_name, *image_theme, *frames;
-	GdkPixbuf *pixbuf;
-	
-	nautilus_throbber_unload_images (throbber);
-
-	image_theme = nautilus_theme_get_theme_data ("throbber", "IMAGE_THEME");
-	throbber->details->quiescent_pixbuf = load_themed_image ("throbber/rest.png", image_theme, throbber->details->small_mode);
-
-	/* images are of the form throbber/001.png, 002.png, etc, so load them into a list */
-
-	frames = nautilus_theme_get_theme_data ("throbber", "FRAME_COUNT");
-	if (frames != NULL) {
-		throbber->details->max_frame = atoi (frames);
-		g_free (frames);
-	} else {
-		throbber->details->max_frame = 16;
-	}
-	
-	index = 1;
-	while (index <= throbber->details->max_frame) {
-		throbber_frame_name = make_throbber_frame_name (index);
-		pixbuf = load_themed_image (throbber_frame_name, image_theme, throbber->details->small_mode);
-		g_free (throbber_frame_name);
-		if (pixbuf == NULL) {
-			throbber->details->max_frame = index - 1;
-			break;
-		}
-		throbber->details->image_list = g_list_append (throbber->details->image_list, pixbuf);
-		index += 1;
-	}	
-	g_free (image_theme);
-}
-
-/* handle button presses by emitting the location changed signal */
-
-static gboolean
-nautilus_throbber_button_press_event (GtkWidget *widget, GdkEventButton *event)
-{	
-	char *location;
-
-	location = nautilus_theme_get_theme_data ("throbber", "URL");
-	if (location != NULL) {
-		gtk_signal_emit (GTK_OBJECT (widget),
-			 signals[LOCATION_CHANGED],
-			 location);
-	
-		g_free (location);
-	}
-	
-	return TRUE;
-}
-
-void
-nautilus_throbber_set_small_mode (NautilusThrobber *throbber, gboolean new_mode)
-{
-	int throbber_width, throbber_height;
-	
-	if (new_mode != throbber->details->small_mode) {
-		throbber->details->small_mode = new_mode;
-		nautilus_throbber_load_images (throbber);
-
-		get_throbber_dimensions (throbber, &throbber_width, &throbber_height);
-		gtk_widget_set_usize (GTK_WIDGET (throbber), throbber_width, throbber_height);		
-		gtk_widget_queue_resize (GTK_WIDGET (throbber));
-	}
-}
-
-/* handle setting the size */
-static void
-nautilus_throbber_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	int throbber_width, throbber_height;
-	NautilusThrobber *throbber = NAUTILUS_THROBBER (widget);
-
-	NAUTILUS_CALL_PARENT_CLASS (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
-
-	get_throbber_dimensions (throbber, &throbber_width, &throbber_height);
-	
-	widget->allocation.width = throbber_width;
-   	widget->allocation.height = throbber_height;	
-}
-
-/* handle setting the size */
-static void
-nautilus_throbber_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	int throbber_width, throbber_height;
-	NautilusThrobber *throbber = NAUTILUS_THROBBER (widget);
-
-	get_throbber_dimensions (throbber, &throbber_width, &throbber_height);
-	
-	requisition->width = throbber_width;
-   	requisition->height = throbber_height;	
-}

src/nautilus-throbber.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/*
- * Nautilus
- *
- * Copyright (C) 2000 Eazel, Inc.
- *
- * Nautilus is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Nautilus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Andy Hertzfeld <andy@eazel.com>
- *
- * This is the header file for the throbber on the location bar
- *
- */
-
-#ifndef NAUTILUS_THROBBER_H
-#define NAUTILUS_THROBBER_H
-
-#include <gdk/gdk.h>
-#include <gtk/gtkeventbox.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define NAUTILUS_TYPE_THROBBER		(nautilus_throbber_get_type ())
-#define NAUTILUS_THROBBER(obj)		(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_THROBBER, NautilusThrobber))
-#define NAUTILUS_THROBBER_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_THROBBER, NautilusThrobberClass))
-#define NAUTILUS_IS_THROBBER(obj)	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_THROBBER))
-#define NAUTILUS_IS_THROBBER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_THROBBER))
-
-typedef struct NautilusThrobber NautilusThrobber;
-typedef struct NautilusThrobberClass NautilusThrobberClass;
-typedef struct NautilusThrobberDetails NautilusThrobberDetails;
-
-struct NautilusThrobber {
-	GtkEventBox parent;
-	NautilusThrobberDetails *details;
-};
-
-struct NautilusThrobberClass {
-	GtkEventBoxClass parent_class;
-	
-	/* signals */
-	void         (* location_changed) (NautilusThrobber *throbber,
-					   const char            *location);
-};
-
-GtkType    	nautilus_throbber_get_type	(void);
-GtkWidget *	nautilus_throbber_new		(void);
-
-void		nautilus_throbber_start		(NautilusThrobber *throbber);
-void		nautilus_throbber_stop		(NautilusThrobber *throbber);
-void		nautilus_throbber_set_small_mode (NautilusThrobber *throbber, gboolean new_mode);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* NAUTILUS_THROBBER_H */