Commit 3a61cbb2 authored by Cosimo Cecchi's avatar Cosimo Cecchi

libnautilus-private: don't use deprecated GtkImageMenuItem and GtkStock

parent 4edfee8c
...@@ -171,7 +171,7 @@ apply_warning_emblem (GIcon **base, ...@@ -171,7 +171,7 @@ apply_warning_emblem (GIcon **base,
if (symbolic) { if (symbolic) {
warning = g_themed_icon_new ("dialog-warning-symbolic"); warning = g_themed_icon_new ("dialog-warning-symbolic");
} else { } else {
warning = g_themed_icon_new (GTK_STOCK_DIALOG_WARNING); warning = g_themed_icon_new ("dialog-warning");
} }
emblem = g_emblem_new (warning); emblem = g_emblem_new (warning);
...@@ -762,19 +762,6 @@ nautilus_bookmark_new (GFile *location, ...@@ -762,19 +762,6 @@ nautilus_bookmark_new (GFile *location,
return new_bookmark; return new_bookmark;
} }
static GtkWidget *
create_image_widget_for_bookmark (NautilusBookmark *bookmark)
{
GIcon *icon;
GtkWidget *widget;
icon = nautilus_bookmark_get_symbolic_icon (bookmark);
widget = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
g_object_unref (icon);
return widget;
}
/** /**
* nautilus_bookmark_menu_item_new: * nautilus_bookmark_menu_item_new:
* *
...@@ -786,24 +773,16 @@ GtkWidget * ...@@ -786,24 +773,16 @@ GtkWidget *
nautilus_bookmark_menu_item_new (NautilusBookmark *bookmark) nautilus_bookmark_menu_item_new (NautilusBookmark *bookmark)
{ {
GtkWidget *menu_item; GtkWidget *menu_item;
GtkWidget *image_widget;
GtkLabel *label; GtkLabel *label;
const char *name; const char *name;
name = nautilus_bookmark_get_name (bookmark); name = nautilus_bookmark_get_name (bookmark);
menu_item = gtk_image_menu_item_new_with_label (name); menu_item = gtk_menu_item_new_with_label (name);
label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (menu_item))); label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (menu_item)));
gtk_label_set_use_underline (label, FALSE); gtk_label_set_use_underline (label, FALSE);
gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
gtk_label_set_max_width_chars (label, ELLIPSISED_MENU_ITEM_MIN_CHARS); gtk_label_set_max_width_chars (label, ELLIPSISED_MENU_ITEM_MIN_CHARS);
image_widget = create_image_widget_for_bookmark (bookmark);
if (image_widget != NULL) {
gtk_widget_show (image_widget);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
image_widget);
}
return menu_item; return menu_item;
} }
......
...@@ -354,16 +354,16 @@ target_data_free (TargetCallbackData *target_data) ...@@ -354,16 +354,16 @@ target_data_free (TargetCallbackData *target_data)
} }
static const GtkActionEntry clipboard_entries[] = { static const GtkActionEntry clipboard_entries[] = {
/* name, stock id */ { "Cut", GTK_STOCK_CUT, /* name, stock id */ { "Cut", NULL,
/* label, accelerator */ NULL, NULL, /* label, accelerator */ N_("Cu_t"), NULL,
/* tooltip */ N_("Cut the selected text to the clipboard"), /* tooltip */ N_("Cut the selected text to the clipboard"),
G_CALLBACK (action_cut_callback) }, G_CALLBACK (action_cut_callback) },
/* name, stock id */ { "Copy", GTK_STOCK_COPY, /* name, stock id */ { "Copy", NULL,
/* label, accelerator */ NULL, NULL, /* label, accelerator */ N_("_Copy"), NULL,
/* tooltip */ N_("Copy the selected text to the clipboard"), /* tooltip */ N_("Copy the selected text to the clipboard"),
G_CALLBACK (action_copy_callback) }, G_CALLBACK (action_copy_callback) },
/* name, stock id */ { "Paste", GTK_STOCK_PASTE, /* name, stock id */ { "Paste", NULL,
/* label, accelerator */ NULL, NULL, /* label, accelerator */ N_("_Paste"), NULL,
/* tooltip */ N_("Paste the text stored on the clipboard"), /* tooltip */ N_("Paste the text stored on the clipboard"),
G_CALLBACK (action_paste_callback) }, G_CALLBACK (action_paste_callback) },
/* name, stock id */ { "Select All", NULL, /* name, stock id */ { "Select All", NULL,
......
...@@ -363,20 +363,6 @@ use_default_clicked_callback (GtkWidget *button, gpointer user_data) ...@@ -363,20 +363,6 @@ use_default_clicked_callback (GtkWidget *button, gpointer user_data)
signals[USE_DEFAULT], 0); signals[USE_DEFAULT], 0);
} }
static GtkWidget *
button_new_with_mnemonic (const gchar *stockid, const gchar *str)
{
GtkWidget *image;
GtkWidget *button;
button = gtk_button_new_with_mnemonic (str);
image = gtk_image_new_from_stock (stockid, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), image);
return button;
}
static void static void
add_buttons (NautilusColumnChooser *chooser) add_buttons (NautilusColumnChooser *chooser)
{ {
...@@ -386,8 +372,7 @@ add_buttons (NautilusColumnChooser *chooser) ...@@ -386,8 +372,7 @@ add_buttons (NautilusColumnChooser *chooser)
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (box); gtk_widget_show (box);
chooser->details->move_up_button = button_new_with_mnemonic (GTK_STOCK_GO_UP, chooser->details->move_up_button = gtk_button_new_with_mnemonic (_("Move _Up"));
_("Move _Up"));
g_signal_connect (chooser->details->move_up_button, g_signal_connect (chooser->details->move_up_button,
"clicked", G_CALLBACK (move_up_clicked_callback), "clicked", G_CALLBACK (move_up_clicked_callback),
chooser); chooser);
...@@ -396,8 +381,7 @@ add_buttons (NautilusColumnChooser *chooser) ...@@ -396,8 +381,7 @@ add_buttons (NautilusColumnChooser *chooser)
gtk_box_pack_start (GTK_BOX (box), chooser->details->move_up_button, gtk_box_pack_start (GTK_BOX (box), chooser->details->move_up_button,
FALSE, FALSE, 0); FALSE, FALSE, 0);
chooser->details->move_down_button = button_new_with_mnemonic (GTK_STOCK_GO_DOWN, chooser->details->move_down_button = gtk_button_new_with_mnemonic (_("Move Dow_n"));
_("Move Dow_n"));
g_signal_connect (chooser->details->move_down_button, g_signal_connect (chooser->details->move_down_button,
"clicked", G_CALLBACK (move_down_clicked_callback), "clicked", G_CALLBACK (move_down_clicked_callback),
chooser); chooser);
......
...@@ -98,7 +98,7 @@ volume_delete_dialog (GtkWidget *parent_view, ...@@ -98,7 +98,7 @@ volume_delete_dialog (GtkWidget *parent_view,
dialog_str, dialog_str,
_("If you want to eject the volume, please use Eject in the " _("If you want to eject the volume, please use Eject in the "
"popup menu of the volume."), "popup menu of the volume."),
GTK_STOCK_OK, NULL); _("_OK"), NULL);
} else { } else {
eel_run_simple_dialog eel_run_simple_dialog
(parent_view, (parent_view,
...@@ -107,7 +107,7 @@ volume_delete_dialog (GtkWidget *parent_view, ...@@ -107,7 +107,7 @@ volume_delete_dialog (GtkWidget *parent_view,
dialog_str, dialog_str,
_("If you want to unmount the volume, please use Unmount Volume in the " _("If you want to unmount the volume, please use Unmount Volume in the "
"popup menu of the volume."), "popup menu of the volume."),
GTK_STOCK_OK, NULL); _("_OK"), NULL);
} }
g_object_unref (mount); g_object_unref (mount);
......
...@@ -476,8 +476,8 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) ...@@ -476,8 +476,8 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
/* Setup the dialog image */ /* Setup the dialog image */
widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, widget = gtk_image_new_from_icon_name ("dialog-warning",
GTK_ICON_SIZE_DIALOG); GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (widget), 0.5, 0.0); gtk_misc_set_alignment (GTK_MISC (widget), 0.5, 0.0);
...@@ -522,8 +522,8 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) ...@@ -522,8 +522,8 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
widget = gtk_button_new_with_label (_("Reset")); widget = gtk_button_new_with_label (_("Reset"));
gtk_button_set_image (GTK_BUTTON (widget), gtk_button_set_image (GTK_BUTTON (widget),
gtk_image_new_from_stock (GTK_STOCK_UNDO, gtk_image_new_from_icon_name ("edit-undo",
GTK_ICON_SIZE_MENU)); GTK_ICON_SIZE_MENU));
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 6); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 6);
g_signal_connect (widget, "clicked", g_signal_connect (widget, "clicked",
G_CALLBACK (reset_button_clicked_cb), dialog); G_CALLBACK (reset_button_clicked_cb), dialog);
...@@ -541,7 +541,7 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) ...@@ -541,7 +541,7 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
/* Add buttons */ /* Add buttons */
gtk_dialog_add_buttons (dialog, gtk_dialog_add_buttons (dialog,
GTK_STOCK_CANCEL, _("_Cancel"),
GTK_RESPONSE_CANCEL, GTK_RESPONSE_CANCEL,
_("_Skip"), _("_Skip"),
CONFLICT_RESPONSE_SKIP, CONFLICT_RESPONSE_SKIP,
......
...@@ -182,9 +182,11 @@ typedef struct { ...@@ -182,9 +182,11 @@ typedef struct {
#define IS_IO_ERROR(__error, KIND) (((__error)->domain == G_IO_ERROR && (__error)->code == G_IO_ERROR_ ## KIND)) #define IS_IO_ERROR(__error, KIND) (((__error)->domain == G_IO_ERROR && (__error)->code == G_IO_ERROR_ ## KIND))
#define CANCEL _("_Cancel")
#define SKIP _("_Skip") #define SKIP _("_Skip")
#define SKIP_ALL _("S_kip All") #define SKIP_ALL _("S_kip All")
#define RETRY _("_Retry") #define RETRY _("_Retry")
#define DELETE _("_Delete")
#define DELETE_ALL _("Delete _All") #define DELETE_ALL _("Delete _All")
#define REPLACE _("_Replace") #define REPLACE _("_Replace")
#define REPLACE_ALL _("Replace _All") #define REPLACE_ALL _("Replace _All")
...@@ -1336,7 +1338,7 @@ confirm_delete_from_trash (CommonJob *job, ...@@ -1336,7 +1338,7 @@ confirm_delete_from_trash (CommonJob *job,
f (_("If you delete an item, it will be permanently lost.")), f (_("If you delete an item, it will be permanently lost.")),
NULL, NULL,
FALSE, FALSE,
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, CANCEL, DELETE,
NULL); NULL);
return (response == 1); return (response == 1);
...@@ -1360,7 +1362,7 @@ confirm_empty_trash (CommonJob *job) ...@@ -1360,7 +1362,7 @@ confirm_empty_trash (CommonJob *job)
f(_("All items in the Trash will be permanently deleted.")), f(_("All items in the Trash will be permanently deleted.")),
NULL, NULL,
FALSE, FALSE,
GTK_STOCK_CANCEL, _("Empty _Trash"), CANCEL, _("Empty _Trash"),
NULL); NULL);
return (response == 1); return (response == 1);
...@@ -1402,7 +1404,7 @@ confirm_delete_directly (CommonJob *job, ...@@ -1402,7 +1404,7 @@ confirm_delete_directly (CommonJob *job,
f (_("If you delete an item, it will be permanently lost.")), f (_("If you delete an item, it will be permanently lost.")),
NULL, NULL,
FALSE, FALSE,
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, CANCEL, DELETE,
NULL); NULL);
return response == 1; return response == 1;
...@@ -1536,7 +1538,7 @@ delete_dir (CommonJob *job, GFile *dir, ...@@ -1536,7 +1538,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, _("_Skip files"), CANCEL, _("_Skip files"),
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -1569,7 +1571,7 @@ delete_dir (CommonJob *job, GFile *dir, ...@@ -1569,7 +1571,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, SKIP, RETRY, CANCEL, SKIP, RETRY,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -1602,7 +1604,7 @@ delete_dir (CommonJob *job, GFile *dir, ...@@ -1602,7 +1604,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary, secondary,
details, details,
(source_info->num_files - transfer_info->num_files) > 1, (source_info->num_files - transfer_info->num_files) > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -1679,7 +1681,7 @@ delete_file (CommonJob *job, GFile *file, ...@@ -1679,7 +1681,7 @@ delete_file (CommonJob *job, GFile *file,
secondary, secondary,
details, details,
(source_info->num_files - transfer_info->num_files) > 1, (source_info->num_files - transfer_info->num_files) > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -1819,7 +1821,7 @@ trash_files (CommonJob *job, GList *files, int *files_skipped) ...@@ -1819,7 +1821,7 @@ trash_files (CommonJob *job, GList *files, int *files_skipped)
secondary, secondary,
details, details,
(total_files - files_trashed) > 1, (total_files - files_trashed) > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, DELETE_ALL, GTK_STOCK_DELETE, CANCEL, SKIP_ALL, SKIP, DELETE_ALL, DELETE,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -2237,7 +2239,7 @@ prompt_empty_trash (GtkWindow *parent_window) ...@@ -2237,7 +2239,7 @@ prompt_empty_trash (GtkWindow *parent_window)
"will be permanently lost.")); "will be permanently lost."));
gtk_dialog_add_buttons (GTK_DIALOG (dialog), gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Do _not Empty Trash"), GTK_RESPONSE_REJECT, _("Do _not Empty Trash"), GTK_RESPONSE_REJECT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, CANCEL, GTK_RESPONSE_CANCEL,
_("Empty _Trash"), GTK_RESPONSE_ACCEPT, NULL); _("Empty _Trash"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
gtk_window_set_title (GTK_WINDOW (dialog), ""); /* as per HIG */ gtk_window_set_title (GTK_WINDOW (dialog), ""); /* as per HIG */
...@@ -2566,7 +2568,7 @@ scan_dir (GFile *dir, ...@@ -2566,7 +2568,7 @@ scan_dir (GFile *dir,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, RETRY, SKIP, CANCEL, RETRY, SKIP,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -2607,7 +2609,7 @@ scan_dir (GFile *dir, ...@@ -2607,7 +2609,7 @@ scan_dir (GFile *dir,
secondary, secondary,
details, details,
TRUE, TRUE,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, RETRY, CANCEL, SKIP_ALL, SKIP, RETRY,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -2684,7 +2686,7 @@ scan_file (GFile *file, ...@@ -2684,7 +2686,7 @@ scan_file (GFile *file,
secondary, secondary,
details, details,
TRUE, TRUE,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, RETRY, CANCEL, SKIP_ALL, SKIP, RETRY,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -2790,7 +2792,7 @@ verify_destination (CommonJob *job, ...@@ -2790,7 +2792,7 @@ verify_destination (CommonJob *job,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, RETRY, CANCEL, RETRY,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -2831,7 +2833,7 @@ verify_destination (CommonJob *job, ...@@ -2831,7 +2833,7 @@ verify_destination (CommonJob *job,
secondary, secondary,
NULL, NULL,
FALSE, FALSE,
GTK_STOCK_CANCEL, CANCEL,
NULL); NULL);
abort_job (job); abort_job (job);
...@@ -2872,7 +2874,7 @@ verify_destination (CommonJob *job, ...@@ -2872,7 +2874,7 @@ verify_destination (CommonJob *job,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, CANCEL,
COPY_FORCE, COPY_FORCE,
RETRY, RETRY,
NULL); NULL);
...@@ -2900,7 +2902,7 @@ verify_destination (CommonJob *job, ...@@ -2900,7 +2902,7 @@ verify_destination (CommonJob *job,
secondary, secondary,
NULL, NULL,
FALSE, FALSE,
GTK_STOCK_CANCEL, CANCEL,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -3443,7 +3445,7 @@ create_dest_dir (CommonJob *job, ...@@ -3443,7 +3445,7 @@ create_dest_dir (CommonJob *job,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, SKIP, RETRY, CANCEL, SKIP, RETRY,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -3576,7 +3578,7 @@ copy_move_directory (CopyMoveJob *copy_job, ...@@ -3576,7 +3578,7 @@ copy_move_directory (CopyMoveJob *copy_job,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, _("_Skip files"), CANCEL, _("_Skip files"),
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -3621,7 +3623,7 @@ copy_move_directory (CopyMoveJob *copy_job, ...@@ -3621,7 +3623,7 @@ copy_move_directory (CopyMoveJob *copy_job,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, SKIP, RETRY, CANCEL, SKIP, RETRY,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -3663,7 +3665,7 @@ copy_move_directory (CopyMoveJob *copy_job, ...@@ -3663,7 +3665,7 @@ copy_move_directory (CopyMoveJob *copy_job,
secondary, secondary,
details, details,
(source_info->num_files - transfer_info->num_files) > 1, (source_info->num_files - transfer_info->num_files) > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -3752,7 +3754,7 @@ remove_target_recursively (CommonJob *job, ...@@ -3752,7 +3754,7 @@ remove_target_recursively (CommonJob *job,
secondary, secondary,
details, details,
TRUE, TRUE,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -3793,7 +3795,7 @@ remove_target_recursively (CommonJob *job, ...@@ -3793,7 +3795,7 @@ remove_target_recursively (CommonJob *job,
secondary, secondary,
details, details,
TRUE, TRUE,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -4111,7 +4113,7 @@ copy_move_file (CopyMoveJob *copy_job, ...@@ -4111,7 +4113,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary, secondary,
NULL, NULL,
(source_info->num_files - transfer_info->num_files) > 1, (source_info->num_files - transfer_info->num_files) > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -4144,7 +4146,7 @@ copy_move_file (CopyMoveJob *copy_job, ...@@ -4144,7 +4146,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary, secondary,
NULL, NULL,
(source_info->num_files - transfer_info->num_files) > 1, (source_info->num_files - transfer_info->num_files) > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -4362,7 +4364,7 @@ copy_move_file (CopyMoveJob *copy_job, ...@@ -4362,7 +4364,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary, secondary,
details, details,
TRUE, TRUE,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -4429,7 +4431,7 @@ copy_move_file (CopyMoveJob *copy_job, ...@@ -4429,7 +4431,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary, secondary,
details, details,
(source_info->num_files - transfer_info->num_files) > 1, (source_info->num_files - transfer_info->num_files) > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -4814,7 +4816,7 @@ move_file_prepare (CopyMoveJob *move_job, ...@@ -4814,7 +4816,7 @@ move_file_prepare (CopyMoveJob *move_job,
secondary, secondary,
NULL, NULL,
files_left > 1, files_left > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
...@@ -4971,7 +4973,7 @@ move_file_prepare (CopyMoveJob *move_job, ...@@ -4971,7 +4973,7 @@ move_file_prepare (CopyMoveJob *move_job,
secondary, secondary,
details, details,
files_left > 1, files_left > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -5416,7 +5418,7 @@ link_file (CopyMoveJob *job, ...@@ -5416,7 +5418,7 @@ link_file (CopyMoveJob *job,
secondary, secondary,
details, details,
files_left > 1, files_left > 1,
GTK_STOCK_CANCEL, SKIP_ALL, SKIP, CANCEL, SKIP_ALL, SKIP,
NULL); NULL);
if (error) { if (error) {
...@@ -6193,7 +6195,7 @@ create_job (GIOSchedulerJob *io_job, ...@@ -6193,7 +6195,7 @@ create_job (GIOSchedulerJob *io_job,
secondary, secondary,
details, details,
FALSE, FALSE,
GTK_STOCK_CANCEL, SKIP, CANCEL, SKIP,
NULL); NULL);
g_error_free (error); g_error_free (error);
...@@ -6506,7 +6508,7 @@ mark_desktop_file_trusted (CommonJob *common, ...@@ -6506,7 +6508,7 @@ mark_desktop_file_trusted (CommonJob *common,
error->message, error->message,
NULL, NULL,
FALSE, FALSE,
GTK_STOCK_CANCEL, RETRY, CANCEL, RETRY,
NULL); NULL);
} else { } else {
response = 0; response = 0;
...@@ -6547,7 +6549,7 @@ mark_desktop_file_trusted (CommonJob *common, ...@@ -6547,7 +6549,7 @@ mark_desktop_file_trusted (CommonJob *common,
error->message, error->message,
NULL, NULL,
FALSE, FALSE,
GTK_STOCK_CANCEL, RETRY, CANCEL, RETRY,
NULL); NULL);
} else { } else {
response = 0; response = 0;
...@@ -6582,7 +6584,7 @@ mark_desktop_file_trusted (CommonJob *common, ...@@ -6582,7 +6584,7 @@ mark_desktop_file_trusted (CommonJob *common,
error->message, error->message,
NULL, NULL,
FALSE,