aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/folder-browser-factory.c2
-rw-r--r--mail/mail-callbacks.c5
3 files changed, 11 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a4d29f7011..a946bb7450 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-19 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * mail-callbacks.c: #include "mail-vfolder.h"
+ (vfolder_edit_vfolders): Don't call the dummy vfolder_edit
+ function.
+
+ * folder-browser-factory.c: s/VFolderEdit/SetVFolder
+
2000-10-19 Dan Winship <danw@helixcode.com>
* mail-ops.c: (do_fetch_mail): For an imap store, just refresh the
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index e7b93fabc4..22254bacc6 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -44,7 +44,7 @@ BonoboUIVerb verbs [] = {
/* Settings Menu */
BONOBO_UI_UNSAFE_VERB ("SetMailFilter", filter_edit),
- BONOBO_UI_UNSAFE_VERB ("VFolderEdit", vfolder_edit_vfolders),
+ BONOBO_UI_UNSAFE_VERB ("SetVFolder", vfolder_edit_vfolders),
BONOBO_UI_UNSAFE_VERB ("SetMailConfig", providers_config),
BONOBO_UI_UNSAFE_VERB ("SetSubscribe", manage_subscriptions),
BONOBO_UI_UNSAFE_VERB ("SetForgetPwd", forget_passwords),
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index f9d625a22e..2e74aeffd6 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -36,6 +36,7 @@
#include "mail-tools.h"
#include "mail-ops.h"
#include "mail-local.h"
+#include "mail-vfolder.h"
#include "folder-browser.h"
#include "subscribe-dialog.h"
#include "filter/filter-editor.h"
@@ -730,9 +731,7 @@ filter_edit (BonoboUIHandler *uih, void *user_data, const char *path)
void
vfolder_edit_vfolders (BonoboUIHandler *uih, void *user_data, const char *path)
{
- void vfolder_edit(void);
-
- vfolder_edit();
+ vfolder_edit();
}
void