aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/component-factory.c13
2 files changed, 15 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d5d35c1074..6bd05edb52 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-04 Ettore Perazzoli <ettore@ximian.com>
+
+ * component-factory.c (component_factory_init): Use
+ `e_bonobo_generic_factory_multi_display_new()' instead of just
+ `bonobo_generic_factory_new()'.
+ (component_fn): Added @component_id arg.
+
2001-08-04 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c (mail_part_is_inline): Add yet another
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 4c947c1fa1..f7394796c3 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -33,6 +33,8 @@
#include "Evolution.h"
#include "evolution-storage.h"
+#include "e-util/e-bonobo-factory-util.h"
+
#include "folder-browser-factory.h"
#include "evolution-shell-component.h"
#include "evolution-shell-component-dnd.h"
@@ -46,12 +48,11 @@
#include "mail-session.h"
#include "mail-mt.h"
#include "mail-importer.h"
+#include "mail-send-recv.h"
#include "mail-vfolder.h" /* vfolder_create_storage */
#include "component-factory.h"
-#include "mail-send-recv.h"
-
char *default_drafts_folder_uri;
CamelFolder *drafts_folder = NULL;
char *default_sent_folder_uri;
@@ -704,7 +705,9 @@ handle_external_uri_cb (EvolutionShellComponent *shell_component,
}
static BonoboObject *
-component_fn (BonoboGenericFactory *factory, void *closure)
+component_fn (BonoboGenericFactory *factory,
+ const char *component_id,
+ void *closure)
{
EvolutionShellComponentDndDestinationFolder *destination_interface;
MailOfflineHandler *offline_handler;
@@ -746,8 +749,8 @@ component_fn (BonoboGenericFactory *factory, void *closure)
void
component_factory_init (void)
{
- component_factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID,
- component_fn, NULL);
+ component_factory = e_bonobo_generic_factory_multi_display_new (COMPONENT_FACTORY_ID,
+ component_fn, NULL);
evolution_mail_config_factory_init ();
evolution_folder_info_factory_init ();