diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-06-29 02:30:06 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-06-29 02:30:06 +0800 |
| commit | b3fd58b848852b4c7defa484859c60a8bf232562 (patch) | |
| tree | 1931971a126edcc1eb6da35f23ff120eb2bd091a | |
| parent | 66814218ac6136e798ddf83908da8df94c894824 (diff) | |
| download | gsoc2013-evolution-b3fd58b848852b4c7defa484859c60a8bf232562.tar gsoc2013-evolution-b3fd58b848852b4c7defa484859c60a8bf232562.tar.gz gsoc2013-evolution-b3fd58b848852b4c7defa484859c60a8bf232562.tar.bz2 gsoc2013-evolution-b3fd58b848852b4c7defa484859c60a8bf232562.tar.lz gsoc2013-evolution-b3fd58b848852b4c7defa484859c60a8bf232562.tar.xz gsoc2013-evolution-b3fd58b848852b4c7defa484859c60a8bf232562.tar.zst gsoc2013-evolution-b3fd58b848852b4c7defa484859c60a8bf232562.zip | |
Call od_assert_using_oaf() or od_assert_using_goad() as appropriate to
* main.c (init_corba): Call od_assert_using_oaf() or
od_assert_using_goad() as appropriate to make sure people didn't
someone trick the build system.
svn path=/trunk/; revision=3776
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/main.c | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f705d7e395..3e7c9a1f69 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2000-06-28 Dan Winship <danw@helixcode.com> + + * main.c (init_corba): Call od_assert_using_oaf() or + od_assert_using_goad() as appropriate to make sure people didn't + someone trick the build system. + 2000-06-28 Jeffrey Stedfast <fejj@helixcode.com> * message-list.c: Added prototype for filter_date to make @@ -194,7 +200,6 @@ UI-friendly name. (dispatch_func): Free the saved prettyname. ->>>>>>> 1.221 2000-06-21 Christopher James Lahey <clahey@helixcode.com> * message-list.c: Removed an erroneous comment. diff --git a/mail/main.c b/mail/main.c index d085fc879f..5457f8133d 100644 --- a/mail/main.c +++ b/mail/main.c @@ -1,5 +1,5 @@ /* - * mail-component.c: The core of the mail component + * main.c: The core of the mail component * * Author: * Miguel de Icaza (miguel@helixcode.com) @@ -10,6 +10,7 @@ #include <config.h> #include <gnome.h> #include <bonobo/bonobo-main.h> +#include <bonobo/bonobo-object-directory.h> #include <glade/glade.h> #include "e-util/e-gui-utils.h" @@ -25,8 +26,9 @@ static void init_corba (int *argc, char *argv []) { - gnome_init_with_popt_table ("evolution-mail-component", VERSION, *argc, argv, - oaf_popt_options, 0, NULL); + od_assert_using_oaf (); + gnome_init_with_popt_table ("evolution-mail-component", VERSION, + *argc, argv, oaf_popt_options, 0, NULL); oaf_init (*argc, argv); } @@ -38,7 +40,8 @@ static void init_corba (int *argc, char *argv []) { CORBA_Environment ev; - + + od_assert_using_goad (); CORBA_exception_init (&ev); gnome_CORBA_init_with_popt_table ( |