ci: Enable libcloudproviders support

We ended up breaking the build when it's enabled, so we should test the
feature in our CI pipeline.

.gitlab-ci.yml

@@ -17,7 +17,12 @@ stages:
 # Common variables
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
+  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
+  FEATURE_FLAGS: "-Dcloudproviders=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v18"
+  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"
 
 .only-default:
   only:
@@ -27,14 +32,14 @@ variables:
 
 style-check-diff:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
+  image: $FEDORA_IMAGE
   stage: .pre
   allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
+  image: $FEDORA_IMAGE
   artifacts:
     when: always
     reports:
@@ -66,11 +71,7 @@ fedora-x86_64:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
-            -Dx11-backend=true
-            -Dwayland-backend=true
-            -Dbroadway-backend=true
-            -Dvulkan=yes
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             -Dprofiler=true
             _build
     - ninja -C _build
@@ -84,11 +85,7 @@ release-build:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
-            -Dx11-backend=true
-            -Dwayland-backend=true
-            -Dbroadway-backend=true
-            -Dvulkan=yes
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11
@@ -117,7 +114,7 @@ msys2-mingw32:
     CHERE_INVOKING: "yes"
 
 .flatpak-defaults:
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+  image: $FLATPAK_IMAGE
   stage: flatpak
   allow_failure: true
   tags:
@@ -171,7 +168,7 @@ flatpak-master:icon-browser:
     APPID: org.gtk.IconBrowser4
 
 static-scan:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  image: $FEDORA_IMAGE
   stage: analysis
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
@@ -184,7 +181,7 @@ static-scan:
   allow_failure: true
 
 reference:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19
+  image: $DOCS_IMAGE
   stage: docs
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"

.gitlab-ci/fedora-base.Dockerfile

@@ -42,6 +42,7 @@ RUN dnf -y install \
     json-glib-devel \
     lcov \
     libattr-devel \
+    libcloudproviders-devel \
     libepoxy-devel \
     libffi-devel \
     libmount-devel \

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v20
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

demos/gtk-demo/constraints2.c

@@ -1,7 +1,7 @@
 /* Constraints/Interactive
  *
- * Demonstrate how constraints can be updates during
- * user interaction.
+ * Demonstrate how constraints can be updates during user interaction.
+ * The vertical edge between the buttons can be dragged with the mouse.
  */
 
 #include <glib/gi18n.h>

demos/gtk-demo/cursors.c

@@ -1,9 +1,8 @@
 /* Cursors
  *
- * Demonstrates a useful set of available cursors. The cursors shown here are the ones
- * defined by CSS, which we assume to be available.
- *
- * The example shows creating cursors by name or from an image, with or without a fallback.
+ * Demonstrates a useful set of available cursors. The cursors shown here are the
+ * ones defined by CSS, which we assume to be available. The example shows creating
+ * cursors by name or from an image, with or without a fallback.
  */
 
 #include <gtk/gtk.h>

demos/gtk-demo/dropdown.c

@@ -9,6 +9,7 @@
  * display the selected item differently from the presentation
  * in the popup.
  */
+
 #include <gtk/gtk.h>
 
 
@@ -242,7 +243,7 @@ do_dropdown (GtkWidget *do_widget)
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Drop Down");
+      gtk_window_set_title (GTK_WINDOW (window), "Drop Downs");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 

demos/gtk-demo/fixed.c

@@ -1,4 +1,4 @@
-/* Fixed layout
+/* Fixed Layout
  *
  * GtkFixed is a container that allows placing and transforming
  * widgets manually.
@@ -126,7 +126,7 @@ create_demo_window (GtkWidget *do_widget)
 
   window = gtk_window_new ();
   gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "Fixed layout");
+  gtk_window_set_title (GTK_WINDOW (window), "Fixed Layout");
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 

demos/gtk-demo/flowbox.c

@@ -1,9 +1,8 @@
 /* Flow Box
  *
  * GtkFlowBox allows flexible and responsive grids which reflow
- * as needed and support sorting and filtering.
- *
- * The children of a GtkFlowBox are regular widgets
+ * as needed and support sorting and filtering. The children of
+ * a GtkFlowBox are regular widgets
  *
  * The dataset used here has 665 colors.
  */

demos/gtk-demo/listview_clocks.c

@@ -3,10 +3,9 @@
  * This demo displays the time in different timezones.
  *
  * The goal is to show how to set up expressions that track changes
- * in objects and make them update widgets.
- *
- * For that, we create a GtkClock object that updates its time every
- * second and then use various ways to display that time.
+ * in objects and make them update widgets. For that, we create a
+ * GtkClock object that updates its time every second and then use
+ * various ways to display that time.
  *
  * Typically, this will be done using GtkBuilder .ui files with the
  * help of the <binding> tag, but this demo shows the code that runs
@@ -41,7 +40,8 @@ enum {
 
 /* This function returns the current time in the clock's timezone.
  * Note that this returns a new object every time, so we need to
- * remember to unref it after use. */
+ * remember to unref it after use.
+ */
 static GDateTime *
 gtk_clock_get_time (GtkClock *clock)
 {
@@ -51,10 +51,11 @@ gtk_clock_get_time (GtkClock *clock)
     return g_date_time_new_now_local ();
 }
 
-/* Here, we implement the functionality required by the GdkPaintable interface.
- * This way we have a trivial way to display an analog clock.
- * It also allows demonstrating how to directly use objects in the listview
- * later by making this object do something interesting. */
+/* Here, we implement the functionality required by the GdkPaintable
+ * interface. This way we have a trivial way to display an analog clock.
+ * It also allows demonstrating how to directly use objects in the
+ * listview later by making this object do something interesting.
+ */
 static void
 gtk_clock_snapshot (GdkPaintable *paintable,
                     GdkSnapshot  *snapshot,
@@ -68,26 +69,31 @@ gtk_clock_snapshot (GdkPaintable *paintable,
 #define BLACK ((GdkRGBA) { 0, 0, 0, 1 })
 
   /* save/restore() is necessary so we can undo the transforms we start
-   * out with. */
+   * out with.
+   */
   gtk_snapshot_save (snapshot);
 
   /* First, we move the (0, 0) point to the center of the area so
-   * we can draw everything relative to it. */
+   * we can draw everything relative to it.
+   */
   gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2, height / 2));
+
   /* Next we scale it, so that we can pretend that the clock is
    * 100px in size. That way, we don't need to do any complicated
-   * math later.
-   * We use MIN() here so that we use the smaller dimension for sizing.
-   * That way we don't overdraw but keep the aspect ratio. */
+   * math later. We use MIN() here so that we use the smaller
+   * dimension for sizing. That way we don't overdraw but keep
+   * the aspect ratio.
+   */
   gtk_snapshot_scale (snapshot, MIN (width, height) / 100.0, MIN (width, height) / 100.0);
-  /* Now we have a circle with diameter 100px (and radius 50px) that
-   * has its (0, 0) point at the center.
-   * Let's draw a simple clock into it. */
 
+  /* Now we have a circle with diameter 100px (and radius 50px) that
+   * has its (0, 0) point at the center. Let's draw a simple clock into it.
+   */
   time = gtk_clock_get_time (self);
 
   /* First, draw a circle. This is a neat little trick to draw a circle
-   * without requiring Cairo. */
+   * without requiring Cairo.
+   */
   gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-50, -50, 100, 100), 50);
   gtk_snapshot_append_border (snapshot,
                               &outline,
@@ -95,9 +101,11 @@ gtk_clock_snapshot (GdkPaintable *paintable,
                               (GdkRGBA [4]) { BLACK, BLACK, BLACK, BLACK });
 
   /* Next, draw the hour hand.
-   * We do this using tranforms again: Instead of computing where the angle points
-   * to, we just rotate everything and then draw the hand as if if was :00.
-   * We don't even need to care about am/pm here because rotations just work. */
+   * We do this using tranforms again: Instead of computing where the angle
+   * points to, we just rotate everything and then draw the hand as if it
+   * was :00. We don't even need to care about am/pm here because rotations
+   * just work.
+   */
   gtk_snapshot_save (snapshot);
   gtk_snapshot_rotate (snapshot, 30 * g_date_time_get_hour (time) + 0.5 * g_date_time_get_minute (time));
   gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -23, 4, 25), 2);
@@ -107,7 +115,8 @@ gtk_clock_snapshot (GdkPaintable *paintable,
   gtk_snapshot_restore (snapshot);
 
   /* And the same as above for the minute hand. Just make this one longer
-   * so people can tell the hands apart. */
+   * so people can tell the hands apart.
+   */
   gtk_snapshot_save (snapshot);
   gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_minute (time));
   gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 45), 2);
@@ -125,8 +134,9 @@ gtk_clock_snapshot (GdkPaintable *paintable,
   gtk_snapshot_pop (snapshot);
   gtk_snapshot_restore (snapshot);
 
-  /* And finally, don't forget to restore the initial save() that we did for
-   * the initial transformations. */
+  /* And finally, don't forget to restore the initial save() that
+   * we did for the initial transformations.
+   */
   gtk_snapshot_restore (snapshot);
 
   g_date_time_unref (time);
@@ -145,10 +155,9 @@ gtk_clock_get_intrinsic_height (GdkPaintable *paintable)
   return 100;
 }
 
-/* Initialize the paintable interface. This way we turn our clock objects
- * into objects that can be drawn.
- * There are more functions to this interface to define desired size,
- * but this is enough.
+/* Initialize the paintable interface. This way we turn our clocks
+ * into objects that can be drawn. There are more functions to this
+ * interface to define desired size, but this is enough.
  */
 static void
 gtk_clock_paintable_init (GdkPaintableInterface *iface)
