aboutsummaryrefslogtreecommitdiffstats
path: root/mail/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/main.c')
-rw-r--r--mail/main.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/mail/main.c b/mail/main.c
index 517d6190e2..2dceb6644e 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -13,12 +13,15 @@
#include "e-util/e-gui-utils.h"
#include "main.h"
-CORBA_Environment ev;
CORBA_ORB orb;
static void
init_bonobo (int argc, char **argv)
{
+ CORBA_Environment ev;
+
+ CORBA_exception_init (&ev);
+
gnome_CORBA_init_with_popt_table (
"evolution-mail-component", "1.0",
&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
@@ -30,6 +33,8 @@ init_bonobo (int argc, char **argv)
_("Mail Component: I could not initialize Bonobo"));
exit (1);
}
+
+ CORBA_exception_free (&ev);
}
int
@@ -38,13 +43,17 @@ main (int argc, char *argv [])
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
- CORBA_exception_init (&ev);
-
init_bonobo (argc, argv);
+ session_init ();
+
folder_browser_factory_init ();
bonobo_main ();
return 0;
}
+
+
+
+