1 files changed, 38 insertions, 3 deletions
diff --git a/mail/main.c b/mail/main.c
index b6b0f2e1bc..c8ab65b7a4 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -1,14 +1,49 @@
 /*
- * main.c: Evolution mail reading component
+ * mail-component.c: The core of the mail component
  *
- * Authors:
+ * Author:
  *   Miguel de Icaza (miguel@helixcode.com)
  *
  * (C) 2000 Helix Code, Inc.
  */
 #include <config.h>
 #include <gnome.h>
+#include <bonobo/gnome-main.h>
+#include "e-util/e-gui-utils.h"
+#include "main.h"
 
-main ()
+CORBA_Environment ev;
+CORBA_ORB orb;
+
+static void
+init_bonobo (int argc, char **argv)
+{
+	gnome_CORBA_init_with_popt_table (
+		"evolution-mail-component", "1.0",
+		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
+
+	orb = gnome_CORBA_ORB ();
+
+	if (bonobo_init (orb, NULL, NULL) == FALSE){
+		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
+			  _("Mail Component: I could not initialize Bonobo"));
+		exit (1);
+	}
+}
+
+static void
+main (int argc, char *argv [])
 {
+	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
+	textdomain (PACKAGE);
+
+	CORBA_exception_init (&ev);
+
+	init_bonobo (argc, argv);
+
+	mail_folder_browser_factory_init ();
+
+	bonobo_main ();
+
+	return 0;
 }