aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-callbacks.c
diff options
context:
space:
mode:
authorAnna Marie Dirks <anna@ximian.com>2001-08-16 04:27:26 +0800
committerAnna Dirks <anna@src.gnome.org>2001-08-16 04:27:26 +0800
commit3b25ec8b5e8464405b1f53aea50c5fd821be61d1 (patch)
treef12936e08e70569a8c5c63db45945fbedacba116 /mail/mail-callbacks.c
parentf010bd39cf21bd0bd9d28b16f8141500ddefed8e (diff)
downloadgsoc2013-evolution-3b25ec8b5e8464405b1f53aea50c5fd821be61d1.tar.gz
gsoc2013-evolution-3b25ec8b5e8464405b1f53aea50c5fd821be61d1.tar.zst
gsoc2013-evolution-3b25ec8b5e8464405b1f53aea50c5fd821be61d1.zip
Re-added, at Ettore's request, the confirm-expunge dialog.
2001-08-15 Anna Marie Dirks <anna@ximian.com> * mail-callbacks.c (expunge-folders): Re-added, at Ettore's request, the confirm-expunge dialog. svn path=/trunk/; revision=12071
Diffstat (limited to 'mail/mail-callbacks.c')
-rw-r--r--mail/mail-callbacks.c15
1 files changed, 8 insertions, 7 deletions
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;