diff options
author | Pablo Barciela <[email protected]> | 2018-02-27 21:35:53 +0100 |
---|---|---|
committer | Pablo Barciela <[email protected]> | 2018-02-27 21:38:13 +0100 |
commit | f0ab0d4cb1495b94d8a69ce85ce25c1df280fbb5 (patch) | |
tree | 6be6f197144a36c55a64a596e7296390e9d80438 | |
parent | 9778a3a06089fa6d0f3db29f51b6ff149c0befa3 (diff) | |
download | caja-f0ab0d4cb1495b94d8a69ce85ce25c1df280fbb5.tar.bz2 caja-f0ab0d4cb1495b94d8a69ce85ce25c1df280fbb5.tar.xz |
avoid eel_run_simple_dialog with stock ids
-rw-r--r-- | eel/eel-stock-dialogs.c | 7 | ||||
-rw-r--r-- | libcaja-private/caja-mime-actions.c | 2 | ||||
-rw-r--r-- | 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); |