aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-vfolder.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-11-14 03:43:50 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-11-14 03:43:50 +0800
commit1627a081744129fbf8f874c290b9a18138655590 (patch)
tree9bfa5a3054208b114ab5879bb8044884883e47c0 /mail/mail-vfolder.c
parent79b40b20dd8710bc0aed4c5bdf5accb062436d9b (diff)
downloadgsoc2013-evolution-1627a081744129fbf8f874c290b9a18138655590.tar
gsoc2013-evolution-1627a081744129fbf8f874c290b9a18138655590.tar.gz
gsoc2013-evolution-1627a081744129fbf8f874c290b9a18138655590.tar.bz2
gsoc2013-evolution-1627a081744129fbf8f874c290b9a18138655590.tar.lz
gsoc2013-evolution-1627a081744129fbf8f874c290b9a18138655590.tar.xz
gsoc2013-evolution-1627a081744129fbf8f874c290b9a18138655590.tar.zst
gsoc2013-evolution-1627a081744129fbf8f874c290b9a18138655590.zip
Modified to not use EStorage* functions. I don't even think it *needs* to
2003-11-13 Jeffrey Stedfast <fejj@ximian.com> * mail-vfolder.c (context_rule_removed): Modified to not use EStorage* functions. I don't even think it *needs* to remove the folder from the mail-component, the mail-component should just pick it up automagically via CamelStore events. svn path=/trunk/; revision=23333
Diffstat (limited to 'mail/mail-vfolder.c')
-rw-r--r--mail/mail-vfolder.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 2bb08a587e..b8161d7e59 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -29,7 +29,6 @@
#include <libgnome/gnome-i18n.h>
#include "Evolution.h"
-#include "evolution-storage.h"
#include "evolution-shell-component.h"
#include "mail-component.h"
@@ -645,14 +644,14 @@ static void context_rule_removed(RuleContext *ctx, FilterRule *rule)
d(printf("rule removed; %s\n", rule->name));
/* TODO: remove from folder info cache? */
-
+
+ /* FIXME: is this even necessary? if we remove the folder from
+ * the CamelStore, the tree should pick it up auto-magically
+ * because it listens to CamelStore events... */
path = g_strdup_printf("/%s", rule->name);
-
- /* EPFIXME This leaks, the original code was broken too. */
- e_storage_removed_folder (mail_component_lookup_storage (mail_component_peek (), vfolder_store), path);
-
+ mail_component_remove_folder (mail_component_peek (), vfolder_store, path);
g_free(path);
-
+
LOCK();
if (g_hash_table_lookup_extended(vfolder_hash, rule->name, (void **)&key, (void **)&folder)) {
g_hash_table_remove(vfolder_hash, key);