Removing more cruft.

svn path=/trunk/; revision=2766

6 files changed, 16 insertions, 69 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index a57b493ada..2d392d1d88 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,15 @@
 2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
 
+	* e-folder-mail.c: Removed.
+
+	* e-folder-mail.h: Removed.
+
+	* eshell-types.h: Removed.
+
+	* e-folder.h: Don't #include "eshell-types.h".
+
+2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
+
 	* e-folder.h: Removed member `eservice' from `EFolder'.
 
 	* e-service.c: Removed.
diff --git a/shell/Makefile.am b/shell/Makefile.am
index fc98528686..a4d4776e76 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -39,7 +39,6 @@ evolution_SOURCES =		\
 	evolution-service-repository.c	\
 	evolution-service-repository.h
 
-
 Evolution-impl.o: Evolution.h
 
 $(EVOLUTION_CORBA_GENERATED): Evolution.idl evolution-service-repository.idl
diff --git a/shell/e-folder-mail.c b/shell/e-folder-mail.c
deleted file mode 100644
index 9765b7d946..0000000000
--- a/shell/e-folder-mail.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * e-folder-mail.c: Mail folder
- *
- * Author:
- *   Miguel de Icaza (miguel@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-#include <config.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-util/e-util.h"
-#include "e-folder-mail.h"
-
-#define PARENT_TYPE e_folder_get_type ()
-
-static void
-e_folder_mail_init (GtkObject *object)
-{
-}
-
-E_MAKE_TYPE (e_folder_mail, "EFolderMail", EFolderMail, e_folder_mail_class_init, e_folder_mail_init, PARENT_TYPE)
-
-EFolder *
-e_folder_mail_new (const char *uri, const char *name, const char *desc,
-		   const char *home_page, const char *view_name)
-{
-	EFolderMail *efm = gtk_type_new (e_folder_mail_get_type ());
-
-	e_folder_construct (E_FOLDER (efm), E_FOLDER_MAIL, uri, name, desc, home_page, view_name);
-
-	return E_FOLDER (efm);
-}
-
-
diff --git a/shell/e-folder-mail.h b/shell/e-folder-mail.h
deleted file mode 100644
index 76098c6182..0000000000
--- a/shell/e-folder-mail.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _E_FOLDER_MAIL_H_
-#define _E_FOLDER_MAIL_H_
-
-#include "e-folder.h"
-
-#define E_FOLDER_MAIL_TYPE        (e_folder_mail_get_type ())
-#define E_FOLDER_MAIL(o)          (GTK_CHECK_CAST ((o), E_FOLDER_MAIL_TYPE, EFolderMail))
-#define E_FOLDER_MAIL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_FOLDER_MAIL_TYPE, EFolderMailClass))
-#define E_IS_FOLDER_MAIL(o)       (GTK_CHECK_TYPE ((o), E_FOLDER_MAIL_TYPE))
-#define E_IS_FOLDER_MAIL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_FOLDER_MAIL_TYPE))
-
-typedef struct {
-	EFolder parent;
-} EFolderMail;
- 
-typedef struct {
-	EFolderClass parent;
-} EFolderMailClass;
-
-GtkType     e_folder_mail_get_type (void);
-EFolder    *e_folder_mail_new      (const char *uri, const char *name, const char *desc,
-				    const char *home_page, const char *view_name);
-
-#endif /* _E_FOLDER_MAIL_H_ */
-
-
-
-
diff --git a/shell/e-folder.h b/shell/e-folder.h
index 71c0577655..fe5e2d6cd1 100644
--- a/shell/e-folder.h
+++ b/shell/e-folder.h
@@ -6,7 +6,6 @@
 #define _E_FOLDER_H_
 
 
-#include "eshell-types.h"
 #include <gtk/gtkobject.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -31,7 +30,7 @@ typedef enum {
 	E_FOLDER_OTHER
 } EFolderType;
 
-struct  _EFolder {
+struct _EFolder {
 	GtkObject parent_object;
 
 	EFolderType type;
@@ -49,15 +48,17 @@ struct  _EFolder {
 	 */
 	char *view_name;	/* View name */
 };
+typedef struct _EFolder EFolder;
  
-typedef struct {
+struct _EFolderClass {
 	GtkObjectClass parent_class;
 
 	/*
 	 * Notifies views of visible changes in the Efolder
 	 */
 	void (*changed) (EFolder *efolder);
-} EFolderClass;
+};
+typedef struct _EFolderClass EFolderClass;
 
 GtkType     e_folder_get_type        (void);
 void        e_folder_construct       (EFolder *efolder, EFolderType type,
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 3e351a8853..71d5adb736 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -10,6 +10,7 @@
  */
 #include <config.h>
 #include <gnome.h>
+
 #include "shortcut-bar/e-shortcut-bar.h"
 #include "e-util/e-util.h"
 #include "e-shell-view.h"