aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-folder-commands.c36
2 files changed, 19 insertions, 22 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index e51a624f25..d61a3f5907 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2002-05-23 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-folder-commands.c (delete_dialog): Make a little bit
+ prettier. Default to "Delete", not "Cancel".
+
+2002-05-23 Ettore Perazzoli <ettore@ximian.com>
+
* e-shortcuts-view.c (rename_group_cb): Set the view type from the
original group, thus preserving the small-icon/large-icon state.
Fixes #6732.
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index aee1d459e3..a9a8c9bc51 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -396,38 +396,30 @@ delete_cb (EStorageSet *storage_set,
static int
delete_dialog (EShellView *shell_view, const char *utf8_folder)
{
- GnomeDialog *dialog;
+ GtkWidget *dialog;
char *title;
- GtkWidget *question_label;
char *question;
char *folder_name;
- /* Popup a dialog asking if they are sure they want to delete
- the folder */
- folder_name = e_utf8_to_gtk_string (GTK_WIDGET (shell_view),
- (char *)utf8_folder);
- title = g_strdup_printf (_("Delete \"%s\""), folder_name);
+ folder_name = e_utf8_to_gtk_string (GTK_WIDGET (shell_view), (char *) utf8_folder);
- dialog = GNOME_DIALOG (gnome_dialog_new (title,
- GNOME_STOCK_BUTTON_YES,
- GNOME_STOCK_BUTTON_NO,
- NULL));
- g_free (title);
- gnome_dialog_set_parent (dialog, GTK_WINDOW (shell_view));
+ title = g_strdup_printf (_("Delete \"%s\""), folder_name);
+ question = g_strdup_printf (_("Really delete folder \"%s\"?"), folder_name);
- /* "Are you sure..." label */
- question = g_strdup_printf (_("Are you sure you want to remove the \"%s\" folder?"),
- folder_name);
- question_label = gtk_label_new (question);
- gtk_widget_show (question_label);
+ dialog = gnome_message_box_new (question,
+ GNOME_MESSAGE_BOX_QUESTION,
+ _("Delete"),
+ GNOME_STOCK_BUTTON_CANCEL,
+ NULL);
+ gtk_window_set_title (GTK_WINDOW (dialog), title);
+ gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (shell_view));
+ gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
- gtk_box_pack_start (GTK_BOX (dialog->vbox), question_label, FALSE, TRUE, 2);
+ g_free (title);
g_free (folder_name);
g_free (question);
- gnome_dialog_set_default (dialog, 1);
-
- return gnome_dialog_run_and_close (dialog);
+ return gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
}
void