3 files changed, 18 insertions, 18 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e6138ebde0..10974bcfd1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
 2001-05-08  Iain Holmes  <iain@ximian.com>
 
+	* mail-config.[ch]: Moved all references to the Bonobo stuff into the .c file
+
+2001-05-08  Iain Holmes  <iain@ximian.com>
+
 	* mail-callbacks.c (filter_edit): Set the title of the dialog.
 
 	* GNOME_Evolution_Mail.oaf.in: Add a reference for the MailConfig
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 46ffe62e2a..f83efda407 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1147,6 +1147,20 @@ mail_config_check_service (const char *url, CamelProviderType type, GList **auth
 #define PARENT_TYPE BONOBO_X_OBJECT_TYPE
 static BonoboObjectClass *parent_class = NULL;
 
+/* For the bonobo object */
+typedef struct _EvolutionMailConfig EvolutionMailConfig;
+typedef struct _EvolutionMailConfigClass EvolutionMailConfigClass;
+
+struct _EvolutionMailConfig {
+	BonoboXObject parent;
+};
+
+struct _EvolutionMailConfigClass {
+	BonoboXObjectClass parent_class;
+
+	POA_GNOME_Evolution_MailConfig__epv epv;
+};
+
 static void
 impl_GNOME_Evolution_MailConfig_addAccount (PortableServer_Servant servant,
 					    const GNOME_Evolution_MailConfig_Account *account,
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 896b914249..10c403389f 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -26,10 +26,6 @@
 #include <glib.h>
 #include <camel/camel.h>
 
-#include <bonobo/bonobo-xobject.h>
-
-#include "Mail.h"
-
 #ifdef __cplusplus
 extern "C" {
 #pragma }
@@ -143,20 +139,6 @@ char *mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix);
 
 gboolean  mail_config_check_service (const char *url, CamelProviderType type, GList **authtypes);
 
-/* For the bonobo object */
-typedef struct _EvolutionMailConfig EvolutionMailConfig;
-typedef struct _EvolutionMailConfigClass EvolutionMailConfigClass;
-
-struct _EvolutionMailConfig {
-	BonoboXObject parent;
-};
-
-struct _EvolutionMailConfigClass {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_MailConfig__epv epv;
-};
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */