gsk/gskcurve.c: Avoid returning value in void-retype function

This is considered a compiler error with later GLib releases with Visual Studio
builds, so avoid that.

.gitlab-ci.yml

@@ -221,21 +221,28 @@ macos-x86_64:
     PIP_CACHE_DIR: /Users/Shared/build/cache
     PIPENV_CACHE_DIR: $PIP_CACHE_DIR
     PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
+    EXTRA_MESON_FLAGS: "-Dgobject-introspection:werror=false"
   before_script:
     - bash .gitlab-ci/show-info-osx.sh
-    - python3 -m venv .venv
+    - /opt/macports/bin/python3.10 -m venv .venv
     - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
     - ln -s /opt/ccache/ccache .venv/bin
+    - ln -s /opt/pkg-config/bin/pkg-config .venv/bin
+    - ln -s /opt/bison/bin/bison .venv/bin
     - source .venv/bin/activate
     - pip3 install meson==1.2.0
     - pip3 install ninja==1.11.1
+    - pip3 install /Users/Shared/build/pkgs/PyGObject-3.44.0-cp310-cp310-macosx_10_13_x86_64.whl
+                   /Users/Shared/build/pkgs/pycairo-1.23.0-cp310-cp310-macosx_10_13_x86_64.whl
   script:
-    - meson setup ${COMMON_MESON_FLAGS}
+    - meson setup
+            ${COMMON_MESON_FLAGS}
+            ${EXTRA_MESON_FLAGS}
             -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
             -Dmedia-gstreamer=disabled
-            -Dintrospection=disabled
+            -Dintrospection=enabled
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled

gsk/gskcurve.c

@@ -1781,10 +1781,15 @@ gsk_conic_curve_segment (const GskCurve *curve,
   graphene_point_t ctrl_num, ctrl_denom;
   float mid;
 
-  if (start <= 0.0f)
-    return gsk_conic_curve_split (curve, end, segment, NULL);
-  else if (end >= 1.0f)
-    return gsk_conic_curve_split (curve, start, NULL, segment);
+  if (start <= 0.0f || end >= 1.0f)
+    {
+      if (start <= 0.0f)
+        gsk_conic_curve_split (curve, end, segment, NULL);
+      else if (end >= 1.0f)
+        gsk_conic_curve_split (curve, start, NULL, segment);
+
+      return;
+    }
 
   gsk_conic_curve_ensure_coefficents (self);
 

gtk/a11y/gtkatspicontext.c

@@ -705,9 +705,17 @@ emit_text_changed (GtkAtSpiContext *self,
                    int              end,
                    const char      *text)
 {
+  char *copy = NULL;
+
   if (self->connection == NULL)
     return;
 
+  /* Protect against possible non-UTF8 garbage after the end
+   * that g_variant_new_string() will complain about.
+   */
+  if (text[end] != '\0')
+    text = copy = g_strndup (text, end);
+
   g_dbus_connection_emit_signal (self->connection,
                                  NULL,
                                  self->context_path,
@@ -716,6 +724,8 @@ emit_text_changed (GtkAtSpiContext *self,
                                  g_variant_new ("(siiva{sv})",
                                                 kind, start, end, g_variant_new_string (text), NULL),
                                  NULL);
+
+  g_free (copy);
 }
 
 static void

gtk/a11y/gtkatspitext.c

@@ -1784,7 +1784,7 @@ buffer_changed (GtkWidget   *widget,
   if (changed->buffer)
     {
       g_object_ref (changed->buffer);
-      g_signal_connect (changed->buffer, "insert-text", G_CALLBACK (insert_range_cb), changed);
+      g_signal_connect_after (changed->buffer, "insert-text", G_CALLBACK (insert_range_cb), changed);
       g_signal_connect (changed->buffer, "delete-range", G_CALLBACK (delete_range_cb), changed);
       g_signal_connect_after (changed->buffer, "delete-range", G_CALLBACK (delete_range_after_cb), changed);
       g_signal_connect_after (changed->buffer, "mark-set", G_CALLBACK (mark_set_cb), changed);