diff options
| author | monsta <[email protected]> | 2018-01-27 22:23:06 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-01-28 09:08:32 +0100 |
| commit | 61b7e07539acf6ef82d6b0823ca8f7fc3a17bb8b (patch) | |
| tree | 289b3b089f3316fe096fe1f47a9e5785e369e401 | |
| parent | d87d54b16f4c1fd0ee595be273a56c424eaee694 (diff) | |
| download | mate-polkit-61b7e07539acf6ef82d6b0823ca8f7fc3a17bb8b.tar.bz2 mate-polkit-61b7e07539acf6ef82d6b0823ca8f7fc3a17bb8b.tar.xz | |
require GTK+ 3.22 and GLib 2.50
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/polkitmateauthenticationdialog.c | 32 |
2 files changed, 10 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index cd84953..fc953a7 100644 --- a/configure.ac +++ b/configure.ac @@ -119,8 +119,8 @@ MATE_COMPILE_WARNINGS([maximum]) # Check for required packages # *************************** -GLIB_REQUIRED=2.36.0 -GTK_REQUIRED=3.14.0 +GLIB_REQUIRED=2.50.0 +GTK_REQUIRED=3.22.0 POLKIT_AGENT_REQUIRED=0.97 POLKIT_GOBJECT_REQUIRED=0.97 APPINDICATOR_REQUIRED=0.0.13 diff --git a/src/polkitmateauthenticationdialog.c b/src/polkitmateauthenticationdialog.c index 853fdea..353a28b 100644 --- a/src/polkitmateauthenticationdialog.c +++ b/src/polkitmateauthenticationdialog.c @@ -519,12 +519,8 @@ add_row (GtkWidget *grid, int row, const char *label_text, GtkWidget *entry) label = gtk_label_new_with_mnemonic (label_text); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 1.0); gtk_label_set_yalign (GTK_LABEL (label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); -#endif gtk_widget_set_hexpand (label, FALSE); gtk_grid_attach (GTK_GRID (grid), label, @@ -682,12 +678,9 @@ polkit_mate_authentication_dialog_constructed (GObject *object) s = g_strdup_printf ("<big><b>%s</b></big>", dialog->priv->message); gtk_label_set_markup (GTK_LABEL (label), s); g_free (s); -#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -#endif gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_max_width_chars (GTK_LABEL (label), 50); gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE, 0); @@ -715,12 +708,9 @@ polkit_mate_authentication_dialog_constructed (GObject *object) "Authentication as the super user is required to perform this action.")); } } -#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -#endif gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_max_width_chars (GTK_LABEL (label), 50); gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE, 0); @@ -800,12 +790,10 @@ polkit_mate_authentication_dialog_constructed (GObject *object) s = g_strdup_printf ("<small>%s</small>", value); gtk_label_set_markup (GTK_LABEL (label), s); g_free (s); -#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 1.0); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0); -#endif + s = g_strdup_printf ("<small><b>%s:</b></small>", key); add_row (grid, rows, s, label); g_free (s); @@ -824,12 +812,10 @@ polkit_mate_authentication_dialog_constructed (GObject *object) dialog->priv->action_id); gtk_label_set_markup (GTK_LABEL (label), s); g_free (s); -#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 1.0); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0); -#endif + add_row (grid, rows++, _("<small><b>Action:</b></small>"), label); g_signal_connect (label, "activate-link", G_CALLBACK (action_id_activated), NULL); @@ -846,12 +832,10 @@ polkit_mate_authentication_dialog_constructed (GObject *object) dialog->priv->vendor); gtk_label_set_markup (GTK_LABEL (label), s); g_free (s); -#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 1.0); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0); -#endif + add_row (grid, rows++, _("<small><b>Vendor:</b></small>"), label); s = g_strdup_printf (_("Click to open %s"), dialog->priv->vendor_url); |