diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/component-factory.c | 4 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 6 | ||||
| -rw-r--r-- | mail/main.c | 61 | ||||
| -rw-r--r-- | mail/test-mail.c | 36 |
5 files changed, 26 insertions, 90 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 5fff503a98..e5a62f30a9 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2000-07-24 Dan Winship <danw@helixcode.com> + + * component-factory.c, folder-browser-factory.c, test-mail.c: + Remove GOAD support. + + * main.c: Remove GOAD support. + (main): More "guess the build mistake" fun, this time for the + failure to initialize Bonobo case. + 2000-07-23 Ettore Perazzoli <ettore@helixcode.com> * mail-ops.c (create_message_composer): New. diff --git a/mail/component-factory.c b/mail/component-factory.c index a00e687d43..bd3e13eb23 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -48,11 +48,7 @@ static void real_create_imap_storage( gpointer user_data ); static void create_news_storage (EvolutionShellComponent *shell_component); static void real_create_news_storage( gpointer user_data ); -#ifdef USING_OAF #define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6" -#else -#define COMPONENT_FACTORY_ID "evolution-shell-component-factory:evolution-mail" -#endif static BonoboGenericFactory *factory = NULL; diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 179e096665..089e83059d 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -19,12 +19,6 @@ #include "mail.h" #include "shell/Evolution.h" -#ifdef USING_OAF -#define CONTROL_FACTORY_ID "OAFIID:control-factory:evolution-mail:25902062-543b-4f44-8702-d90145fcdbf2" -#else -#define CONTROL_FACTORY_ID "control-factory:evolution-mail" -#endif - static GnomeUIInfo gnome_toolbar [] = { GNOMEUIINFO_ITEM_STOCK (N_("Get mail"), N_("Check for new mail"), fetch_mail, GNOME_STOCK_PIXMAP_MAIL_RCV), GNOMEUIINFO_ITEM_STOCK (N_("Compose"), N_("Compose a new message"), compose_msg, GNOME_STOCK_PIXMAP_MAIL_NEW), diff --git a/mail/main.c b/mail/main.c index abfd5f9f27..c330f412e5 100644 --- a/mail/main.c +++ b/mail/main.c @@ -13,6 +13,7 @@ #include <bonobo/bonobo-object-directory.h> #include <glade/glade.h> #include <gconf/gconf.h> +#include <liboaf/liboaf.h> #include "e-util/e-gui-utils.h" #include "e-util/e-cursors.h" @@ -20,50 +21,6 @@ #include "component-factory.h" #include "mail.h" -#ifdef USING_OAF - -#include <liboaf/liboaf.h> - -static void -init_corba (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); -} - -#else /* USING_OAF */ - -#include <libgnorba/gnorba.h> - -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 ( - "evolution-mail-component", "1.0", - argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev); - - CORBA_exception_free (&ev); -} - -#endif /* USING_OAF */ - -static void -init_bonobo (void) -{ - 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")); - exit (1); - } -} - int main (int argc, char *argv []) { @@ -73,8 +30,20 @@ main (int argc, char *argv []) #ifdef USE_BROKEN_THREADS g_thread_init( NULL ); #endif - init_corba (&argc, argv); - init_bonobo (); + + od_assert_using_oaf (); + gnome_init_with_popt_table ("evolution-mail-component", VERSION, + argc, argv, oaf_popt_options, 0, NULL); + oaf_init (argc, argv); + + if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, + CORBA_OBJECT_NIL) == FALSE) { + g_error ("Mail component could not initialize Bonobo.\n" + "If there was a warning message about the " + "RootPOA, it probably means\nyou compiled " + "Bonobo against GOAD instead of OAF."); + } + gconf_init (argc, argv, NULL); glade_gnome_init (); diff --git a/mail/test-mail.c b/mail/test-mail.c index f2a39bf104..ecf8c5eda5 100644 --- a/mail/test-mail.c +++ b/mail/test-mail.c @@ -11,36 +11,8 @@ #include <gnome.h> #include <bonobo.h> - -#ifdef USING_OAF - #include <liboaf/liboaf.h> -static void -init_corba (int *argc, char *argv[]) -{ - gnome_init ("sample-control-container", "1.0", *argc, argv); - oaf_init (*argc, argv); -} - -#else /* USING_OAF */ - -#include <libgnorba/gnorba.h> - -static void -init_corba (int *argc, char *argv []) -{ - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - gnome_CORBA_init ("sample-control-container", "1.0", argc, argv, 0, &ev); - - CORBA_exception_free (&ev); -} - -#endif /* USING_OAF */ - static guint create_container (void) { @@ -58,13 +30,8 @@ create_container (void) uih = bonobo_ui_handler_new (); -#ifdef USING_OAF control = bonobo_widget_new_control ("OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45", bonobo_object_corba_objref (BONOBO_OBJECT (uih))); -#else - control = bonobo_widget_new_control ("control:evolution-mail", - bonobo_object_corba_objref (BONOBO_OBJECT (uih))); -#endif if (control == NULL){ printf ("Could not launch mail control\n"); @@ -82,7 +49,8 @@ create_container (void) int main (int argc, char *argv []) { - init_corba (&argc, argv); + gnome_init ("sample-control-container", "1.0", argc, argv); + oaf_init (argc, argv); if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) g_error ("Could not initialize Bonobo\n"); |