diff options
| -rw-r--r-- | mail/ChangeLog | 16 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 1 | ||||
| -rw-r--r-- | mail/folder-browser-ui.c | 3 | ||||
| -rw-r--r-- | mail/folder-browser.c | 3 | ||||
| -rw-r--r-- | mail/mail-local.c | 8 | ||||
| -rw-r--r-- | mail/message-list.c | 10 |
6 files changed, 23 insertions, 18 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4152eb562f..b7f3190e21 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,17 @@ +2001-10-08 Dan Winship <danw@ximian.com> + + * mail-local.c (mlf_set_folder, mlf_unset_folder): Update for + folder_flags. + + * folder-browser-ui.c (folder_browser_ui_add_list): Check + CAMEL_FOLDER_IS_TRASH flag rather than checking + CAMEL_IS_VTRASH_FOLDER. + + * folder-browser.c (folder_browser_toggle_hide_deleted): Likewise + + * message-list.c (message_list_set_folder): Likewise. + (message_list_set_hidedeleted): Remove redundant trash check. + 2001-10-08 Jon Trowbridge <trow@gnu.org> * mail-format.c (write_default_header): Write out the Bcc: header @@ -8,7 +22,7 @@ * mail-format.c (attachment_header): Convert the htmlinfo into utf8. Fixes bug #11966. -2001-10-08 Dan Winship <danw@frotz.mysterion.org> +2001-10-08 Dan Winship <danw@ximian.com> * component-factory.c (create_view): For mailstorage folders, connect to the control's "activate" signal, and don't try to diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index e0f808f149..86a51a0d59 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -40,7 +40,6 @@ #include "mail-folder-cache.h" #include "evolution-shell-component-utils.h" -#include "camel/camel-vtrash-folder.h" /* The FolderBrowser BonoboControls we have. */ static EList *control_list = NULL; diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index 2229c240b4..48cfc2169a 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -28,7 +28,6 @@ #include "folder-browser-ui.h" #include "evolution-shell-component-utils.h" /* Pixmap stuff */ -#include "camel/camel-vtrash-folder.h" /* vtrash checking */ /* * Add with 'folder_browser' @@ -344,7 +343,7 @@ folder_browser_ui_add_list (FolderBrowser *fb) ui_add (fb, "list", list_verbs, list_pixcache); /* Hide Deleted */ - if (fb->folder && CAMEL_IS_VTRASH_FOLDER (fb->folder)) { + if (fb->folder && (fb->folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) { bonobo_ui_component_set_prop (uic, "/commands/HideDeleted", "sensitive", "0", NULL); state = FALSE; } else { diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 9efe6df832..c435b3c281 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -53,7 +53,6 @@ #include "mail-local.h" #include "mail-config.h" -#include <camel/camel-vtrash-folder.h> #include <camel/camel-mime-message.h> #include <camel/camel-stream-mem.h> @@ -1141,7 +1140,7 @@ folder_browser_toggle_hide_deleted (BonoboUIComponent *component, if (type != Bonobo_UIComponent_STATE_CHANGED) return; - if (!(fb->folder && CAMEL_IS_VTRASH_FOLDER(fb->folder))) + if (!(fb->folder && (fb->folder->folder_flags & CAMEL_FOLDER_IS_TRASH))) mail_config_set_hide_deleted (atoi (state)); message_list_set_hidedeleted (fb->message_list, atoi (state)); } diff --git a/mail/mail-local.c b/mail/mail-local.c index 6f1c92f2a8..2661572c4a 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -422,8 +422,7 @@ mlf_unset_folder (MailLocalFolder *mlf) mlf->real_store = NULL; folder->permanent_flags = 0; - folder->has_summary_capability = 0; - folder->has_search_capability = 0; + folder->folder_flags = 0; } static gboolean @@ -448,14 +447,13 @@ mlf_set_folder(MailLocalFolder *mlf, guint32 flags, CamelException *ex) if (mlf->real_folder == NULL) return FALSE; - if (mlf->real_folder->has_summary_capability) { + if (mlf->real_folder->folder_flags & CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY) { folder->summary = mlf->real_folder->summary; camel_object_ref((CamelObject *)mlf->real_folder->summary); } folder->permanent_flags = mlf->real_folder->permanent_flags; - folder->has_summary_capability = mlf->real_folder->has_summary_capability; - folder->has_search_capability = mlf->real_folder->has_search_capability; + folder->folder_flags = mlf->real_folder->folder_flags; camel_object_hook_event((CamelObject *)mlf->real_folder, "message_changed", mlf_proxy_message_changed, mlf); camel_object_hook_event((CamelObject *)mlf->real_folder, "folder_changed", mlf_proxy_folder_changed, mlf); diff --git a/mail/message-list.c b/mail/message-list.c index 695e1b7f17..fdb6e912c7 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -34,7 +34,6 @@ #include <camel/camel-file-utils.h> #include <camel/camel-folder.h> #include <camel/camel-folder-thread.h> -#include <camel/camel-vtrash-folder.h> #include <e-util/ename/e-name-western.h> #include <e-util/e-memory.h> @@ -1937,8 +1936,8 @@ message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, g } if (camel_folder) { - /* Setup the strikeout effect for non-vtrash folders */ - if (!CAMEL_IS_VTRASH_FOLDER (camel_folder)) { + /* Setup the strikeout effect for non-trash folders */ + if (!(camel_folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) { ECell *cell; cell = e_table_extras_get_cell (message_list->extras, "render_date"); @@ -1968,7 +1967,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, g camel_object_ref (CAMEL_OBJECT (camel_folder)); message_list->hidedeleted = mail_config_get_hide_deleted () && - !(CAMEL_IS_VTRASH_FOLDER (camel_folder)); + !(camel_folder->folder_flags & CAMEL_FOLDER_IS_TRASH); hide_load_state (message_list); mail_regen_list (message_list, message_list->search, NULL, NULL); @@ -2106,9 +2105,6 @@ message_list_set_threaded (MessageList *ml, gboolean threaded) void message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted) { - if (ml->folder && CAMEL_IS_VTRASH_FOLDER (ml->folder)) - hidedeleted = FALSE; - if (ml->hidedeleted != hidedeleted) { ml->hidedeleted = hidedeleted; |