@@ -158,8 +167,9 @@ gtk_clock_paintable_init (GdkPaintableInterface *iface)
   iface->get_intrinsic_height = gtk_clock_get_intrinsic_height;
 }
 
-/* Finally, we define the type. The important part is adding the paintable
- * interface, so GTK knows that this object can indeed be drawm.
+/* Finally, we define the type. The important part is adding the
+ * paintable interface, so GTK knows that this object can indeed
+ * be drawn.
  */
 G_DEFINE_TYPE_WITH_CODE (GtkClock, gtk_clock, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
@@ -221,11 +231,14 @@ gtk_clock_set_property (GObject      *object,
 
 /* This is the list of all the ticking clocks */
 static GSList *ticking_clocks = NULL;
-/* This is the id of the timeout source that is updating all ticking clocks */
+
+/* This is the ID of the timeout source that is updating all
+ * ticking clocks.
+ */
 static guint ticking_clock_id = 0;
 
-/* Every second, this function is called to tell everybody that the
- * clocks are ticking.
+/* Every second, this function is called to tell everybody that
+ * the clocks are ticking.
  */
 static gboolean
 gtk_clock_tick (gpointer unused)
@@ -240,6 +253,7 @@ gtk_clock_tick (gpointer unused)
        * so notify about that.
        */
       g_object_notify_by_pspec (G_OBJECT (clock), properties[PROP_TIME]);
+
       /* We will also draw the hands of the clock differently.
        * So notify about that, too.
        */
@@ -343,6 +357,9 @@ create_clocks_model (void)
   clock = gtk_clock_new ("San Francisco", g_time_zone_new ("America/Los_Angeles"));
   g_list_store_append (result, clock);
   g_object_unref (clock);
+  clock = gtk_clock_new ("Xalapa", g_time_zone_new ("America/Mexico_City"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
   clock = gtk_clock_new ("Boston", g_time_zone_new ("America/New_York"));
   g_list_store_append (result, clock);
   g_object_unref (clock);

demos/gtk-demo/listview_colors.c

@@ -6,7 +6,7 @@
  * and sort the data in various ways. The controls for
  * this are implemented using GtkDropDown.
  *
- * The dataset used here has 9283 items.
+ * The dataset used here has 9 283 items.
  */
 
 #include <gtk/gtk.h>

demos/gtk-demo/listview_weather.c

@@ -11,7 +11,7 @@
  * A GtkNoSelectionModel is used to make sure no item in the list can be
  * selected. All other interactions with the items is still possible.
  *
- * The dataset used here has 70000 items.
+ * The dataset used here has 70 000 items.
  */
 
 #include <gtk/gtk.h>

demos/gtk-demo/main.c

@@ -599,7 +599,7 @@ display_image (const char *resource)
 {
   GtkWidget *sw, *image;
 
-  image = gtk_image_new_from_resource (resource);
+  image = gtk_picture_new_for_resource (resource);
   gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -1040,7 +1040,7 @@ activate (GApplication *app)
   listmodel = create_demo_model ();
   treemodel = gtk_tree_list_model_new (FALSE,
                                        G_LIST_MODEL (listmodel),
-                                       FALSE,
+                                       TRUE,
                                        get_child_model,
                                        NULL,
                                        NULL);

demos/gtk-demo/markup.txt

@@ -5,7 +5,7 @@ Text <span color="gray">c<span color="green">o</span>l<span color="tomato">o</sp
 
 Colorful <span underline="low" underline-color="blue"><span underline="double" underline-color="red">under</span>lines</span> and <span background="pink"><span underline="error">mo</span><span underline="error" underline-color="green">re</span></span>
 
-Colorful <span strikethrough="true" strikethrough-color="magenta">strikethroughs</span>
+Colorful <span strikethrough="true" strikethrough-color="magenta">strikethroughs</span> and <span overline="single" overline_color="green">overlines</span>
 
 Superscripts and subscripts: 𝜀<span rise="-6000" size="x-small" font_desc="italic">0</span> = 𝜔<span rise="8000" size="smaller">𝜔<span rise="14000" size="smaller">𝜔<span rise="20000">.<span rise="23000">.<span rise="26000">.</span></span></span></span></span>
 

demos/gtk-demo/sliding_puzzle.c

@@ -1,4 +1,4 @@
-/* Sliding puzzle
+/* Sliding Puzzle
  *
  * This demo demonstrates how to use gestures and paintables to create a
  * small sliding puzzle game.

demos/gtk-demo/themes.c

@@ -92,12 +92,11 @@ static Theme themes[] = {
 static int theme;
 
 static gboolean
-change_theme (GtkWidget *widget,
+change_theme (GtkWidget     *widget,
               GdkFrameClock *frame_clock,
-              gpointer data)
+              gpointer       data)
 {
-  GtkBuilder *builder = data;
-  GtkWidget *label;
+  GtkWidget *label = data;
   Theme next = themes[theme++ % G_N_ELEMENTS (themes)];
   char *name;
 
@@ -110,7 +109,6 @@ change_theme (GtkWidget *widget,
   gtk_window_set_title (GTK_WINDOW (widget), name);
   g_free (name);
 
-  label = GTK_WIDGET (gtk_builder_get_object (builder, "fps"));
   if (frame_clock)
     {
       char *fps;
@@ -127,10 +125,10 @@ change_theme (GtkWidget *widget,
 
 static void
 clicked (GtkGestureClick *gesture,
-         int n_press,
-         double x,
-         double y,
-         gpointer data)
+         int              n_press,
+         double           x,
+         double           y,
+         gpointer         data)
 {
   GtkWidget *window;
   GdkEvent *event;
@@ -198,6 +196,7 @@ do_themes (GtkWidget *do_widget)
       GtkBuilder *builder;
       GtkWidget *header;
       GtkWidget *button;
+      GtkWidget *label;
       GtkGesture *gesture;
 
       builder = gtk_builder_new_from_resource ("/themes/themes.ui");
@@ -207,13 +206,17 @@ do_themes (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
 
       header = GTK_WIDGET (gtk_builder_get_object (builder, "header"));
+      label = GTK_WIDGET (gtk_builder_get_object (builder, "fps"));
+
       gesture = gtk_gesture_click_new ();
-      g_signal_connect (gesture, "pressed", G_CALLBACK (clicked), builder);
+      g_signal_connect (gesture, "pressed", G_CALLBACK (clicked), label);
       gtk_widget_add_controller (header, GTK_EVENT_CONTROLLER (gesture));
 
       button = GTK_WIDGET (gtk_builder_get_object (builder, "toggle"));
-      g_signal_connect (button, "notify::active", G_CALLBACK (toggle_cycle), builder);
+      g_signal_connect (button, "notify::active", G_CALLBACK (toggle_cycle), label);
       gtk_widget_realize (window);
+
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))

docs/reference/gdk/gdk4-sections.txt

@@ -382,8 +382,6 @@ gdk_device_has_bidi_layouts
 <SUBSECTION>
 gdk_device_get_state
 gdk_device_get_surface_at_position
-gdk_device_get_history
-gdk_device_free_history
 GdkTimeCoord
 gdk_device_get_axis
 gdk_device_get_axis_names

gdk/broadway/gdkdevice-broadway.c

@@ -23,12 +23,6 @@
 #include "gdksurfaceprivate.h"
 #include "gdkprivate-broadway.h"
 
-static gboolean gdk_broadway_device_get_history (GdkDevice      *device,
-                                                 GdkSurface      *surface,
-                                                 guint32         start,
-                                                 guint32         stop,
-                                                 GdkTimeCoord ***events,
-                                                 gint           *n_events);
 static void gdk_broadway_device_get_state (GdkDevice       *device,
                                            GdkSurface       *surface,
                                            gdouble         *axes,
@@ -64,7 +58,6 @@ gdk_broadway_device_class_init (GdkBroadwayDeviceClass *klass)
 {
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
-  device_class->get_history = gdk_broadway_device_get_history;
   device_class->get_state = gdk_broadway_device_get_state;
   device_class->set_surface_cursor = gdk_broadway_device_set_surface_cursor;
   device_class->query_state = gdk_broadway_device_query_state;
@@ -84,17 +77,6 @@ gdk_broadway_device_init (GdkBroadwayDevice *device_core)
   _gdk_device_add_axis (device, NULL, GDK_AXIS_Y, 0, 0, 1);
 }
 
-static gboolean
-gdk_broadway_device_get_history (GdkDevice      *device,
-                                 GdkSurface      *surface,
-                                 guint32         start,
-                                 guint32         stop,
-                                 GdkTimeCoord ***events,
-                                 gint           *n_events)
-{
-  return FALSE;
-}
-
 static void
 gdk_broadway_device_get_state (GdkDevice       *device,
                                GdkSurface       *surface,

gdk/gdkdevice.c

@@ -635,93 +635,6 @@ gdk_device_get_surface_at_position (GdkDevice *device,
   return surface;
 }
 
-/**
- * gdk_device_get_history: (skip)
- * @device: a #GdkDevice
- * @surface: the surface with respect to which the event coordinates will be reported
- * @start: starting timestamp for range of events to return
- * @stop: ending timestamp for the range of events to return
- * @events: (array length=n_events) (out) (transfer full) (optional):
- *   location to store a newly-allocated array of #GdkTimeCoord, or
- *   %NULL
- * @n_events: (out) (optional): location to store the length of
- *   @events, or %NULL
- *
- * Obtains the motion history for a pointer device; given a starting and
- * ending timestamp, return all events in the motion history for
- * the device in the given range of time. Some windowing systems
- * do not support motion history, in which case, %FALSE will
- * be returned. (This is not distinguishable from the case where
- * motion history is supported and no events were found.)
- *
- * Note that there is also gdk_surface_set_event_compression() to get
- * more motion events delivered directly, independent of the windowing
- * system.
- *
- * Returns: %TRUE if the windowing system supports motion history and
- *  at least one event was found.
- **/
-gboolean
-gdk_device_get_history (GdkDevice      *device,
-                        GdkSurface      *surface,
-                        guint32         start,
-                        guint32         stop,
-                        GdkTimeCoord ***events,
-                        gint           *n_events)
-{
-  g_return_val_if_fail (GDK_IS_DEVICE (device), FALSE);
-  g_return_val_if_fail (device->source != GDK_SOURCE_KEYBOARD, FALSE);
-  g_return_val_if_fail (GDK_IS_SURFACE (surface), FALSE);
-
-  if (n_events)
-    *n_events = 0;
-
-  if (events)
-    *events = NULL;
-
-  if (GDK_SURFACE_DESTROYED (surface))
-    return FALSE;
-
-  if (!GDK_DEVICE_GET_CLASS (device)->get_history)
-    return FALSE;
-
-  return GDK_DEVICE_GET_CLASS (device)->get_history (device, surface,
-                                                     start, stop,
-                                                     events, n_events);
-}
-
-GdkTimeCoord **
-_gdk_device_allocate_history (GdkDevice *device,
-                              gint       n_events)
-{
-  GdkTimeCoord **result = g_new (GdkTimeCoord *, n_events);
-  gint i;
-
-  for (i = 0; i < n_events; i++)
-    result[i] = g_malloc (sizeof (GdkTimeCoord) -
-                          sizeof (double) * (GDK_MAX_TIMECOORD_AXES - device->axes->len));
-  return result;
-}
-
-/**
- * gdk_device_free_history: (skip)
- * @events: (array length=n_events): an array of #GdkTimeCoord.
- * @n_events: the length of the array.
- *
- * Frees an array of #GdkTimeCoord that was returned by gdk_device_get_history().
- */
-void
-gdk_device_free_history (GdkTimeCoord **events,
-                         gint           n_events)
-{
-  gint i;
-
-  for (i = 0; i < n_events; i++)
-    g_free (events[i]);
-
-  g_free (events);
-}
-
 /**
  * gdk_device_get_name:
  * @device: a #GdkDevice

gdk/gdkdevice.h

@@ -146,16 +146,6 @@ GDK_AVAILABLE_IN_ALL
 GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device,
                                                  double    *win_x,
                                                  double    *win_y);
-GDK_AVAILABLE_IN_ALL
-gboolean gdk_device_get_history  (GdkDevice         *device,
-                                  GdkSurface         *surface,
-                                  guint32            start,
-                                  guint32            stop,
-                                  GdkTimeCoord    ***events,
-                                  gint              *n_events);
-GDK_AVAILABLE_IN_ALL
-void     gdk_device_free_history (GdkTimeCoord     **events,
-                                  gint               n_events);
 
 GDK_AVAILABLE_IN_ALL
 gint     gdk_device_get_n_axes     (GdkDevice       *device);

gdk/gdkdeviceprivate.h

@@ -70,13 +70,6 @@ struct _GdkDeviceClass
 {
   GObjectClass parent_class;
 
-  gboolean (* get_history)   (GdkDevice      *device,
-                              GdkSurface      *surface,
-                              guint32         start,
-                              guint32         stop,
-                              GdkTimeCoord ***events,
-                              gint           *n_events);
-
   void (* get_state)         (GdkDevice       *device,
                               GdkSurface       *surface,
                               gdouble         *axes,

gdk/wayland/gdkdevice-wayland.c

@@ -309,17 +309,6 @@ static void deliver_key_event (GdkWaylandSeat       *seat,
                                uint32_t              state,
                                gboolean              from_key_repeat);
 
-static gboolean
-gdk_wayland_device_get_history (GdkDevice      *device,
-                                GdkSurface      *surface,
-                                guint32         start,
-                                guint32         stop,
-                                GdkTimeCoord ***events,
-                                gint           *n_events)
-{
-  return FALSE;
-}
-
 static void
 gdk_wayland_device_get_state (GdkDevice       *device,
                               GdkSurface       *surface,
@@ -828,7 +817,6 @@ gdk_wayland_device_class_init (GdkWaylandDeviceClass *klass)
 {
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
-  device_class->get_history = gdk_wayland_device_get_history;
   device_class->get_state = gdk_wayland_device_get_state;
   device_class->set_surface_cursor = gdk_wayland_device_set_surface_cursor;
   device_class->query_state = gdk_wayland_device_query_state;

gdk/win32/gdkdevice-virtual.c

@@ -63,18 +63,6 @@ _gdk_device_virtual_set_active (GdkDevice *device,
   g_signal_emit_by_name (G_OBJECT (device), "changed");
 }
 
-static gboolean
-gdk_device_virtual_get_history (GdkDevice      *device,
-				GdkSurface      *window,
-				guint32         start,
-				guint32         stop,
-				GdkTimeCoord ***events,
-				gint           *n_events)
-{
-  /* History is only per slave device */
-  return FALSE;
-}
-
 static void
 gdk_device_virtual_get_state (GdkDevice       *device,
 			      GdkSurface       *window,
@@ -188,7 +176,6 @@ gdk_device_virtual_class_init (GdkDeviceVirtualClass *klass)
 {
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
-  device_class->get_history = gdk_device_virtual_get_history;
   device_class->get_state = gdk_device_virtual_get_state;
   device_class->set_surface_cursor = gdk_device_virtual_set_surface_cursor;
   device_class->query_state = gdk_device_virtual_query_state;

gdk/win32/gdkdevice-win32.c

@@ -29,17 +29,6 @@
 
 G_DEFINE_TYPE (GdkDeviceWin32, gdk_device_win32, GDK_TYPE_DEVICE)
 
-static gboolean
-gdk_device_win32_get_history (GdkDevice      *device,
-                              GdkSurface      *window,
-                              guint32         start,
-                              guint32         stop,
-                              GdkTimeCoord ***events,
-                              gint           *n_events)
-{
-  return FALSE;
-}
-
 static void
 gdk_device_win32_get_state (GdkDevice       *device,
                             GdkSurface       *window,
@@ -235,7 +224,6 @@ gdk_device_win32_class_init (GdkDeviceWin32Class *klass)
 {
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
-  device_class->get_history = gdk_device_win32_get_history;
   device_class->get_state = gdk_device_win32_get_state;
   device_class->set_surface_cursor = gdk_device_win32_set_surface_cursor;
   device_class->query_state = gdk_device_win32_query_state;

gdk/win32/gdkdevice-wintab.c

@@ -28,17 +28,6 @@
 
 G_DEFINE_TYPE (GdkDeviceWintab, gdk_device_wintab, GDK_TYPE_DEVICE)
 
-static gboolean
-gdk_device_wintab_get_history (GdkDevice      *device,
-                               GdkSurface      *window,
-                               guint32         start,
-                               guint32         stop,
-                               GdkTimeCoord ***events,
-                               gint           *n_events)
-{
-  return FALSE;
-}
-
 static GdkModifierType
 get_current_mask (void)
 {
@@ -267,7 +256,6 @@ gdk_device_wintab_class_init (GdkDeviceWintabClass *klass)
 {
   GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
 
-  device_class->get_history = gdk_device_wintab_get_history;
   device_class->get_state = gdk_device_wintab_get_state;
   device_class->set_surface_cursor = gdk_device_wintab_set_surface_cursor;
   device_class->query_state = gdk_device_wintab_query_state;

gtk/gtkcellarea.c

@@ -353,6 +353,7 @@
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
 #include "gtkstylecontext.h"
+#include "gtknative.h"
 
 #include <gobject/gvaluecollector.h>
 
@@ -1043,6 +1044,7 @@ gtk_cell_area_real_event (GtkCellArea          *area,
           GtkCellRenderer *focus_renderer;
           GdkRectangle     alloc_area;
           double event_x, event_y;
+          double nx, ny;
           double x, y;
           GtkNative *native;
 
@@ -1051,7 +1053,8 @@ gtk_cell_area_real_event (GtkCellArea          *area,
           gdk_event_get_position (event, &event_x, &event_y);
 
           native = gtk_widget_get_native (widget);
-          gtk_widget_translate_coordinates (GTK_WIDGET (native), widget, event_x, event_y, &x, &y);
+          gtk_native_get_surface_transform (native, &nx, &ny);
+          gtk_widget_translate_coordinates (GTK_WIDGET (native), widget, event_x - nx, event_y - ny, &x, &y);
           event_x = x;
           event_y = y;
 

gtk/gtkcellrenderertext.c

@@ -1527,7 +1527,6 @@ get_layout (GtkCellRendererText *celltext,
           uline = PANGO_UNDERLINE_DOUBLE;
           break;
 
-#if PANGO_VERSION_CHECK(1,45,0)
         case PANGO_UNDERLINE_SINGLE_LINE:
           uline = PANGO_UNDERLINE_DOUBLE_LINE;
           break;
@@ -1535,7 +1534,6 @@ get_layout (GtkCellRendererText *celltext,
         case PANGO_UNDERLINE_DOUBLE_LINE:
         case PANGO_UNDERLINE_ERROR_LINE:
           break;
-#endif
 
         case PANGO_UNDERLINE_DOUBLE:
         case PANGO_UNDERLINE_LOW:

gtk/gtkdragicon.c

@@ -25,7 +25,7 @@
 #include "gtkcssstyleprivate.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkcsstypesprivate.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 #include "gtkpicture.h"
 #include "gtkcssboxesimplprivate.h"
 #include "gtkcssnumbervalueprivate.h"

gtk/gtkdropdown.c

@@ -88,7 +88,11 @@
  *   </items>
  * </object>
  * ]|
-
+ *
+ * * # CSS nodes
+ *
+ * GtkDropDown has a single CSS node with name dropdown,
+ * with the button and popover nodes as children.
  */
 
 struct _GtkDropDown
@@ -526,7 +530,7 @@ gtk_drop_down_class_init (GtkDropDownClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, search_changed);
   gtk_widget_class_bind_template_callback (widget_class, search_stop);
 
-  gtk_widget_class_set_css_name (widget_class, I_("combobox"));
+  gtk_widget_class_set_css_name (widget_class, I_("dropdown"));
 }
 
 static void

gtk/gtklistbase.c

@@ -1389,10 +1389,9 @@ gtk_list_base_stop_rubberband (GtkListBase *self)
     }
   else
     {
-      if (!priv->rubberband->extend)
-        gtk_selection_model_unselect_all (model);
-
-      gtk_selection_model_select_callback (model, range_cb, priv->rubberband->active);
+      gtk_selection_model_select_callback (model,
+                                           !priv->rubberband->extend,
+                                           range_cb, priv->rubberband->active);
     }
 
   g_clear_pointer (&priv->rubberband, rubberband_data_free);

gtk/gtklistitemmanager.c

@@ -395,7 +395,6 @@ gtk_list_item_manager_add_items (GtkListItemManager *self,
 
   if (item == NULL || item->widget)
     item = gtk_rb_tree_insert_before (self->items, item);
-
   item->n_items += n_items;
   gtk_rb_tree_node_mark_dirty (item);
 
@@ -570,12 +569,6 @@ gtk_list_item_manager_ensure_items (GtkListItemManager *self,
     gtk_list_item_manager_release_list_item (self, NULL, widget);
 }
 
-static void
-gtk_list_item_manager_model_selection_changed_cb (GListModel         *model,
-                                                  guint               position,
-                                                  guint               n_items,
-                                                  GtkListItemManager *self);
-
 static void
 gtk_list_item_manager_model_items_changed_cb (GListModel         *model,
                                               guint               position,
@@ -742,8 +735,6 @@ gtk_list_item_manager_model_items_changed_cb (GListModel         *model,
 
   g_hash_table_unref (change);
 
-  gtk_list_item_manager_model_selection_changed_cb (model, position, added, self);
-
   gtk_widget_queue_resize (self->widget);
 }
 
@@ -988,7 +979,7 @@ gtk_list_item_manager_try_reacquire_list_item (GtkListItemManager *self,
       gtk_list_item_widget_update (list_item,
                                    position,
                                    gtk_list_item_widget_get_item (list_item),
-                                   gtk_list_item_widget_get_selected (list_item));
+                                   gtk_selection_model_is_selected (self->model, position));
       gtk_widget_insert_after (result, self->widget, prev_sibling);
       /* XXX: Should we let the listview do this? */
       gtk_widget_queue_resize (result);

gtk/gtkmain.c

@@ -96,7 +96,7 @@
 #include "gsk/gskprivate.h"
 #include "gsk/gskrendernodeprivate.h"
 #include "gtkarrayimplprivate.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 
 #include <locale.h>
 

gtk/gtkmultiselection.c

@@ -175,6 +175,7 @@ gtk_multi_selection_unselect_all (GtkSelectionModel *model)
 
 static gboolean
 gtk_multi_selection_add_or_remove (GtkSelectionModel    *model,
+                                   gboolean              unselect_rest,
                                    gboolean              add,
                                    GtkSelectionCallback  callback,
                                    gpointer              data)
@@ -190,6 +191,13 @@ gtk_multi_selection_add_or_remove (GtkSelectionModel    *model,
   min = G_MAXUINT;
   max = 0;
 
+  if (unselect_rest)
+    {
+      min = gtk_set_get_min (self->selected);
+      max = gtk_set_get_max (self->selected);
+      gtk_set_remove_all (self->selected);
+    }
+
   for (pos = 0; pos < n; pos = start + n_items)
     {
       callback (pos, &start, &n_items, &in, data);
@@ -223,10 +231,11 @@ gtk_multi_selection_add_or_remove (GtkSelectionModel    *model,
 
 static gboolean
 gtk_multi_selection_select_callback (GtkSelectionModel    *model,
+                                     gboolean              unselect_rest,
                                      GtkSelectionCallback  callback,
                                      gpointer              data)
 {
-  return gtk_multi_selection_add_or_remove (model, TRUE, callback, data);
+  return gtk_multi_selection_add_or_remove (model, unselect_rest, TRUE, callback, data);
 }
 
 static gboolean
@@ -234,7 +243,7 @@ gtk_multi_selection_unselect_callback (GtkSelectionModel    *model,
                                        GtkSelectionCallback  callback,
                                        gpointer              data)
 {
-  return gtk_multi_selection_add_or_remove (model, FALSE, callback, data);
+  return gtk_multi_selection_add_or_remove (model, FALSE, FALSE, callback, data);
 }
 
 static void

gtk/gtknative.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gdk/gdk-private.h"

gtk/gtknativeprivate.h

@@ -1,10 +0,0 @@
-#ifndef __GTK_NATIVE_PRIVATE_H__
-#define __GTK_NATIVE_PRIVATE_H__
-
-#include "gtknative.h"
-
-G_BEGIN_DECLS
-
-G_END_DECLS
-
-#endif /* __GTK_NATIVE_PRIVATE_H__ */

gtk/gtkpango.c

@@ -1241,7 +1241,6 @@ attribute_from_text (GtkBuilder  *builder,
       if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
         attribute = pango_attr_background_alpha_new ((guint16)g_value_get_int (&val));
       break;
-#if PANGO_VERSION_CHECK(1,44,0)
     case PANGO_ATTR_ALLOW_BREAKS:
       if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
         attribute = pango_attr_allow_breaks_new (g_value_get_boolean (&val));
@@ -1254,8 +1253,6 @@ attribute_from_text (GtkBuilder  *builder,
       if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
         attribute = pango_attr_insert_hyphens_new (g_value_get_boolean (&val));
       break;
-#endif
-#if PANGO_VERSION_CHECK(1,45,0)
     case PANGO_ATTR_OVERLINE:
       if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_OVERLINE, value, &val, NULL))
         attribute = pango_attr_overline_new (g_value_get_enum (&val));
@@ -1269,7 +1266,6 @@ attribute_from_text (GtkBuilder  *builder,
                                                      color->blue * 65535);
         }
       break;
-#endif
     case PANGO_ATTR_INVALID:
     default:
       break;

gtk/gtkplacessidebar.c

@@ -890,19 +890,20 @@ create_cloud_provider_account_row (GtkPlacesSidebar      *sidebar,
 {
   GIcon *end_icon;
   GIcon *start_icon;
+  const gchar *mount_path;
+  const gchar *name;
   gchar *mount_uri;
-  gchar *name;
   gchar *tooltip;
   guint provider_account_status;
 
   start_icon = cloud_providers_account_get_icon (account);
   name = cloud_providers_account_get_name (account);
   provider_account_status = cloud_providers_account_get_status (account);
-  mount_uri = cloud_providers_account_get_path (account);
+  mount_path = cloud_providers_account_get_path (account);
   if (start_icon != NULL
       && name != NULL
       && provider_account_status != CLOUD_PROVIDERS_ACCOUNT_STATUS_INVALID
-      && mount_uri != NULL)
+      && mount_path != NULL)
     {
       switch (provider_account_status)
         {
@@ -922,7 +923,7 @@ create_cloud_provider_account_row (GtkPlacesSidebar      *sidebar,
             return FALSE;
         }
 
-      mount_uri = g_strconcat ("file://", mount_uri, NULL);
+      mount_uri = g_strconcat ("file://", mount_path, NULL);
 
       /* translators: %s is the name of a cloud provider for files */
       tooltip = g_strdup_printf (_("Open %s"), name);
@@ -933,6 +934,9 @@ create_cloud_provider_account_row (GtkPlacesSidebar      *sidebar,
                  NULL, NULL, NULL, account, 0,
                  tooltip);
 
+      g_free (tooltip);
+      g_free (mount_uri);
+      g_object_unref (end_icon);
       return TRUE;
     }
   else
@@ -3155,8 +3159,8 @@ build_popup_menu_using_gmenu (GtkSidebarRow *row)
       if (sidebar->popover)
         gtk_widget_unparent (sidebar->popover);
 
-      sidebar->popover = gtk_popover_new_from_model (GTK_WIDGET (sidebar),
-                                                     G_MENU_MODEL (menu));
+      sidebar->popover = gtk_popover_menu_new_from_model (G_MENU_MODEL (menu));
+      gtk_widget_set_parent (sidebar->popover, GTK_WIDGET (sidebar));
       g_signal_connect (sidebar->popover, "destroy",
                         G_CALLBACK (on_row_popover_destroy), sidebar);
       g_object_unref (sidebar);

gtk/gtkpopover.c

@@ -122,7 +122,7 @@
 #include "gtkbuildable.h"
 #include "gtktooltipprivate.h"
 #include "gtkcssboxesimplprivate.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 
 #include "gtkrender.h"
 #include "gtkstylecontextprivate.h"

gtk/gtkpropertyselection.c

@@ -210,16 +210,24 @@ gtk_property_selection_unselect_all (GtkSelectionModel *model)
 
 static gboolean
 gtk_property_selection_add_or_remove (GtkSelectionModel    *model,
+                                      gboolean              unselect_rest,
                                       gboolean              add,
                                       GtkSelectionCallback  callback,
                                       gpointer              data)
 {
   GtkPropertySelection *self = GTK_PROPERTY_SELECTION (model);
-  guint pos, start, n;
+  guint pos, start, n, n_items;
   gboolean in;
   guint min, max;
   guint i;
 
+  n_items = g_list_model_get_n_items (G_LIST_MODEL (self));
+  if (unselect_rest)
+    {
+      for (i = 0; i < n_items; i++)
+        set_selected (self, i, FALSE);
+    }
+
   min = G_MAXUINT;
   max = 0;
 
@@ -241,7 +249,10 @@ gtk_property_selection_add_or_remove (GtkSelectionModel    *model,
     }
   while (n > 0);
 
-  if (min <= max)
+  /* FIXME: do better here */
+  if (unselect_rest)
+    gtk_selection_model_selection_changed (model, 0, n_items);
+  else if (min <= max)
     gtk_selection_model_selection_changed (model, min, max - min + 1);
 
   return TRUE;
@@ -249,10 +260,11 @@ gtk_property_selection_add_or_remove (GtkSelectionModel    *model,
 
 static gboolean
 gtk_property_selection_select_callback (GtkSelectionModel    *model,
+                                        gboolean              unselect_rest,
                                         GtkSelectionCallback  callback,
                                         gpointer              data)
 {
-  return gtk_property_selection_add_or_remove (model, TRUE, callback, data);
+  return gtk_property_selection_add_or_remove (model, unselect_rest, TRUE, callback, data);
 }
 
 static gboolean
@@ -260,7 +272,7 @@ gtk_property_selection_unselect_callback (GtkSelectionModel    *model,
                                           GtkSelectionCallback  callback,
                                           gpointer              data)
 {
-  return gtk_property_selection_add_or_remove (model, FALSE, callback, data);
+  return gtk_property_selection_add_or_remove (model, FALSE, FALSE, callback, data);
 }
 
 static void

gtk/gtkselectionmodel.c

@@ -85,7 +85,7 @@ gtk_selection_model_default_is_selected (GtkSelectionModel *model,
 static gboolean
 gtk_selection_model_default_select_item (GtkSelectionModel *model,
                                          guint              position,
-                                         gboolean           exclusive)
+                                         gboolean           unselect_rest)
 {
   return FALSE;
 }
@@ -100,7 +100,7 @@ static gboolean
 gtk_selection_model_default_select_range (GtkSelectionModel *model,
                                           guint              position,
                                           guint              n_items,
-                                          gboolean           exclusive)
+                                          gboolean           unselect_rest)
 {
   return FALSE;
 }
@@ -115,6 +115,7 @@ gtk_selection_model_default_unselect_range (GtkSelectionModel *model,
 
 static gboolean
 gtk_selection_model_default_select_callback (GtkSelectionModel    *model,
+                                             gboolean              unselect_rest,
                                              GtkSelectionCallback  callback,
                                              gpointer              data)
 {
@@ -228,21 +229,21 @@ gtk_selection_model_is_selected (GtkSelectionModel *model,
  * gtk_selection_model_select_item:
  * @model: a #GtkSelectionModel
  * @position: the position of the item to select
- * @exclusive: whether previously selected items should be unselected
+ * @unselect_rest: whether previously selected items should be unselected
  *
  * Requests to select an item in the model.
  */
 gboolean
 gtk_selection_model_select_item (GtkSelectionModel *model,
                                  guint              position,
-                                 gboolean           exclusive)
+                                 gboolean           unselect_rest)
 {
   GtkSelectionModelInterface *iface;
 
   g_return_val_if_fail (GTK_IS_SELECTION_MODEL (model), 0);
 
   iface = GTK_SELECTION_MODEL_GET_IFACE (model);
-  return iface->select_item (model, position, exclusive);
+  return iface->select_item (model, position, unselect_rest);
 }
 
 /**
@@ -269,7 +270,7 @@ gtk_selection_model_unselect_item (GtkSelectionModel *model,
  * @model: a #GtkSelectionModel
  * @position: the first item to select
  * @n_items: the number of items to select
- * @exclusive: whether previously selected items should be unselected
+ * @unselect_rest: whether previously selected items should be unselected
  *
  * Requests to select a range of items in the model.
  */
@@ -277,14 +278,14 @@ gboolean
 gtk_selection_model_select_range (GtkSelectionModel *model,
                                   guint              position,
                                   guint              n_items,
-                                  gboolean           exclusive)
+                                  gboolean           unselect_rest)
 {
   GtkSelectionModelInterface *iface;
 
   g_return_val_if_fail (GTK_IS_SELECTION_MODEL (model), 0);
 
   iface = GTK_SELECTION_MODEL_GET_IFACE (model);
-  return iface->select_range (model, position, n_items, exclusive);
+  return iface->select_range (model, position, n_items, unselect_rest);
 }
 
 /**
@@ -345,7 +346,8 @@ gtk_selection_model_unselect_all (GtkSelectionModel *model)
 /**
  * gtk_selection_model_select_callback:
  * @model: a #GtkSelectionModel
- * @callback: a #GtkSelectionCallback to determine items to select
+ * @unselect_rest: whether previously selected items should be unselected
+ * @callback: (scope call): a #GtkSelectionCallback to determine items to select
  * @data: data to pass to @callback
  *
  * Requests to select all items for which @callback returns
@@ -353,18 +355,19 @@ gtk_selection_model_unselect_all (GtkSelectionModel *model)
  */
 gboolean
 gtk_selection_model_select_callback (GtkSelectionModel    *model,
+                                     gboolean              unselect_rest,
                                      GtkSelectionCallback  callback,
                                      gpointer              data)
 {
   g_return_val_if_fail (GTK_IS_SELECTION_MODEL (model), FALSE);
 
-  return GTK_SELECTION_MODEL_GET_IFACE (model)->select_callback (model, callback, data);
+  return GTK_SELECTION_MODEL_GET_IFACE (model)->select_callback (model, unselect_rest, callback, data);
 }
 
 /**
  * gtk_selection_model_unselect_callback:
  * @model: a #GtkSelectionModel
- * @callback: a #GtkSelectionCallback to determine items to select
+ * @callback: (scope call): a #GtkSelectionCallback to determine items to select
  * @data: data to pass to @callback
  *
  * Requests to unselect all items for which @callback returns

gtk/gtkselectionmodel.h

@@ -97,19 +97,20 @@ struct _GtkSelectionModelInterface
 
   gboolean              (* select_item)                         (GtkSelectionModel      *model,
                                                                  guint                   position,
-                                                                 gboolean                exclusive);
+                                                                 gboolean                unselect_rest);
   gboolean              (* unselect_item)                       (GtkSelectionModel      *model,
                                                                  guint                   position);
   gboolean              (* select_range)                        (GtkSelectionModel      *model,
                                                                  guint                   position,
                                                                  guint                   n_items,
-                                                                 gboolean                exclusive);
+                                                                 gboolean                unselect_rest);
   gboolean              (* unselect_range)                      (GtkSelectionModel      *model,
                                                                  guint                   position,
                                                                  guint                   n_items);
   gboolean              (* select_all)                          (GtkSelectionModel      *model);
   gboolean              (* unselect_all)                        (GtkSelectionModel      *model);
   gboolean              (* select_callback)                     (GtkSelectionModel      *model,
+                                                                 gboolean                unselect_rest,
                                                                  GtkSelectionCallback    callback,
                                                                  gpointer                data);
   gboolean              (* unselect_callback)                   (GtkSelectionModel      *model,
@@ -129,7 +130,7 @@ gboolean                gtk_selection_model_is_selected         (GtkSelectionMod
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_selection_model_select_item         (GtkSelectionModel      *model,
                                                                  guint                   position,
-                                                                 gboolean                exclusive);
+                                                                 gboolean                unselect_rest);
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_selection_model_unselect_item       (GtkSelectionModel      *model,
                                                                  guint                   position);
@@ -137,7 +138,7 @@ GDK_AVAILABLE_IN_ALL
 gboolean                gtk_selection_model_select_range        (GtkSelectionModel      *model,
                                                                  guint                   position,
                                                                  guint                   n_items,
-                                                                 gboolean                exclusive);
+                                                                 gboolean                unselect_rest);
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_selection_model_unselect_range      (GtkSelectionModel      *model,
                                                                  guint                   position,
@@ -149,6 +150,7 @@ gboolean                gtk_selection_model_unselect_all        (GtkSelectionMod
 
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_selection_model_select_callback     (GtkSelectionModel      *model,
+                                                                 gboolean                unselect_rest,
                                                                  GtkSelectionCallback    callback,
                                                                  gpointer                data);
 GDK_AVAILABLE_IN_ALL

gtk/gtktextbuffer.c

@@ -4772,7 +4772,6 @@ get_tag_for_attributes (PangoAttrIterator *iter)
       g_object_set (tag, "underline-rgba", &rgba, NULL);
     }
 
-#if PANGO_VERSION_CHECK(1,45,0)
   attr = pango_attr_iterator_get (iter, PANGO_ATTR_OVERLINE);
   if (attr)
     g_object_set (tag, "overline", ((PangoAttrInt*)attr)->value, NULL);
@@ -4790,7 +4789,6 @@ get_tag_for_attributes (PangoAttrIterator *iter)
       rgba.alpha = 1.;
       g_object_set (tag, "overline-rgba", &rgba, NULL);
     }
-#endif
 
   attr = pango_attr_iterator_get (iter, PANGO_ATTR_STRIKETHROUGH);
   if (attr)

gtk/gtktextlayout.c

@@ -1597,7 +1597,6 @@ add_generic_attrs (GtkTextLayout      *layout,
       pango_attr_list_insert (attrs, attr);
     }
 
-#if PANGO_VERSION_CHECK(1,45,0)
   if (appearance->overline != PANGO_OVERLINE_NONE)
     {
       attr = pango_attr_overline_new (appearance->overline);
@@ -1619,7 +1618,6 @@ add_generic_attrs (GtkTextLayout      *layout,
 
       pango_attr_list_insert (attrs, attr);
     }
-#endif
 
   if (appearance->strikethrough)
     {
@@ -2140,7 +2138,6 @@ add_preedit_attrs (GtkTextLayout     *layout,
 		gdk_rgba_free (appearance.underline_rgba);
 	      appearance.underline_rgba = gdk_rgba_copy (&rgba);
 	      break;
-#if PANGO_VERSION_CHECK(1,45,0)
 	    case PANGO_ATTR_OVERLINE:
 	      appearance.overline = ((PangoAttrInt *)attr)->value;
 	      break;
@@ -2150,7 +2147,6 @@ add_preedit_attrs (GtkTextLayout     *layout,
 		gdk_rgba_free (appearance.overline_rgba);
 	      appearance.overline_rgba = gdk_rgba_copy (&rgba);
 	      break;
-#endif
 	    case PANGO_ATTR_STRIKETHROUGH:
 	      appearance.strikethrough = ((PangoAttrInt *)attr)->value;
 	      break;

gtk/gtktexttag.c

@@ -117,10 +117,8 @@ enum {
   PROP_RIGHT_MARGIN,
   PROP_UNDERLINE,
   PROP_UNDERLINE_RGBA,
-#if PANGO_VERSION_CHECK(1,45,0)
   PROP_OVERLINE,
   PROP_OVERLINE_RGBA,
-#endif
   PROP_RISE,
   PROP_BACKGROUND_FULL_HEIGHT,
   PROP_LANGUAGE,
@@ -161,10 +159,8 @@ enum {
   PROP_RIGHT_MARGIN_SET,
   PROP_UNDERLINE_SET,
   PROP_UNDERLINE_RGBA_SET,
-#if PANGO_VERSION_CHECK(1,45,0)
   PROP_OVERLINE_SET,
   PROP_OVERLINE_RGBA_SET,
-#endif
   PROP_RISE_SET,
   PROP_BACKGROUND_FULL_HEIGHT_SET,
   PROP_LANGUAGE_SET,
@@ -514,7 +510,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                        GDK_TYPE_RGBA,
                                                        GTK_PARAM_READWRITE));
 
-#if PANGO_VERSION_CHECK(1,45,0)
   g_object_class_install_property (object_class,
                                    PROP_OVERLINE,
                                    g_param_spec_enum ("overline",
@@ -531,7 +526,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                        P_("Color of overline for this text"),
                                                        GDK_TYPE_RGBA,
                                                        GTK_PARAM_READWRITE));
-#endif
 
   /**
    * GtkTextTag:strikethrough-rgba:
@@ -793,7 +787,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                 P_("Underline RGBA set"),
                 P_("Whether this tag affects underlining color"));
 
-#if PANGO_VERSION_CHECK(1,45,0)
   ADD_SET_PROP ("overline-set", PROP_OVERLINE_SET,
                 P_("Overline set"),
                 P_("Whether this tag affects overlining"));
@@ -801,7 +794,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
   ADD_SET_PROP ("overline-rgba-set", PROP_OVERLINE_RGBA_SET,
                 P_("Overline RGBA set"),
                 P_("Whether this tag affects overlining color"));
-#endif
 
   /**
    * GtkTextTag:strikethrough-rgba-set:
@@ -929,7 +921,6 @@ set_underline_rgba (GtkTextTag    *tag,
     }
 }
 
-#if PANGO_VERSION_CHECK(1,45,0)
 static void
 set_overline_rgba (GtkTextTag    *tag,
                    const GdkRGBA *rgba)
@@ -959,7 +950,6 @@ set_overline_rgba (GtkTextTag    *tag,
         }
     }
 }
-#endif
 
 static void
 set_strikethrough_rgba (GtkTextTag    *tag,
@@ -1485,7 +1475,6 @@ gtk_text_tag_set_property (GObject      *object,
       }
       break;
 
-#if PANGO_VERSION_CHECK(1,45,0)
     case PROP_OVERLINE:
       priv->overline_set = TRUE;
       priv->values->appearance.overline = g_value_get_enum (value);
@@ -1498,7 +1487,6 @@ gtk_text_tag_set_property (GObject      *object,
         set_overline_rgba (text_tag, color);
       }
       break;
-#endif
 
     case PROP_RISE:
       priv->rise_set = TRUE;
@@ -1702,7 +1690,6 @@ gtk_text_tag_set_property (GObject      *object,
       priv->underline_rgba_set = g_value_get_boolean (value);
       break;
 
-#if PANGO_VERSION_CHECK(1,45,0)
     case PROP_OVERLINE_SET:
       priv->overline_set = g_value_get_boolean (value);
       break;
@@ -1710,7 +1697,6 @@ gtk_text_tag_set_property (GObject      *object,
     case PROP_OVERLINE_RGBA_SET:
       priv->overline_rgba_set = g_value_get_boolean (value);
       break;
-#endif
 
     case PROP_RISE_SET:
       priv->rise_set = g_value_get_boolean (value);
@@ -1913,7 +1899,6 @@ gtk_text_tag_get_property (GObject      *object,
         g_value_set_boxed (value, priv->values->appearance.underline_rgba);
       break;
 
-#if PANGO_VERSION_CHECK(1,45,0)
     case PROP_OVERLINE:
       g_value_set_enum (value, priv->values->appearance.overline);
       break;
@@ -1922,7 +1907,6 @@ gtk_text_tag_get_property (GObject      *object,
       if (priv->overline_rgba_set)
         g_value_set_boxed (value, priv->values->appearance.overline_rgba);
       break;
-#endif
 
     case PROP_RISE:
       g_value_set_int (value, priv->values->appearance.rise);
@@ -2056,7 +2040,6 @@ gtk_text_tag_get_property (GObject      *object,
       g_value_set_boolean (value, priv->underline_rgba_set);
       break;
 
-#if PANGO_VERSION_CHECK(1,45,0)
     case PROP_OVERLINE_SET:
       g_value_set_boolean (value, priv->overline_set);
       break;
@@ -2064,7 +2047,6 @@ gtk_text_tag_get_property (GObject      *object,
     case PROP_OVERLINE_RGBA_SET:
       g_value_set_boolean (value, priv->overline_rgba_set);
       break;
-#endif
 
     case PROP_RISE_SET:
       g_value_set_boolean (value, priv->rise_set);

gtk/gtktextview.c

@@ -53,7 +53,7 @@
 #include "gtkmagnifierprivate.h"
 #include "gtkemojichooser.h"
 #include "gtkpango.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 #include "gtkwidgetprivate.h"
 
 #include "a11y/gtktextviewaccessibleprivate.h"

gtk/gtktooltip.c

@@ -35,7 +35,7 @@
 #include "gtkwindowprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkaccessible.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 
 /**
  * SECTION:gtktooltip

gtk/gtkwidget.c

@@ -49,7 +49,7 @@
 #include "gtklayoutmanagerprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 #include "gtkpopover.h"
 #include "gtkprivate.h"
 #include "gtkrenderbackgroundprivate.h"

gtk/gtkwindow.c

@@ -51,7 +51,7 @@
 #include "gtkpointerfocusprivate.h"
 #include "gtkprivate.h"
 #include "gtkroot.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 #include "gtksettings.h"
 #include "gtkshortcut.h"
 #include "gtkshortcutcontroller.h"

gtk/gtkwindowhandle.c

@@ -28,7 +28,7 @@
 #include "gtkgestureprivate.h"
 #include "gtkintl.h"
 #include "gtkmodelbuttonprivate.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 #include "gtkpopovermenuprivate.h"
 #include "gtkprivate.h"
 #include "gtkseparator.h"

gtk/inspector/focusoverlay.c

@@ -24,7 +24,7 @@
 #include "gtkintl.h"
 #include "gtkwidget.h"
 #include "gtkroot.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 
 struct _GtkFocusOverlay
 {

gtk/inspector/inspect-button.c

@@ -34,7 +34,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkeventcontrollerkey.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 #include "gtkwindowprivate.h"
 
 static GtkWidget *

gtk/inspector/layoutoverlay.c

@@ -5,7 +5,7 @@
 #include "gtkcssstyleprivate.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkcssnumbervalueprivate.h"
-#include "gtknativeprivate.h"
+#include "gtknative.h"
 
 struct _GtkLayoutOverlay
 {

meson.build

@@ -37,7 +37,7 @@ wayland_proto_req  = '>= 1.20'
 wayland_req        = '>= 1.14.91'
 graphene_req       = '>= 1.9.1'
 epoxy_req          = '>= 1.4'
-cloudproviders_req = '>= 0.2.5'
+cloudproviders_req = '>= 0.3.1'
 xkbcommon_req      = '>= 0.2.0'
 
 gnome = import('gnome')
@@ -666,7 +666,15 @@ endif
 
 cloudproviders_enabled = get_option('cloudproviders')
 if cloudproviders_enabled
-  cloudproviders_dep = dependency('cloudproviders', required: true)
+  cloudproviders_dep = dependency('cloudproviders',
+    version: cloudproviders_req,
+    fallback: [
+      'libcloudproviders',
+      'libcloudproviders_dep',
+    ],
+    default_options: [
+      'vapigen=false',
+    ])
   if cloudproviders_dep.found()
     cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
   else

po-properties/POTFILES.in

@@ -253,6 +253,7 @@ gtk/gtkprintoperation-win32.c
 gtk/gtkprintunixdialog.c
 gtk/gtkprogressbar.c
 gtk/gtkpropertylookuplistmodel.c
+gtk/gtkpropertyselection.c
 gtk/gtkradiobutton.c
 gtk/gtkrange.c
 gtk/gtkrecentmanager.c

po-properties/ca.po

@@ -2216,7 +2216,7 @@ msgstr "Valor inicial"
 
 #: gtk/gtkcssstyleproperty.c:201
 msgid "The initial specified value used for this property"
-msgstr "El valor inicial especificat que s'utilitza per aquesta propietat"
+msgstr "El valor inicial especificat que s'utilitza per a aquesta propietat"
 
 #: gtk/gtkdragicon.c:373
 #, fuzzy
@@ -7013,7 +7013,7 @@ msgstr "El model del fill"
 
 #: gtk/gtktreemodelfilter.c:533
 msgid "The model for the filtermodel to filter"
-msgstr "El model per al model de filtre que filtrar"
+msgstr "El model per al model de filtre a filtrar"
 
 #: gtk/gtktreemodelfilter.c:540
 msgid "The virtual root"

po-properties/uk.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-06 12:03+0000\n"
-"PO-Revision-Date: 2020-06-06 16:43+0300\n"
+"POT-Creation-Date: 2020-06-07 07:28+0000\n"
+"PO-Revision-Date: 2020-06-07 11:50+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -871,7 +871,6 @@ msgid "Bytes"
 msgstr "Байти"
 
 #: gtk/gtkbuilderlistitemfactory.c:270
-#| msgid "Merged UI definition"
 msgid "bytes containing the UI definition"
 msgstr "байти, які містять визначення інтерфейсу користувача"
 
@@ -880,7 +879,6 @@ msgid "Resource"
 msgstr "Ресурс"
 
 #: gtk/gtkbuilderlistitemfactory.c:282
-#| msgid "Merged UI definition"
 msgid "resource containing the UI definition"
 msgstr "ресурс, який містить визначення інтерфейсу користувача"
 
@@ -1215,9 +1213,9 @@ msgstr "Чи встановлено колір тла комірки"
 #: gtk/gtkcellrenderercombo.c:136 gtk/gtkcolumnview.c:628 gtk/gtkdropdown.c:467
 #: gtk/gtkfilterlistmodel.c:684 gtk/gtkflattenlistmodel.c:438
 #: gtk/gtkgridview.c:1087 gtk/gtklistview.c:843 gtk/gtkmaplistmodel.c:404
-#: gtk/gtkmultiselection.c:359 gtk/gtkshortcutcontroller.c:539
-#: gtk/gtkslicelistmodel.c:287 gtk/gtksortlistmodel.c:394
-#: gtk/gtktreelistmodel.c:716
+#: gtk/gtkmultiselection.c:372 gtk/gtkpropertyselection.c:441
+#: gtk/gtkshortcutcontroller.c:539 gtk/gtkslicelistmodel.c:287
+#: gtk/gtksortlistmodel.c:394 gtk/gtktreelistmodel.c:716
 msgid "Model"
 msgstr "Модель"
 
@@ -1945,22 +1943,18 @@ msgid "Whether the swatch should accept drops"
 msgstr "Чи прийматиме пробник події скидання"
 
 #: gtk/gtkcolumnview.c:616
-#| msgid "Column span"
 msgid "Columns"
 msgstr "Стовпчики"
 
 #: gtk/gtkcolumnview.c:617
-#| msgid "List of classes"
 msgid "List of columns"
 msgstr "Список стовпчиків"
 
 #: gtk/gtkcolumnview.c:629 gtk/gtkgridview.c:1088 gtk/gtklistview.c:844
-#| msgid "The sorting order of the items displayed"
 msgid "Model for the items displayed"
 msgstr "Модель для показаних пунктів"
 
 #: gtk/gtkcolumnview.c:640
-#| msgid "Show separators"
 msgid "Show row separators"
 msgstr "Показувати роздільники рядків"
 
@@ -1969,12 +1963,10 @@ msgid "Show separators between rows"
 msgstr "Показувати роздільники між рядками"
 
 #: gtk/gtkcolumnview.c:652
-#| msgid "Show separators"
 msgid "Show column separators"
 msgstr "Показувати роздільники стовпчиків"
 
 #: gtk/gtkcolumnview.c:653
-#| msgid "Show separators between rows"
 msgid "Show separators between columns"
 msgstr "Показувати роздільники між стовпчиками"
 
@@ -1992,7 +1984,6 @@ msgid "Single click activate"
 msgstr "Активація одним клацанням"
 
 #: gtk/gtkcolumnview.c:677 gtk/gtkgridview.c:1100 gtk/gtklistview.c:868
-#| msgid "Activate row on a single click"
 msgid "Activate rows on single click"
 msgstr "Активувати рядки одинарним клацанням"
 
@@ -2002,24 +1993,18 @@ msgid "Reorderable"
 msgstr "Дозволено перестановку"
 
 #: gtk/gtkcolumnview.c:689
-#| msgid "Whether the column can be reordered around the headers"
 msgid "Whether columns are reorderable"
 msgstr "Чи можна змінювати порядок стовпчиків"
 
 #: gtk/gtkcolumnview.c:700 gtk/gtkgridview.c:1111 gtk/gtklistview.c:879
-#| msgid "Inline selection"
 msgid "Enable rubberband selection"
 msgstr "Увімкнути еластичне позначення"
 
 #: gtk/gtkcolumnview.c:701 gtk/gtkgridview.c:1112 gtk/gtklistview.c:880
-#| msgid ""
-#| "Whether to enable selection of multiple items by dragging the mouse "
-#| "pointer"
 msgid "Allow selecting items by dragging with the mouse"
 msgstr "Дозволити позначення пунктів перетягуванням вказівника миші"
 
 #: gtk/gtkcolumnviewcolumn.c:234
-#| msgid "Column spacing"
 msgid "Column view"
 msgstr "Перегляд стовпцями"
 
@@ -2038,7 +2023,6 @@ msgid "Factory for populating list items"
 msgstr "Фабрика для заповнення пунктів списку"
 
 #: gtk/gtkcolumnviewcolumn.c:259
-#| msgid "Text to be displayed in the progress bar"
 msgid "Title displayed in the header"
 msgstr "Назва, яку показано у заголовку"
 
@@ -2052,17 +2036,14 @@ msgid "Visible"
 msgstr "Видима"
 
 #: gtk/gtkcolumnviewcolumn.c:283
-#| msgid "Whether the action is visible."
 msgid "Whether this column is visible"
 msgstr "Чи буде цей стовпчик видимим"
 
 #: gtk/gtkcolumnviewcolumn.c:294
-#| msgid "Header image"
 msgid "Header menu"
 msgstr "Меню заголовка"
 
 #: gtk/gtkcolumnviewcolumn.c:295
-#| msgid "The title of this tray icon"
 msgid "Menu to use on the title of this column"
 msgstr "Меню, яким слід скористатися для заголовка цього стовпчика"
 
@@ -2072,22 +2053,18 @@ msgid "Resizable"
 msgstr "Розмір можна змінювати"
 
 #: gtk/gtkcolumnviewcolumn.c:307
-#| msgid "Whether the action is enabled."
 msgid "Whether this column is resizable"
 msgstr "Чи можна змінювати розміри цього стовпчика"
 
 #: gtk/gtkcolumnviewcolumn.c:319
-#| msgid "Column gets share of extra width allocated to the widget"
 msgid "column gets share of extra width"
 msgstr "стовпчик отримує частину додаткової ширини"
 
 #: gtk/gtkcolumnviewcolumn.c:331
-#| msgid "Fixed Width"
 msgid "Fixed width"
 msgstr "Фіксована ширина"
 
 #: gtk/gtkcolumnviewcolumn.c:332
-#| msgid "Current fixed width of the column"
 msgid "Fixed width of this column"
 msgstr "Фіксована ширина цього стовпчика"
 
@@ -2315,17 +2292,14 @@ msgid "The initial specified value used for this property"
 msgstr "Початкове вказане значення потрібне для властивості"
 
 #: gtk/gtkdirectorylist.c:239
-#| msgid "Attributes"
 msgid "attributes"
 msgstr "атрибути"
 
 #: gtk/gtkdirectorylist.c:240
-#| msgid "Attributes"
 msgid "Attributes to query"
 msgstr "Атрибути для запиту"
 
 #: gtk/gtkdirectorylist.c:251
-#| msgid "Error"
 msgid "error"
 msgstr "помилка"
 
@@ -2339,7 +2313,6 @@ msgid "File"
 msgstr "Файл"
 
 #: gtk/gtkdirectorylist.c:264
-#| msgid "The title to display"
 msgid "The file to query"
 msgstr "Файл для запиту"
 
@@ -2365,12 +2338,10 @@ msgid "The type of elements of this object"
 msgstr "Тип елементів цього об'єкта"
 
 #: gtk/gtkdirectorylist.c:299
-#| msgid "Loading"
 msgid "loading"
 msgstr "завантаження"
 
 #: gtk/gtkdirectorylist.c:300
-#| msgid "TRUE if this printer is paused"
 msgid "TRUE if files are being loaded"
 msgstr "TRUE, якщо файли завантажуються"
 
@@ -2439,31 +2410,27 @@ msgid "List Factory"
 msgstr "Фабрика списку"
 
 #: gtk/gtkdropdown.c:468
-#| msgid "The model for the filtermodel to filter"
 msgid "Model for the displayed items"
 msgstr "Модель для показаних пунктів"
 
-#: gtk/gtkdropdown.c:480 gtk/gtklistitem.c:233 gtk/gtksingleselection.c:439
+#: gtk/gtkdropdown.c:480 gtk/gtklistitem.c:233 gtk/gtksingleselection.c:444
 msgid "Selected"
 msgstr "Позначений"
 
-#: gtk/gtkdropdown.c:481 gtk/gtksingleselection.c:440
+#: gtk/gtkdropdown.c:481 gtk/gtksingleselection.c:445
 msgid "Position of the selected item"
 msgstr "Розташування позначеного пункту"
 
 #: gtk/gtkdropdown.c:494
-#| msgid "Enable Search"
 msgid "Enable search"
 msgstr "Дозволено пошук"
 
 #: gtk/gtkdropdown.c:495
-#| msgid "Whether to show a sort indicator"
 msgid "Whether to show a search entry in the popup"
 msgstr "Чи слід показувати запис пошуку у контекстній підказці"
 
 #: gtk/gtkdropdown.c:509 gtk/gtknumericsorter.c:282 gtk/gtkstringfilter.c:252
 #: gtk/gtkstringsorter.c:218
-#| msgid "Permission"
 msgid "Expression"
 msgstr "Вираз"
 
@@ -3309,7 +3276,7 @@ msgstr "Коефіцієнт затримки"
 msgid "Factor by which to modify the default timeout"
 msgstr "Коефіцієнт, за допомогою якого змінюється типовий час очікування"
 
-#: gtk/gtkgesturepan.c:236 gtk/gtklistbase.c:1149 gtk/gtkorientable.c:60
+#: gtk/gtkgesturepan.c:236 gtk/gtklistbase.c:1154 gtk/gtkorientable.c:60
 msgid "Orientation"
 msgstr "Орієнтація"
 
@@ -3452,22 +3419,18 @@ msgid "The number of rows that a child spans"
 msgstr "Кількість рядків, які займає дочірній об'єкт"
 
 #: gtk/gtkgridview.c:1063
-#| msgid "Markup column"
 msgid "Max columns"
 msgstr "Макс. кількість стовпчиків"
 
 #: gtk/gtkgridview.c:1064
-#| msgid "Number of columns"
 msgid "Maximum number of columns per row"
 msgstr "Максимальна кількість стовпчиків на рядок"
 
 #: gtk/gtkgridview.c:1075
-#| msgid "Pixbuf column"
 msgid "Min columns"
 msgstr "Мін. кількість стовпчиків"
 
 #: gtk/gtkgridview.c:1076
-#| msgid "Number of columns"
 msgid "Minimum number of columns per row"
 msgstr "Мінімальна кількість стовпчиків на рядок"
 
@@ -3863,7 +3826,7 @@ msgstr "Відвіданий"
 msgid "Whether this link has been visited."
 msgstr "Чи це посилання було відвідано."
 
-#: gtk/gtklistbase.c:1150 gtk/gtkorientable.c:61
+#: gtk/gtklistbase.c:1155 gtk/gtkorientable.c:61
 msgid "The orientation of the orientable"
 msgstr "Орієнтація елемента"
 
@@ -3880,12 +3843,10 @@ msgid "Whether this row can be selected"
 msgstr "Чи можна позначати цей рядок"
 
 #: gtk/gtklistitem.c:174
-#| msgid "Whether the text can be modified by the user"
 msgid "If the item can be activated by the user"
 msgstr "Чи може користувач активувати пункт"
 
 #: gtk/gtklistitem.c:186
-#| msgid "Title widget to display"
 msgid "Widget used for display"
 msgstr "Віджет, який використано для показу"
 
@@ -3894,7 +3855,6 @@ msgid "Item"
 msgstr "Пункт"
 
 #: gtk/gtklistitem.c:198
-#| msgid "Display"
 msgid "Displayed item"
 msgstr "Показаний пункт"
 
@@ -3904,17 +3864,14 @@ msgid "Position"
 msgstr "Позиція"
 
 #: gtk/gtklistitem.c:210
-#| msgid "Position of the selected item"
 msgid "Position of the item"
 msgstr "Розташування пункту"
 
 #: gtk/gtklistitem.c:222
-#| msgid "Whether the text can be modified by the user"
 msgid "If the item can be selected by the user"
 msgstr "Чи може користувач позначати пункт"
 
 #: gtk/gtklistitem.c:234
-#| msgid "The item which is currently active"
 msgid "If the item is currently selected"
 msgstr "Чи позначено зараз якийсь пункт"
 
@@ -4270,7 +4227,7 @@ msgstr "Чи виводити діалог"
 msgid "The display where this window will be displayed."
 msgstr "Дисплей, на якому буде показано це вікно."
 
-#: gtk/gtkmultiselection.c:360
+#: gtk/gtkmultiselection.c:373 gtk/gtkpropertyselection.c:442
 msgid "List managed by this selection"
 msgstr "Список, який керується цим вибором"
 
@@ -4302,11 +4259,11 @@ msgstr "Прозорий для вікна"
 msgid "The transient parent of the dialog"
 msgstr "Прозорий батьківський віджет діалогу"
 
-#: gtk/gtknoselection.c:208 gtk/gtksingleselection.c:463
+#: gtk/gtknoselection.c:208 gtk/gtksingleselection.c:468
 msgid "The model"
 msgstr "Модель"
 
-#: gtk/gtknoselection.c:209 gtk/gtksingleselection.c:464
+#: gtk/gtknoselection.c:209 gtk/gtksingleselection.c:469
 msgid "The model being managed"
 msgstr "Модель, яка керується"
 
@@ -4458,7 +4415,6 @@ msgid "Sort order"
 msgstr "Порядок сортування"
 
 #: gtk/gtknumericsorter.c:294
-#| msgid "Whether to reserve space for a subtitle"
 msgid "Whether to sort smaller numbers first"
 msgstr "Чи слід упорядковувати із розташуванням малих чисел першими"
 
@@ -5185,6 +5141,15 @@ msgstr "Об'єкт"
 msgid "The root object"
 msgstr "Кореневий об'єкт"
 
+#: gtk/gtkpropertyselection.c:448
+#| msgid "Property name"
+msgid "Property"
+msgstr "Властивість"
+
+#: gtk/gtkpropertyselection.c:449
+msgid "Item property to store selection state in"
+msgstr "Властивість пункту, до якої слід записати стан позначення"
+
 #: gtk/gtkradiobutton.c:200
 msgid "Group"
 msgstr "Група"
@@ -6071,27 +6036,27 @@ msgstr "Другий"
 msgid "The second trigger to check"
 msgstr "Другий перемикач для перевірки"
 
-#: gtk/gtksingleselection.c:415
+#: gtk/gtksingleselection.c:420
 msgid "Autoselect"
 msgstr "Автовибір"
 
-#: gtk/gtksingleselection.c:416
+#: gtk/gtksingleselection.c:421
 msgid "If the selection will always select an item"
 msgstr "Чи позначення завжди позначає пункт"
 
-#: gtk/gtksingleselection.c:427
+#: gtk/gtksingleselection.c:432
 msgid "Can unselect"
 msgstr "Можна знімати позначення"
 
-#: gtk/gtksingleselection.c:428
+#: gtk/gtksingleselection.c:433
 msgid "If unselecting the selected item is allowed"
 msgstr "Чи зняття позначення з позначеного пункту дозволене"
 
-#: gtk/gtksingleselection.c:451
+#: gtk/gtksingleselection.c:456
 msgid "Selected Item"
 msgstr "Вибраний елемент"
 
-#: gtk/gtksingleselection.c:452
+#: gtk/gtksingleselection.c:457
 msgid "The selected item"
 msgstr "Позначений пункт"
 
@@ -6297,7 +6262,6 @@ msgid "Associated stack for this GtkStackSidebar"
 msgstr "Пов'язаний стос для цього GtkStackSidebar"
 
 #: gtk/gtkstringfilter.c:263 gtk/gtkstringsorter.c:229
-#| msgid "Ignore hidden"
 msgid "Ignore case"
 msgstr "Без врахування регістру"
 
@@ -6306,7 +6270,6 @@ msgid "If matching is case sensitive"
 msgstr "Чи слід враховувати регістр символів при встановленні відповідності"
 
 #: gtk/gtkstringfilter.c:275
-#| msgid "Search mode"
 msgid "Match mode"
 msgstr "Режим відповідності"
 
@@ -6315,12 +6278,10 @@ msgid "If exact matches are necessary or if substrings are allowed"
 msgstr "Має бути відповідність точною чи достатньо збігу частини рядка"
 
 #: gtk/gtkstringfilter.c:288
-#| msgid "Search mode"
 msgid "Search"
 msgstr "Пошук"
 
 #: gtk/gtkstringfilter.c:289
-#| msgid "The selected item"
 msgid "The search term"
 msgstr "Критерій пошуку"
 
@@ -6990,7 +6951,6 @@ msgid "The child widget with the actual contents"
 msgstr "Дочірній віджет, який містить самі дані"
 
 #: gtk/gtktreeexpander.c:462
-#| msgid "The item held in this row"
 msgid "The item held by this expander's row"
 msgstr "Запис, який зберігається у цьому рядку розгортання"
 
@@ -7055,7 +7015,6 @@ msgid "The item held in this row"
 msgstr "Запис, який зберігається у цьому рядку"
 
 #: gtk/gtktreelistrowsorter.c:244
-#| msgid "The model being sorted"
 msgid "The underlying sorter"
 msgstr "Базовий сортувальник"
 

po/POTFILES.in

@@ -255,6 +255,7 @@ gtk/gtkprintoperation-win32.c
 gtk/gtkprintunixdialog.c
 gtk/gtkprogressbar.c
 gtk/gtkpropertylookuplistmodel.c
+gtk/gtkpropertyselection.c
 gtk/gtkradiobutton.c
 gtk/gtkrange.c
 gtk/gtkrecentmanager.c

subprojects/libcloudproviders.wrap

@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libcloudproviders
+url=https://gitlab.gnome.org/World/libcloudproviders.git
+revision=master

testsuite/gtk/multiselection.c

@@ -496,7 +496,7 @@ test_callback (void)
   assert_selection (selection, "");
   assert_selection_changes (selection, "");
 
-  ret = gtk_selection_model_select_callback (selection, select_some, data);
+  ret = gtk_selection_model_select_callback (selection, FALSE, select_some, data);
   g_assert_true (ret);
   assert_selection (selection, "3 4 5 7 8 9");
   assert_selection_changes (selection, "2:7");