From f0ab0d4cb1495b94d8a69ce85ce25c1df280fbb5 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Tue, 27 Feb 2018 21:35:53 +0100 Subject: avoid eel_run_simple_dialog with stock ids --- eel/eel-stock-dialogs.c | 7 ++++++- libcaja-private/caja-mime-actions.c | 2 +- src/caja-location-bar.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c index 752fbebb..e2bf9477 100644 --- a/eel/eel-stock-dialogs.c +++ b/eel/eel-stock-dialogs.c @@ -385,7 +385,12 @@ eel_run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box, { break; } - gtk_dialog_add_button (GTK_DIALOG (dialog), button_title, response_id); + + if (g_strcmp0 (button_title, "process-stop") == 0) + mate_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), button_title, response_id); + else + mate_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), button_title, response_id); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), response_id); response_id++; } diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c index bb120a9d..ca320ba0 100644 --- a/libcaja-private/caja-mime-actions.c +++ b/libcaja-private/caja-mime-actions.c @@ -737,7 +737,7 @@ report_broken_symbolic_link (GtkWindow *parent_window, CajaFile *file) if (caja_file_is_in_trash (file)) { eel_run_simple_dialog (GTK_WIDGET (parent_window), FALSE, GTK_MESSAGE_WARNING, - prompt, detail, "gtk-cancel", NULL); + prompt, detail, "process-stop", NULL); goto out; } diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c index 601cf33c..89d095a9 100644 --- a/src/caja-location-bar.c +++ b/src/caja-location-bar.c @@ -203,7 +203,7 @@ drag_data_received_callback (GtkWidget *widget, GTK_MESSAGE_QUESTION, prompt, detail, - "gtk-cancel", "gtk-ok", + "process-stop", "gtk-ok", NULL) != 0 /* MATE_OK */; g_free (prompt); -- cgit v1.2.1