Change component icons to use the icon theme names for icons Remove

2004-04-19  Michael Terry  <mike@mterry.name>

	* GNOME_Evolution_Test.server.in.in: Change component icons to use the
	icon theme names for icons
	* Makefile.am: Remove e-icon-factory.[ch]
	* e-component-registry.c: Use the icon theme for component icons
	* e-icon-factory.[ch]: Removed these files
	* e-shell-importer.c:
	* e-shell-settings-dialog.c:
	* e-shell-startup-wizard.c:
	* e-shell-window-commands.c:
	* e-user-creatable-items-handler.c:
	* evolution-shell-component-utils.[ch]:
	* main.c:
	* glade/evolution-startup-wizard.glade:
	* importer/import.glade: Use the icon theme via EIconFactory for all
	of the icons in the shell, and the window icons

svn path=/trunk/; revision=25512

1 files changed, 4 insertions, 3 deletions

diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h
index 5aceab64c7..a1890fe4ef 100644
--- a/shell/evolution-shell-component-utils.h
+++ b/shell/evolution-shell-component-utils.h
@@ -31,12 +31,13 @@ extern "C" {
 
 typedef struct _EPixmap {
 	const char *path;
-	const char *fname;
+	const char *name;
+	gint       size;
 	char       *pixbuf;
 } EPixmap;
 
-#define E_PIXMAP(path,fname)	{ (path), (fname), NULL }
-#define E_PIXMAP_END		{ NULL, NULL, NULL }
+#define E_PIXMAP(path,name,size)	{ (path), (name), (size), NULL }
+#define E_PIXMAP_END			{ NULL, NULL, 0, NULL }
 
 /* Takes an array of pixmaps, terminated by E_PIXMAP_END, and loads into uic */
 void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache);