[gnome-terminal] build: Bump gtk min-req version to 3.18

[Egmont Koblinger <egmontkob src gnome org>]

commit 4201999ebb2b314fee548ffeb770e28a6fbae656
Author: Egmont Koblinger <egmont gmail com>
Date:   Wed Sep 18 13:46:47 2019 +0200

    build: Bump gtk min-req version to 3.18
    
    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/162

 configure.ac                  |  2 +-
 src/terminal-accels.c         | 26 ++++++++++++--------------
 src/terminal-info-bar.c       |  3 ++-
 src/terminal-screen.c         |  2 ++
 src/terminal-search-popover.c |  2 --
 src/terminal-tab-label.c      |  6 +++++-
 src/terminal-util.c           |  4 ++--
 src/terminal-window.c         |  5 -----
 8 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b5688e42..cba2097a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AC_MSG_RESULT([$with_gtk])
 case "$with_gtk" in
   3.0) GTK_API_VERSION=3.0
        GTK_REQUIRED=3.22.27
-       GTK_MIN_REQUIRED=3.8
+       GTK_MIN_REQUIRED=3.18
        GTK_MAX_ALLOWED=3.22
        VTE_API_VERSION=2.91
        VTE_REQUIRED=0.59.0
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
index 75ac3a1e..333c6d17 100644
--- a/src/terminal-accels.c
+++ b/src/terminal-accels.c
@@ -264,6 +264,7 @@ key_changed_cb (GSettings *settings,
                 gpointer user_data)
 {
   GtkApplication *application = user_data;
+  const gchar *accels[2] = { NULL, NULL };
 
   _terminal_debug_print (TERMINAL_DEBUG_ACCELS,
                          "key %s changed\n",
@@ -283,6 +284,8 @@ key_changed_cb (GSettings *settings,
   gs_free char *detailed = g_action_print_detailed_name (key_entry->action_name,
                                                          key_entry->parameter);
   gs_unref_variant GVariant *shadow_parameter = g_variant_new_string (detailed);
+  gs_free char *shadow_detailed = g_action_print_detailed_name (key_entry->shadow_action_name,
+                                                                shadow_parameter);
 
   /* We want to always consume the action's accelerators, even if the corresponding
    * action is insensitive, so the corresponding shortcut key escape code isn't sent
@@ -294,22 +297,17 @@ key_changed_cb (GSettings *settings,
    */
 
   if (g_str_equal (value, "disabled")) {
-    gtk_application_remove_accelerator (application,
-                                        key_entry->action_name,
-                                        key_entry->parameter);
-    gtk_application_remove_accelerator (application,
-                                        key_entry->shadow_action_name,
-                                        shadow_parameter);
+    accels[0] = NULL;
   } else {
-    gtk_application_add_accelerator (application,
-                                     value,
-                                     key_entry->action_name,
-                                     key_entry->parameter);
-    gtk_application_add_accelerator (application,
-                                     value,
-                                     key_entry->shadow_action_name,
-                                     shadow_parameter);
+    accels[0] = value;
   }
+
+  gtk_application_set_accels_for_action (application,
+                                         detailed,
+                                         accels);
+  gtk_application_set_accels_for_action (application,
+                                         shadow_detailed,
+                                         accels);
 }
 
 static void
diff --git a/src/terminal-info-bar.c b/src/terminal-info-bar.c
index a40ceeba..8ffca189 100644
--- a/src/terminal-info-bar.c
+++ b/src/terminal-info-bar.c
@@ -111,7 +111,8 @@ terminal_info_bar_format_text (TerminalInfoBar *bar,
 
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
   gtk_label_set_selectable (GTK_LABEL (label), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_label_set_yalign (GTK_LABEL (label), 0.0);
 
   gtk_box_pack_start (GTK_BOX (priv->content_box), label, FALSE, FALSE, 0);
   gtk_widget_show_all (priv->content_box);
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 684da49a..8a68caa4 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -888,7 +888,9 @@ update_color_scheme (TerminalScreen *screen)
 
   context = gtk_widget_get_style_context (widget);
   gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg);
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_style_context_get_background_color (context, gtk_style_context_get_state (context), &theme_bg);
+  G_GNUC_END_IGNORE_DEPRECATIONS
 
   use_theme_colors = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_THEME_COLORS_KEY);
   if (use_theme_colors ||
diff --git a/src/terminal-search-popover.c b/src/terminal-search-popover.c
index aa490039..174f81c8 100644
--- a/src/terminal-search-popover.c
+++ b/src/terminal-search-popover.c
@@ -378,9 +378,7 @@ terminal_search_popover_init (TerminalSearchPopover *popover)
   }
 
 #if 0
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_popover_set_default_widget (GTK_POPOVER (popover), priv->search_prev_button);
-  G_GNUC_END_IGNORE_DEPRECATIONS
 #else
   GtkWindow *window = GTK_WINDOW (popover);
   gtk_window_set_default (window, priv->search_prev_button);
diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
index 2ba69150..7b4b0849 100644
--- a/src/terminal-tab-label.c
+++ b/src/terminal-tab-label.c
@@ -192,7 +192,11 @@ terminal_tab_label_constructed (GObject *object)
   priv->label = label = gtk_label_new (NULL);
   gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-  gtk_misc_set_padding (GTK_MISC (label), 0, 0);
+  gtk_widget_set_margin_start  (label, 0);
+  gtk_widget_set_margin_end    (label, 0);
+  gtk_widget_set_margin_top    (label, 0);
+  gtk_widget_set_margin_bottom (label, 0);
+
   gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
   gtk_label_set_single_line_mode (GTK_LABEL (label), TRUE);
 
diff --git a/src/terminal-util.c b/src/terminal-util.c
index 6870b98f..39e90bf1 100644
--- a/src/terminal-util.c
+++ b/src/terminal-util.c
@@ -448,8 +448,8 @@ terminal_util_load_widgets_resource (const char *path,
     /* Fixup dialogue padding, #735242 */
     if (GTK_IS_DIALOG (main_object) &&
         (action_area = (GtkWidget *) gtk_builder_get_object (builder, "dialog-action-area"))) {
-      gtk_widget_set_margin_left   (action_area, 5);
-      gtk_widget_set_margin_right  (action_area, 5);
+      gtk_widget_set_margin_start  (action_area, 5);
+      gtk_widget_set_margin_end    (action_area, 5);
       gtk_widget_set_margin_top    (action_area, 5);
       gtk_widget_set_margin_bottom (action_area, 5);
     }
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 911c18da..43e5a47d 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -3225,11 +3225,6 @@ confirm_close_window_or_tab (TerminalWindow *window,
   gtk_dialog_add_button (GTK_DIALOG (dialog), n_tabs > 1 ? _("C_lose Window") : _("C_lose Terminal"), 
GTK_RESPONSE_ACCEPT);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
 
-  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
-                                           GTK_RESPONSE_ACCEPT,
-                                           GTK_RESPONSE_CANCEL,
-                                           -1);
-
   g_object_set_data (G_OBJECT (dialog), "close-screen", screen);
 
   g_signal_connect (dialog, "destroy",