callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified to not use EStorage* functions. I don't even think it *needs* to

Browse Source 
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
This commit is contained in:
Jeffrey Stedfast
2003-11-13 19:43:50 +00:00
committed by Jeffrey Stedfast
parent 79b40b20dd
commit 1627a08174
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mail/ChangeLog
View File

@ -1,5 +1,10 @@
2003-11-13 Jeffrey Stedfast <fejj@ximian.com> 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.
* em-folder-tree.[c,h]: New folder-tree widget that replaces the * em-folder-tree.[c,h]: New folder-tree widget that replaces the
shell's folder-tree widget. shell's folder-tree widget.

6
mail/mail-component.c
View File

@ -676,6 +676,12 @@ mail_component_storages_foreach (MailComponent *component, GHFunc func, void *us
} }
void
mail_component_remove_folder (MailComponent *component, CamelStore *store, const char *path)
{
/* FIXME: implement me */
}
EMFolderTreeModel * EMFolderTreeModel *
mail_component_get_tree_model (MailComponent *component) mail_component_get_tree_model (MailComponent *component)
{ {

2
mail/mail-component.h
View File

@ -82,6 +82,8 @@ void mail_component_storages_foreach (MailComponent *component,
GHFunc func, GHFunc func,
void *data); void *data);
void mail_component_remove_folder (MailComponent *component, CamelStore *store, const char *path);
EMFolderTreeModel *mail_component_get_tree_model (MailComponent *component); EMFolderTreeModel *mail_component_get_tree_model (MailComponent *component);
char *em_uri_from_camel (const char *curi); char *em_uri_from_camel (const char *curi);

9
mail/mail-vfolder.c
View File

@ -29,7 +29,6 @@
#include <libgnome/gnome-i18n.h> #include <libgnome/gnome-i18n.h>
#include "Evolution.h" #include "Evolution.h"
#include "evolution-storage.h"
#include "evolution-shell-component.h" #include "evolution-shell-component.h"
#include "mail-component.h" #include "mail-component.h"
@ -646,11 +645,11 @@ static void context_rule_removed(RuleContext *ctx, FilterRule *rule)
/* TODO: remove from folder info cache? */ /* 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); path = g_strdup_printf("/%s", rule->name);
mail_component_remove_folder (mail_component_peek (), vfolder_store, path);
/* EPFIXME This leaks, the original code was broken too. */
e_storage_removed_folder (mail_component_lookup_storage (mail_component_peek (), vfolder_store), path);
g_free(path); g_free(path);
LOCK(); LOCK();