aboutsummaryrefslogtreecommitdiffstats
path: root/mail/main.c
diff options
context:
space:
mode:
authorMichael Meeks <michael@helixcode.com>2000-08-04 10:00:02 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-08-04 10:00:02 +0800
commit8ec2a002e8f98c11836ca0fd0924d84a65018908 (patch)
tree4ade1439eaddeaa88b25c3e97899ae84f3853fec /mail/main.c
parent6d6b9ec70ea0e6f16935ffbae676909c5a09f06c (diff)
downloadgsoc2013-evolution-8ec2a002e8f98c11836ca0fd0924d84a65018908.tar
gsoc2013-evolution-8ec2a002e8f98c11836ca0fd0924d84a65018908.tar.gz
gsoc2013-evolution-8ec2a002e8f98c11836ca0fd0924d84a65018908.tar.bz2
gsoc2013-evolution-8ec2a002e8f98c11836ca0fd0924d84a65018908.tar.lz
gsoc2013-evolution-8ec2a002e8f98c11836ca0fd0924d84a65018908.tar.xz
gsoc2013-evolution-8ec2a002e8f98c11836ca0fd0924d84a65018908.tar.zst
gsoc2013-evolution-8ec2a002e8f98c11836ca0fd0924d84a65018908.zip
only whack the sig in if the file exists.
2000-08-03 Michael Meeks <michael@helixcode.com> * mail-config.c (identity_page_new): only whack the sig in if the file exists. * component-factory.c (factory_fn): count running instances, attach destroy signal (factory_destroy): add. * main.c (main): pass orb around. svn path=/trunk/; revision=4523
Diffstat (limited to 'mail/main.c')
-rw-r--r--mail/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mail/main.c b/mail/main.c
index f1cc59b384..ff4a475716 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -25,6 +25,8 @@
int
main (int argc, char *argv [])
{
+ CORBA_ORB orb;
+
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
@@ -35,9 +37,9 @@ main (int argc, char *argv [])
od_assert_using_oaf ();
gnome_init_with_popt_table ("evolution-mail-component", VERSION,
argc, argv, oaf_popt_options, 0, NULL);
- oaf_init (argc, argv);
+ orb = oaf_init (argc, argv);
- if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL,
+ if (bonobo_init (orb, CORBA_OBJECT_NIL,
CORBA_OBJECT_NIL) == FALSE) {
g_error ("Mail component could not initialize Bonobo.\n"
"If there was a warning message about the "