aboutsummaryrefslogtreecommitdiffstats
path: root/mail/component-factory.c
diff options
context:
space:
mode:
authorIain Holmes <iain@helixcode.com>2000-10-07 08:58:03 +0800
committerIain Holmes <iain@src.gnome.org>2000-10-07 08:58:03 +0800
commitee625ee5fcc71e9d17fafd53fa17c7cd73558c9f (patch)
treebb93966fd64cce8876fcdbd4b4f9131ea0119c56 /mail/component-factory.c
parentb9db2f0137dd06111913dd93d97737542dba026d (diff)
downloadgsoc2013-evolution-ee625ee5fcc71e9d17fafd53fa17c7cd73558c9f.tar.gz
gsoc2013-evolution-ee625ee5fcc71e9d17fafd53fa17c7cd73558c9f.tar.zst
gsoc2013-evolution-ee625ee5fcc71e9d17fafd53fa17c7cd73558c9f.zip
Fix the locking up of the mail by only calling camel functions from the
2000-10-06 Iain Holmes <iain@helixcode.com> * mail-summary.c: Fix the locking up of the mail by only calling camel functions from the camel thread, and ORBit functions from the GTK thread. Watch for the message-changed signal again. * component-factory.c (summary_fn, component_factory_init): Re-enabled it, cos I think it works again. * mail-display.h: Remove the pb_cache. * Makefile.am: Readd the mail-summary.[ch] files and add the evolution-services library to the link. svn path=/trunk/; revision=5777
Diffstat (limited to 'mail/component-factory.c')
-rw-r--r--mail/component-factory.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 69f7a4b110..44702245ee 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -42,10 +42,8 @@
#include "mail-local-storage.h"
#include "component-factory.h"
-#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME
#include <executive-summary/evolution-services/executive-summary-component.h>
#include "mail-summary.h"
-#endif
CamelFolder *drafts_folder = NULL;
CamelFolder *outbox_folder = NULL;
@@ -167,7 +165,6 @@ factory_destroy (BonoboEmbeddable *embeddable,
gtk_main_quit ();
}
-#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME
static BonoboObject *
summary_fn (BonoboGenericFactory *factory, void *closure)
{
@@ -177,7 +174,6 @@ summary_fn (BonoboGenericFactory *factory, void *closure)
NULL, create_summary_view, NULL, NULL);
return BONOBO_OBJECT (summary_component);
}
-#endif
static BonoboObject *
factory_fn (BonoboGenericFactory *factory, void *closure)
@@ -210,9 +206,7 @@ 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,
@@ -220,12 +214,10 @@ 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 */