aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/component-factory.c14
2 files changed, 10 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ee4c8c4d6f..0615c9ca31 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-26 Jason Leach <jasonleach@usa.net>
+
+ (Fixing an old FIXME)
+
+ * component-factory.c (create_vfolder_storage): removing
+ create_vfolder_storage, replacing call to it with
+ vfolder_create_storage.
+
2001-01-26 Not Zed <NotZed@Ximian.com>
* message-list.c (build_tree): Define BROKEN_ETREE again, till we
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 89c29bc2d3..95e578e5f0 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -42,6 +42,7 @@
#include "mail-session.h"
#include "mail-mt.h"
#include "mail-importer.h"
+#include "mail-vfolder.h" /* vfolder_create_storage */
#include "openpgp-utils.h"
#include <gal/widgets/e-gui-utils.h>
@@ -54,8 +55,6 @@ CamelFolder *outbox_folder = NULL;
CamelFolder *sent_folder = NULL; /* this one should be configurable? */
char *evolution_dir;
-static void create_vfolder_storage (EvolutionShellComponent *shell_component);
-
#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ShellComponentFactory"
#define SUMMARY_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
@@ -191,7 +190,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
storages_hash = g_hash_table_new (NULL, NULL);
- create_vfolder_storage (shell_component);
+ vfolder_create_storage (shell_component);
corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
@@ -297,15 +296,6 @@ component_factory_init (void)
}
}
-/* FIXME: remove */
-static void
-create_vfolder_storage (EvolutionShellComponent *shell_component)
-{
- void vfolder_create_storage(EvolutionShellComponent *shell_component);
-
- vfolder_create_storage(shell_component);
-}
-
static void
add_storage (const char *name, const char *uri, CamelService *store,
GNOME_Evolution_Shell corba_shell, CamelException *ex)