diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/Makefile.am | 1 | ||||
| -rw-r--r-- | mail/component-factory.c | 32 | ||||
| -rw-r--r-- | mail/component-factory.h | 2 |
4 files changed, 9 insertions, 35 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 831777da79..c38e76e916 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2003-03-10 Not Zed <NotZed@Ximian.com> + + * Makefile.am (libevolution_mail_la_SOURCES): removed main.c from + the build. + + * component-factory.c (component_factory_init): Remove, not used + anymore, causes linking problems some places. + (factory): Removed the debug printf. + 2003-03-07 Jeffrey Stedfast <fejj@ximian.com> All this snot just to fix bug #38925 and an attempt to fix bug diff --git a/mail/Makefile.am b/mail/Makefile.am index b7d41b1982..afdbf9a1d6 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -136,7 +136,6 @@ libevolution_mail_la_SOURCES = \ mail-vfolder.h \ message-browser.c \ message-browser.h \ - main.c \ message-list.c \ message-list.h \ message-tag-editor.c \ diff --git a/mail/component-factory.c b/mail/component-factory.c index 98671807ca..854d57d682 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -1085,36 +1085,6 @@ create_component (void) return BONOBO_OBJECT (shell_component); } -void -component_factory_init (void) -{ - BonoboObject *shell_component; - int result; - - shell_component = create_component (); - result = bonobo_activation_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (shell_component)); - if (result == Bonobo_ACTIVATION_REG_ERROR) { - e_notice (NULL, GTK_MESSAGE_ERROR, - _("Cannot initialize the Evolution mail component.")); - exit (1); - } else if (result == Bonobo_ACTIVATION_REG_ALREADY_ACTIVE) { - g_warning ("evolution-mail is already running"); - exit (1); - } - - if (evolution_mail_config_factory_init () == FALSE) { - e_notice (NULL, GTK_MESSAGE_ERROR, - _("Cannot initialize Evolution's mail config component.")); - exit (1); - } - - if (evolution_folder_info_factory_init () == FALSE) { - e_notice (NULL, GTK_MESSAGE_ERROR, - _("Cannot initialize Evolution's folder info component.")); - exit (1); - } -} - static void notify_listener (const Bonobo_Listener listener, GNOME_Evolution_Storage_Result corba_result) @@ -1622,8 +1592,6 @@ factory (BonoboGenericFactory *factory, const char *component_id, void *closure) { - printf("Activating component '%s'\n", component_id); - if (strcmp (component_id, COMPONENT_ID) == 0) return create_component(); else if (strcmp(component_id, MAIL_CONFIG_IID) == 0) diff --git a/mail/component-factory.h b/mail/component-factory.h index 780e04e7ae..3abd058556 100644 --- a/mail/component-factory.h +++ b/mail/component-factory.h @@ -26,6 +26,4 @@ #define COMPONENT_ID "OAFIID:GNOME_Evolution_Mail_ShellComponent" #define SUMMARY_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory" -void component_factory_init (void); - #endif |