From d5a93f01c1a20edf80be106993f64fc0385a7a59 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 5 Oct 2000 07:10:04 +0000 Subject: Disable summary stuff, it appears to be badly broken. 2000-10-05 Michael Meeks * component-factory.c (summary_fn, component_factory_init): Disable summary stuff, it appears to be badly broken. * Makefile.am (evolution_mail_SOURCES): add mail-summary.[ch] * subscribe-dialog.c (update_pixmaps): upd. (set_pixmap): upd. (subscribe_dialog_gui_init): upd. remove redundant and annoying forward definitions. * folder-browser-factory.c (control_deactivate): upd. (control_activate_cb): upd. (control_activate): upd. (set_pixmap): upd. (update_pixmaps): upd. (register_ondemand): upd. (create_ondemand_hooks): upd. 2000-10-05 Michael Meeks * e-shell-view-menu.c (shortcut_bar_mode_changed_cb): upd. (folder_bar_mode_changed_cb): upd. (command_xml_dump): clobber. (e_shell_view_menu_setup): upd. * e-shell-view.c (shell_view_interface_set_message_cb): upd. (shell_view_interface_unset_message_cb): upd. (e_shell_view_construct): upd. (get_control_for_uri): upd. (e_shell_view_get_bonobo_ui_component): upd. 2000-10-05 Michael Meeks * contact-editor/e-contact-editor.c (create_ui): upd. (e_contact_editor_init): upd. * gui/component/addressbook.c (control_activate_cb): upd. (control_deactivate): kill. (control_activate): upd. 2000-10-05 Michael Meeks * gui/calendar-commands.c: upd. (calendar_control_activate): upd. (calendar_control_deactivate): upd. 2000-10-05 Michael Meeks * component/e-summary-factory.c (control_activate): upd. (set_pixmap): upd. (update_pixmaps): upd. (control_activate_cb): upd. (control_deactivate): upd. svn path=/trunk/; revision=5742 --- mail/component-factory.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'mail/component-factory.c') diff --git a/mail/component-factory.c b/mail/component-factory.c index 27fd585840..69f7a4b110 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -41,9 +41,11 @@ #include #include "mail-local-storage.h" -#include #include "component-factory.h" +#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME +#include #include "mail-summary.h" +#endif CamelFolder *drafts_folder = NULL; CamelFolder *outbox_folder = NULL; @@ -165,16 +167,17 @@ factory_destroy (BonoboEmbeddable *embeddable, gtk_main_quit (); } +#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME static BonoboObject * summary_fn (BonoboGenericFactory *factory, void *closure) { ExecutiveSummaryComponent *summary_component; - summary_component = executive_summary_component_new (NULL, - create_summary_view, - NULL, NULL); + summary_component = executive_summary_component_new ( + NULL, create_summary_view, NULL, NULL); return BONOBO_OBJECT (summary_component); } +#endif static BonoboObject * factory_fn (BonoboGenericFactory *factory, void *closure) @@ -207,7 +210,9 @@ component_factory_init (void) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); +#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL); +#endif if (factory == NULL) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, @@ -215,10 +220,12 @@ component_factory_init (void) exit (1); } +#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME if (summary_factory == NULL) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Cannot initialize Evolution's mail summary component.")); } +#endif } /* FIXME: remove */ -- cgit v1.2.3