Merge branch 'stable' into next

This commit is contained in:
Michael Stapelberg
2020-07-26 10:11:49 +02:00
5 changed files with 13 additions and 15 deletions

View File

@@ -1 +1 @@
4.18.1-non-git 4.18.2-non-git

View File

@@ -126,7 +126,7 @@ EXTRA_DIST = \
I3_VERSION \ I3_VERSION \
LICENSE \ LICENSE \
PACKAGE-MAINTAINER \ PACKAGE-MAINTAINER \
RELEASE-NOTES-4.18.1 \ RELEASE-NOTES-4.18.2 \
generate-command-parser.pl \ generate-command-parser.pl \
parser-specs/commands.spec \ parser-specs/commands.spec \
parser-specs/config.spec \ parser-specs/config.spec \

View File

@@ -1,9 +1,9 @@
┌──────────────────────────────┐ ┌──────────────────────────────┐
│ Release notes for i3 v4.18.1 │ Release notes for i3 v4.18.2
└──────────────────────────────┘ └──────────────────────────────┘
This is i3 v4.18.1. This version is considered stable. All users of i3 are This is i3 v4.18.2. This version is considered stable. All users of i3 are
strongly encouraged to upgrade. strongly encouraged to upgrade.
This is a bugfix release for v4.18. This is a bugfix release for v4.18.
@@ -12,14 +12,10 @@ This is a bugfix release for v4.18.
│ Bugfixes │ │ Bugfixes │
└────────────────────────────┘ └────────────────────────────┘
Move parent nodes in scratchpad correctly floating_maybe_reassign_ws: only re-focus if previously focused
• i3bar: Call cont_child() more liberally (fixes a focus issue with KDE notifications)
Fix load_layout crash when floating node doesn't have CT_FLOATING_CON parent get_output_by_name: guard output->primary with require_active
Fix SEGFAULT when i3bar receives invalid input i3bar: fix Xorg memory leak
• Revert "floating_reposition: avoid extra tree_render"
• Call tree_render if floating move changes workspace
• Update EWMH properties on workspace move
• cmd_focus_sibling: Fix crash on workspace level
┌────────────────────────────┐ ┌────────────────────────────┐
│ Thanks! │ │ Thanks! │
@@ -27,6 +23,6 @@ This is a bugfix release for v4.18.
Thanks for testing, bugfixes, discussions and everything I forgot go out to: Thanks for testing, bugfixes, discussions and everything I forgot go out to:
Heman Gandhi, Orestis Floros Orestis Floros
-- Michael Stapelberg, 2020-04-22 -- Michael Stapelberg, 2020-07-26

View File

@@ -2,7 +2,7 @@
# Run autoreconf -fi to generate a configure script from this file. # Run autoreconf -fi to generate a configure script from this file.
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([i3], [4.18.1], [https://github.com/i3/i3/issues]) AC_INIT([i3], [4.18.2], [https://github.com/i3/i3/issues])
# For AX_EXTEND_SRCDIR # For AX_EXTEND_SRCDIR
AX_ENABLE_BUILDDIR AX_ENABLE_BUILDDIR
AM_INIT_AUTOMAKE([foreign -Wall no-dist-gzip dist-bzip2]) AM_INIT_AUTOMAKE([foreign -Wall no-dist-gzip dist-bzip2])

View File

@@ -1622,6 +1622,8 @@ void destroy_window(i3_output *output) {
xcb_free_pixmap(xcb_connection, output->buffer.id); xcb_free_pixmap(xcb_connection, output->buffer.id);
xcb_free_pixmap(xcb_connection, output->statusline_buffer.id); xcb_free_pixmap(xcb_connection, output->statusline_buffer.id);
output->bar.id = XCB_NONE; output->bar.id = XCB_NONE;
kick_tray_clients(output);
} }
/* Strut partial tells i3 where to reserve space for i3bar. This is determined /* Strut partial tells i3 where to reserve space for i3bar. This is determined