aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/main.c16
2 files changed, 14 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b119e9a18e..b8c18f3731 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-28 Ettore Perazzoli <ettore@helixcode.com>
+
+ * main.c (init_bonobo): Don't call `init_corba()' and don't get
+ any args.
+ (init_corba) [!USING_OAF]: Fix args.
+
2000-04-27 Ettore Perazzoli <ettore@helixcode.com>
* folder-browser-factory.c: New macro `CONTROL_FACTORY_ID', which
diff --git a/mail/main.c b/mail/main.c
index 2102a153ff..48a207d3b5 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -20,11 +20,11 @@
#include <liboaf/liboaf.h>
static void
-init_corba (int argc, char *argv [])
+init_corba (int *argc, char *argv [])
{
- gnome_init_with_popt_table ("evolution-mail-component", VERSION, argc, argv,
+ gnome_init_with_popt_table ("evolution-mail-component", VERSION, *argc, argv,
oaf_popt_options, 0, NULL);
- oaf_init (argc, argv);
+ oaf_init (*argc, argv);
}
#else /* USING_OAF */
@@ -40,7 +40,7 @@ init_corba (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);
+ argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
CORBA_exception_free (&ev);
}
@@ -48,10 +48,8 @@ init_corba (int *argc, char *argv [])
#endif /* USING_OAF */
static void
-init_bonobo (int argc, char **argv)
+init_bonobo (void)
{
- init_corba (argc, argv);
-
if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE){
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Mail Component: I could not initialize Bonobo"));
@@ -65,7 +63,9 @@ main (int argc, char *argv [])
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
- init_bonobo (argc, argv);
+ init_corba (&argc, argv);
+ init_bonobo ();
+
glade_gnome_init ();
session_init ();