Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
caja-autorun: avoid gtk_dialog_add_buttons with stock ids
  • Loading branch information
sc0w authored and lukefromdc committed Feb 23, 2018
1 parent ff1b432 commit 54a9de1
Showing 1 changed file with 28 additions and 4 deletions.
32 changes: 28 additions & 4 deletions libcaja-private/caja-autorun.c
Expand Up @@ -915,6 +915,24 @@ combo_box_enter_ok (GtkWidget *togglebutton, GdkEventKey *event, GtkDialog *dial
return FALSE;
}

static void
mate_dialog_add_button (GtkDialog *dialog,
const gchar *button_text,
const gchar *icon_name,
gint response_id)
{
GtkWidget *button;

button = gtk_button_new_with_mnemonic (button_text);
gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON));

gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);
gtk_style_context_add_class (gtk_widget_get_style_context (button), "text-button");
gtk_widget_set_can_default (button, TRUE);
gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
}

/* returns TRUE if a folder window should be opened */
static gboolean
do_autorun_for_content_type (GMount *mount, const char *x_content_type, CajaAutorunOpenWindow open_window_func, gpointer user_data)
Expand Down Expand Up @@ -1126,10 +1144,16 @@ do_autorun_for_content_type (GMount *mount, const char *x_content_type, CajaAuto
data);
gtk_box_pack_start (GTK_BOX (vbox), always_check_button, TRUE, TRUE, 0);

gtk_dialog_add_buttons (GTK_DIALOG (dialog),
"gtk-cancel", GTK_RESPONSE_CANCEL,
"gtk-ok", GTK_RESPONSE_OK,
NULL);
mate_dialog_add_button (GTK_DIALOG (dialog),
_("_Cancel"),
"process-stop",
GTK_RESPONSE_CANCEL);

mate_dialog_add_button (GTK_DIALOG (dialog),
_("_OK"),
"gtk-ok",
GTK_RESPONSE_OK);

gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);

if (g_mount_can_eject (mount))
Expand Down

0 comments on commit 54a9de1

Please sign in to comment.