diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-10-29 13:53:47 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-10-29 15:27:53 -0400 |
| commit | 9948053cd7e43e09cdcc3942c08d33fc6dc58c62 (patch) | |
| tree | 13567c05eb01624e8833b0b728030f952edfb9dd /gtk/gtkmountoperation.c | |
| parent | f1af8046d0dc225dac57b7762d3216267afa67f2 (diff) | |
| download | gtk+-9948053cd7e43e09cdcc3942c08d33fc6dc58c62.tar.gz | |
Deprecate GtkDialog
GtkDialog is too flexible in terms of UI (headerbars vs action bar,
etc), and has archaic APIs. It is time to retire it.
Diffstat (limited to 'gtk/gtkmountoperation.c')
| -rw-r--r-- | gtk/gtkmountoperation.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index b20824053f..d103e0aea1 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -45,7 +45,7 @@ #include "gtkicontheme.h" #include "gtkmain.h" #include "gtksettings.h" -#include "gtkdialogprivate.h" +#include "deprecated/gtkdialogprivate.h" #include "gtkpopover.h" #include "gtksnapshot.h" #include "gdktextureprivate.h" @@ -468,9 +468,11 @@ pw_dialog_verify_input (GtkEditable *editable, gboolean is_valid; is_valid = pw_dialog_input_is_valid (operation); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_dialog_set_response_sensitive (GTK_DIALOG (priv->dialog), GTK_RESPONSE_OK, is_valid); +G_GNUC_END_IGNORE_DEPRECATIONS } static void @@ -493,9 +495,11 @@ pw_dialog_anonymous_toggled (GtkWidget *widget, gtk_widget_set_sensitive (GTK_WIDGET (l->data), !priv->anonymous); } +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_dialog_set_response_sensitive (GTK_DIALOG (priv->dialog), GTK_RESPONSE_OK, is_valid); +G_GNUC_END_IGNORE_DEPRECATIONS } @@ -593,6 +597,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, priv->dialog = dialog; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS content_area = gtk_dialog_get_content_area (dialog); gtk_window_set_resizable (window, FALSE); @@ -604,6 +609,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, _("Co_nnect"), GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK); +G_GNUC_END_IGNORE_DEPRECATIONS /* Build contents */ @@ -794,7 +800,11 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, g_signal_emit_by_name (priv->anonymous_toggle, "toggled"); } else if (! pw_dialog_input_is_valid (operation)) - gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE); + { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE); +G_GNUC_END_IGNORE_DEPRECATIONS + } g_object_notify (G_OBJECT (operation), "is-showing"); @@ -1459,13 +1469,17 @@ create_show_processes_dialog (GtkMountOperation *op, primary = g_strndup (message, primary - message); } +G_GNUC_BEGIN_IGNORE_DEPRECATIONS dialog = gtk_dialog_new (); +G_GNUC_END_IGNORE_DEPRECATIONS if (priv->parent_window != NULL) gtk_window_set_transient_for (GTK_WINDOW (dialog), priv->parent_window); gtk_window_set_title (GTK_WINDOW (dialog), ""); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); +G_GNUC_END_IGNORE_DEPRECATIONS vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_widget_set_margin_top (vbox, 12); gtk_widget_set_margin_bottom (vbox, 12); |