Bump version to 3.10.0.1

Update NEWS

NEWS

@@ -1,3 +1,15 @@
+3.10.0.1
+========
+* Fix bug when a window changed size twice in a single frame - this
+  can happen with GTK+ client-side decorations [Giovanni, Owen; #708367]
+
+Contributors:
+  Giovanni Campagna, Owen Taylor
+
+3.10.0
+======
+* Update dependencies [Giovanni; #708210]
+
 3.9.92
 ======
 * Constrain the pointer position onto visible monitors [Giovanni; #706655]

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ(2.50)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [9])
+m4_define([mutter_minor_version], [10])
-m4_define([mutter_micro_version], [92])
+m4_define([mutter_micro_version], [0.1])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -77,7 +77,7 @@ MUTTER_PC_MODULES="
    cairo >= 1.10.0
    gsettings-desktop-schemas >= 3.7.3
    xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
-   $CLUTTER_PACKAGE >= 1.14.3
+   $CLUTTER_PACKAGE >= 1.15.94
    cogl-1.0 >= 1.13.3
    upower-glib > 0.9.11
    gnome-desktop-3.0
@@ -220,7 +220,7 @@ AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
 AC_SUBST([WAYLAND_SCANNER])
 AC_SUBST(XWAYLAND_PATH)
 
-MUTTER_PC_MODULES="$MUTTER_PC_MODULES wayland-server libdrm"
+MUTTER_PC_MODULES="$MUTTER_PC_MODULES clutter-wayland-1.0 clutter-wayland-compositor-1.0 clutter-egl-1.0 wayland-server libdrm"
 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
 
 PKG_CHECK_EXISTS([xi >= 1.6.99.1],

src/compositor/meta-window-actor.c

@@ -1473,6 +1473,22 @@ meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
   MetaWindowActorPrivate *priv = self->priv;
   MetaRectangle window_rect;
 
+  meta_window_get_input_rect (priv->window, &window_rect);
+
+  /* When running as a display server we catch size changes when new
+     buffers are attached */
+  if (!meta_is_wayland_compositor ())
+    {
+      if (priv->last_width != window_rect.width ||
+          priv->last_height != window_rect.height)
+        {
+          priv->x11_size_changed = TRUE;
+
+          priv->last_width = window_rect.width;
+          priv->last_height = window_rect.height;
+        }
+    }
+
   /* Normally we want freezing a window to also freeze its position; this allows
    * windows to atomically move and resize together, either under app control,
    * or because the user is resizing from the left/top. But on initial placement
@@ -1483,22 +1499,12 @@ meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
   if (is_frozen (self) && !did_placement)
     return;
 
-  meta_window_get_input_rect (priv->window, &window_rect);
-
-  /* When running as a display server then we instead catch size changes when
-   * new buffers are attached */
   if (!meta_is_wayland_compositor ())
     {
-      if (priv->last_width != window_rect.width ||
+      if (priv->x11_size_changed)
-          priv->last_height != window_rect.height)
         {
-          priv->x11_size_changed = TRUE;
           meta_window_actor_queue_create_x11_pixmap (self);
-
           meta_window_actor_update_shape (self);
-
-          priv->last_width = window_rect.width;
-          priv->last_height = window_rect.height;
         }
     }