aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/component-factory.c13
2 files changed, 14 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6bd05edb52..275a54671a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-05 Ettore Perazzoli <ettore@ximian.com>
+
+ [Revert the previous changes, there seems to be something wrong
+ with it.]
+
+ * component-factory.c (component_factory_init): Back to using
+ `bonobo_generic_factory_new()'.
+ (component_fn): Updated accordingly.
+
2001-08-04 Ettore Perazzoli <ettore@ximian.com>
* component-factory.c (component_factory_init): Use
diff --git a/mail/component-factory.c b/mail/component-factory.c
index f7394796c3..4c947c1fa1 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -33,8 +33,6 @@
#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"
@@ -48,11 +46,12 @@
#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;
@@ -705,9 +704,7 @@ handle_external_uri_cb (EvolutionShellComponent *shell_component,
}
static BonoboObject *
-component_fn (BonoboGenericFactory *factory,
- const char *component_id,
- void *closure)
+component_fn (BonoboGenericFactory *factory, void *closure)
{
EvolutionShellComponentDndDestinationFolder *destination_interface;
MailOfflineHandler *offline_handler;
@@ -749,8 +746,8 @@ component_fn (BonoboGenericFactory *factory,
void
component_factory_init (void)
{
- component_factory = e_bonobo_generic_factory_multi_display_new (COMPONENT_FACTORY_ID,
- component_fn, NULL);
+ component_factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID,
+ component_fn, NULL);
evolution_mail_config_factory_init ();
evolution_folder_info_factory_init ();