Merge branch 'master' into menu_button_a11y_improvements

7 files changed, 9 insertions, 2 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bb81176b9..cc7402824c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v33"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v34"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
 
 .only-default:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index ef0bb1aeb2..ef29a10a77 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -53,6 +53,7 @@ RUN dnf -y install \
     libpng-devel \
     librsvg2 \
     libselinux-devel \
+    libtiff-devel \
     libubsan \
     libXcomposite-devel \
     libXcursor-devel \
diff --git a/gtk/gtkatcontext.c b/gtk/gtkatcontext.c
index 83aa94fe5d..cbb664e2ea 100644
--- a/gtk/gtkatcontext.c
+++ b/gtk/gtkatcontext.c
@@ -1032,7 +1032,7 @@ gtk_at_context_get_description_accumulate (GtkATContext *self,
 
       GList *list = gtk_reference_list_accessible_value_get (value);
 
-      for (GList *l = list; l != NULL; l = l->data)
+      for (GList *l = list; l != NULL; l = l->next)
         {
           GtkAccessible *rel = GTK_ACCESSIBLE (l->data);
           GtkATContext *rel_context = gtk_accessible_get_at_context (rel);
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index 0d6f036148..4394621d80 100644
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -366,6 +366,7 @@ gtk_search_bar_init (GtkSearchBar *bar)
   gtk_widget_set_hexpand (bar->box_center, TRUE);
 
   bar->close_button = gtk_button_new_from_icon_name ("window-close-symbolic");
+  gtk_widget_set_valign (bar->close_button, GTK_ALIGN_CENTER);
   gtk_widget_add_css_class (bar->close_button, "close");
   gtk_center_box_set_end_widget (GTK_CENTER_BOX (bar->box_center), bar->close_button);
   gtk_widget_hide (bar->close_button);
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui
index 412ecfa51c..eaca2ae17c 100644
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -23,6 +23,7 @@
             <property name="receives-default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <property name="has-frame">0</property>
             <property name="icon-name">media-playback-start-symbolic</property>
             <signal name="clicked" handler="play_button_clicked" object="GtkMediaControls" swapped="no"/>
           </object>
diff --git a/testsuite/gtk/fnmatch.c b/testsuite/gtk/fnmatch.c
index e16bdae016..25bbc7b0e6 100644
--- a/testsuite/gtk/fnmatch.c
+++ b/testsuite/gtk/fnmatch.c
@@ -165,12 +165,14 @@ main (int argc, char *argv[])
     {
       char *path = g_strdup_printf ("/fnmatch/test%d", i);
       g_test_add_data_func (path, &tests[i], test_fnmatch);
+      g_free (path);
     }
 
   for (int i = 0; i < G_N_ELEMENTS (citests); i++)
     {
       char *path = g_strdup_printf ("/ci-glob/test%d", i);
       g_test_add_data_func (path, &citests[i], test_ci_glob);
+      g_free (path);
     }
 
   return g_test_run ();
diff --git a/testsuite/gtk/texthistory.c b/testsuite/gtk/texthistory.c
index c64c803083..cca4008196 100644
--- a/testsuite/gtk/texthistory.c
+++ b/testsuite/gtk/texthistory.c
@@ -602,6 +602,8 @@ test14 (void)
   run_test (commands, G_N_ELEMENTS (commands), 0);
 
   g_free (fill);
+  g_free (fill_after);
+  g_free (fill_after_2);
 }
 
 int