From e2f12046bc3e7f252b11e8193e2417103622185d Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Tue, 2 Jul 2019 16:00:43 +0200 Subject: polkitmateauthenticationdialog: avoid GtkStock avoid 'gtk_dialog_add_button' with deprecated GtkStock --- src/polkitmateauthenticationdialog.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/polkitmateauthenticationdialog.c b/src/polkitmateauthenticationdialog.c index 353a28b..31837be 100644 --- a/src/polkitmateauthenticationdialog.c +++ b/src/polkitmateauthenticationdialog.c @@ -617,6 +617,26 @@ polkit_mate_authentication_dialog_finalize (GObject *object) G_OBJECT_CLASS (polkit_mate_authentication_dialog_parent_class)->finalize (object); } +static GtkWidget* +polkit_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); + + return button; +} + static void polkit_mate_authentication_dialog_constructed (GObject *object) { @@ -643,12 +663,15 @@ polkit_mate_authentication_dialog_constructed (GObject *object) have_user_combobox = FALSE; - dialog->priv->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); + dialog->priv->cancel_button = polkit_mate_dialog_add_button (GTK_DIALOG (dialog), + _("_Cancel"), + "process-stop", + GTK_RESPONSE_CANCEL); + dialog->priv->auth_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - _("_Authenticate"), - GTK_RESPONSE_OK); + _("_Authenticate"), + GTK_RESPONSE_OK); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); -- cgit v1.2.1