Added remove flag - its not adduri, its removeuri, its less typing than

2001-10-18    <NotZed@Ximian.com>

        * mail-vfolder.c (vfolder_adduri): Added remove flag - its not
        adduri, its removeuri, its less typing than creating a removeuri.
        (vfolder_adduri_do): Implement the remove flag.
        (mail_vfolder_remove_uri): Changed to mail_vfolder_delte_uri, to
        indicate its actually been deleted.
        (mail_vfolder_add_uri): Added remove flag.
        (rule_changed): When adding existing folders to a new rule, strdup
        the list data.

        * mail-folder-cache.c (store_finalised): Unhook from all events
        when done.
        (mail_note_store_remove): Remove a store from being noted.
        (free_folder_info): Also if we have a folder, unhook all events.
        Also remove the uri from vfolders.
        (mail_note_folder): Remove warning about adding folders to stores
        that aren't added yet - we might actually be removing the store.

        * component-factory.c (mail_remove_storage): Call
        mail_note_store_remove when we remove the storage.

svn path=/trunk/; revision=13782

1 files changed, 5 insertions, 6 deletions

diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index f72adc35b4..4dde188a69 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -21,14 +21,13 @@ void vfolder_gui_add_rule (VfolderRule *rule);
 void vfolder_gui_add_from_message (CamelMimeMessage *msg, int flags, const char *source);
 void vfolder_gui_add_from_mlist (CamelMimeMessage *msg, const char *mlist, const char *source);
 
-/* add a uri that is now available to vfolders */
-void mail_vfolder_add_uri(CamelStore *store, const char *uri);
+/* add a uri that is now (un)available to vfolders in a transient manner */
+void mail_vfolder_add_uri(CamelStore *store, const char *uri, int remove);
 
-/* remove a uri that should be removed from vfolders */
-void mail_vfolder_remove_uri(CamelStore *store, const char *uri);
-
-EvolutionStorage *mail_vfolder_get_vfolder_storage (void);
+/* remove a uri that should be removed from vfolders permanently */
+void mail_vfolder_delete_uri(CamelStore *store, const char *uri);
 
+/* close up, clean up */
 void mail_vfolder_shutdown (void);
 
 #endif