Make auto-close work for message windows

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 set(PIM_VERSION "5.19.2")
 set(PIM_VERSION ${PIM_VERSION})
 set(RELEASE_SERVICE_VERSION "21.12.2")
-set(KALARM_VERSION "3.3.4")
+set(KALARM_VERSION "3.3.5")
 
 project(kalarm VERSION ${KALARM_VERSION})
 

Changelog

 KAlarm Change Log
 
+=== Version 3.3.5 (KDE Applications 21.12.2) --- 10 January 2022 ===
+* Fix regression introduced in version 3.1.0:
+    Make auto-close work for message windows.
+
 === Version 3.3.4 (KDE Applications 21.12.1) --- 28 December 2021 ===
 * Treat empty read-only, or non-existent, calendar files as loaded.
 * Fix bad calendar files preventing command line actions from running.

src/main.cpp

 /*
  *  main.cpp
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2001-2021 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2001-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -41,7 +41,7 @@ int main(int argc, char* argv[])
                          QStringLiteral(KALARM_FULL_VERSION),
                          i18n("Personal alarm message, command and email scheduler by KDE"),
                          KAboutLicense::GPL,
-                         ki18n("Copyright © 2001-%1, David Jarvie").subs(QStringLiteral("2021")).toString(), QString());
+                         ki18n("Copyright © 2001-%1, David Jarvie").subs(QStringLiteral("2022")).toString(), QString());
     aboutData.addAuthor(i18n("David Jarvie"), i18n("Author"), QStringLiteral("djarvie@kde.org"));
     aboutData.setOrganizationDomain("kde.org");
     aboutData.setDesktopFileName(QStringLiteral(KALARM_DBUS_SERVICE));

src/messagewindow.cpp

@@ -811,6 +811,7 @@ bool MessageWindow::isSpread(const QPoint& topLeft)
 */
 void MessageWindow::display()
 {
+    connect(mHelper, &MessageDisplayHelper::autoCloseNow, this, &QWidget::close);
     if (mHelper->activateAutoClose())
     {
         if (Preferences::messageButtonDelay() == 0)