aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog116
-rw-r--r--mail/mail-callbacks.c15
2 files changed, 123 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0bd115e58d..a6e73118d1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,8 +1,13 @@
+2001-08-15 Anna Marie Dirks <anna@ximian.com>
+
+ * mail-callbacks.c (expunge-folders): Re-added, at Ettore's
+ request, the confirm-expunge dialog.
+
2001-08-15 Jason Leach <jleach@ximian.com>
* message-list.c (message_list_init): Use ALWAYS for scroll frame
policy because ETable acts lame with AUTOMATIC. Bug #6925.
-
+
2001-08-16 Not Zed <NotZed@Ximian.com>
* mail-callbacks.c (expunge_folder): Don't confirm expunge.
@@ -146,6 +151,115 @@
(mail_config_remove_account): When deleting the account, remove
its shortcuts.
+<<<<<<< ChangeLog
+2001-08-10 Peter Williams <peterw@ximian.com>
+
+ * mail-config-druid.c (druid_finish): Whoa, fatal typo. Sorry.
+
+2001-08-13 Jason Leach <jleach@ximian.com>
+
+ * mail-local.c (init_trash): Tell folder cache the path for our
+ Trash is /Trash, because that's what Shell needs to hear for
+ updating folders.
+
+2001-08-11 Jason Leach <jleach@ximian.com>
+
+ * mail-offline-handler.c (impl_goOnline): Set the session as
+ online so auto mail checking (and the composer) will be doing the
+ right things when you go online. Bug #6343 and #4601.
+
+ * folder-browser.c: Make the right click "Resend..." into "Edit as
+ New Message...", bug #6838.
+
+ * mail-accounts.h: Remove unecessary #include <camel.h>
+
+ * mail.h: Removed a prototype for a non-existant
+ mail_view_create().
+
+2001-08-10 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-account-gui.c (build_auth_menu): Fix bug #4523 for good.
+ (save_service): If service->authitem is NULL, then the user tried
+ to enable authentication but the provider doesn't actually support
+ it.
+
+2001-08-10 Jon Trowbridge <trow@ximian.com>
+
+ * folder-browser.c: Set our ESearchBarItems subitems to NULL.
+
+2001-08-10 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-callbacks.c (transfer_msg): Prepend the uri with evolution:
+ to fix bug #6916.
+
+2001-08-10 Jason Leach <jleach@ximian.com>
+
+ * folder-browser.c: Make the context menu for the Sent folder have
+ "Resend..." instead of "Resend", to clarify that it will bring up
+ a dialog needing your input rather than just blindly sending the
+ message again. Also give it the 'e' accelerator. Bug #6838.
+
+ * mail-callbacks.c (next_unread_msg): Since 'N' keypresses go
+ through here now, use wrap-around selecting.
+ (previous_unread_msg): Same for 'P' here.
+
+ * message-list.c (on_cursor_activated_idle): Stop this idle timer
+ when we have multiple items selected, this keeps it from loading
+ and then marking the last item in your selection list as read.
+ Bug #4693.
+
+2001-08-10 Peter Williams <peterw@ximian.com>
+
+ * mail-accounts.c (mail_delete): Don't remove the account from the
+ tree if it's not enabled.
+
+2001-08-10 Jason Leach <jleach@ximian.com>
+
+ * mail-ops.c (remove_folder_get): Remove all the messages from a
+ folder that's being deleted before actually doing the
+ camel_store_delete_folder, so it won't leave behind an mbox file
+ that's going to prevent the actual directory from being deleted,
+ and strange effects like new folders with the same name being made
+ in it's place. Bug #5618.
+
+ * mail-folder-cache.c (mail_folder_cache_remove_folder): New
+ function, a way to get something out of the folder cache, like
+ folders being deleted. Bug #6878.
+
+2001-08-10 Peter Williams <peterw@ximian.com>
+
+ * mail-accounts.c (news_add_destroyed): Whoops, compile fix.
+
+2001-08-10 Jason Leach <jleach@ximian.com>
+
+ * mail-callbacks.c (mark_as_unseen): If marking messages as
+ unread, remove the automatic mark-as-read timer. Bug #4153.
+
+2001-08-08 Peter Williams <peterw@ximian.com>
+
+ * component-factory.c (mail_load_storages): Don't load the storage
+ if it isn't enabled.
+ (mail_remove_storage_by_uri): New function. Goes through the
+ gymnastics of getting a CamelStore from the URI and calling
+ mail_remove_storage. Copied from mail_delete().
+ (mail_load_storage_by_uri): Break out the storage-loading part of
+ mail_load_storages into a single function.
+ (mail_load_storages): Just call mail_load_storage_by_uri several
+ times.
+
+ * mail.h: Prototype our new _by_uri functions.
+
+ * mail-accounts.c (news_add_destroyed): Instead of hacking around
+ mail_load_storages, call mail_load_storage_by_uri.
+ (mail_delete): Move this chunk of code into
+ mail_remove_storage_by_uri.
+ (mail_able): Add or remove the storage as necessary, with our
+ new _by_uri functions.
+
+ * mail-config-druid.c (druid_finish): See news_add_destroyed above.
+
+=======
+>>>>>>> 1.1561
2001-08-10 Jeffrey Stedfast <fejj@ximian.com>
* mail-config.c (mail_config_get_show_preview): Free dbkey if we
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 74e89177dd..f84f28332d 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1638,7 +1638,7 @@ previous_unread_msg (GtkWidget *button, gpointer user_data)
row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree));
message_list_select (fb->message_list, row,
MESSAGE_LIST_SELECT_PREVIOUS,
- 0, CAMEL_MESSAGE_SEEN, TRUE);
+ 0, CAMEL_MESSAGE_SEEN, FALSE);
}
void
@@ -1676,16 +1676,17 @@ confirm_expunge (void)
GtkWidget *dialog, *label;
int button;
- dialog = gnome_dialog_new (_("Are you sure?"),
+ dialog = gnome_dialog_new (_("Warning"),
GNOME_STOCK_BUTTON_YES,
GNOME_STOCK_BUTTON_NO,
NULL);
- label = gtk_label_new (_("You are about to expunge a folder. This will\n"
- "permantly remove all messages with a \"deleted\"\n"
- "flag from both this folder and the Trash folder.\n\n"
- "Are you sure you want to continue?"));
+ gtk_widget_set_usize (GTK_WIDGET (dialog), 323, 180);
+
+ label = gtk_label_new (_("This operation will permanently erase all messages marked as deleted. If you continue, you will not be able to recover these messages. \n \n Really erase these messages? "));
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 4);
@@ -1702,7 +1703,7 @@ expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path)
{
FolderBrowser *fb = FOLDER_BROWSER (user_data);
- if (fb->folder && (fb->expunging == NULL || fb->folder != fb->expunging)) {
+ if (fb->folder && (fb->expunging == NULL || fb->folder != fb->expunging) && confirm_expunge ()) {
struct _expunged_folder_data *data;
CamelMessageInfo *info;